Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(model): prevent index creation on syncIndexes if not necessary #12785

Merged
merged 2 commits into from Dec 16, 2022
Merged

fix(model): prevent index creation on syncIndexes if not necessary #12785

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f3dbd45
fix(model): prevent index creation on syncIndexes if not necessary
lpizzinidev Dec 9, 2022
f7f1ef2
test trigger
lpizzinidev Dec 10, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
15 changes: 12 additions & 3 deletions lib/model.js
View file
Open in desktop
Expand Up @@ -1570,14 +1570,14 @@ Model.diffIndexes = function diffIndexes(options, callback) {
const schemaIndexes = getRelatedSchemaIndexes(model, schema.indexes());

const toDrop = getIndexesToDrop(schema, schemaIndexes, dbIndexes);
const toCreate = getIndexesToCreate(schema, schemaIndexes, dbIndexes);
const toCreate = getIndexesToCreate(schema, schemaIndexes, dbIndexes, toDrop);

cb(null, { toDrop, toCreate });
});
});
};

function getIndexesToCreate(schema, schemaIndexes, dbIndexes) {
function getIndexesToCreate(schema, schemaIndexes, dbIndexes, toDrop) {
const toCreate = [];

for (const [schemaIndexKeysObject, schemaIndexOptions] of schemaIndexes) {
Expand All @@ -1589,7 +1589,10 @@ function getIndexesToCreate(schema, schemaIndexes, dbIndexes) {
if (isDefaultIdIndex(index)) {
continue;
}
if (isIndexEqual(schemaIndexKeysObject, options, index)) {
if (
isIndexEqual(schemaIndexKeysObject, options, index) &&
!toDrop.includes(index.name)
) {
found = true;
break;
}
Expand Down Expand Up @@ -1887,6 +1890,12 @@ function _ensureIndexes(model, options, callback) {
indexOptions.background = options.background;
}

if ('toCreate' in options) {
if (options.toCreate.length === 0) {
return done();
}
}

model.collection.createIndex(indexFields, indexOptions, utils.tick(function(err, name) {
indexSingleDone(err, indexFields, indexOptions, name);
if (err) {
Expand Down
10 changes: 5 additions & 5 deletions test/model.test.js
View file
Open in desktop
Expand Up @@ -6767,7 +6767,8 @@ describe('Model', function() {
);

});
xit('creates indexes only when they do not exist on the mongodb server (gh-12250)', async() => {

it('creates indexes only when they do not exist on the mongodb server (gh-12250)', async() => {
const userSchema = new Schema({
name: { type: String }
}, { autoIndex: false });
Expand All @@ -6781,15 +6782,14 @@ describe('Model', function() {
const createIndexSpy = sinon.spy(User.collection, 'createIndex');
const listIndexesSpy = sinon.spy(User.collection, 'listIndexes');

// Act
await User.syncIndexes();

assert.equal(createIndexSpy.callCount, 1);
assert.equal(listIndexesSpy.callCount, 2);
assert.equal(listIndexesSpy.callCount, 1);

await User.syncIndexes();

// Assert
assert.equal(listIndexesSpy.callCount, 4);
assert.equal(listIndexesSpy.callCount, 2);
assert.equal(createIndexSpy.callCount, 1);
});
});
Expand Down