diff options
Diffstat (limited to 'jstests/sharding')
34 files changed, 88 insertions, 88 deletions
diff --git a/jstests/sharding/addshard1.js b/jstests/sharding/addshard1.js index e43a2a48553..e7aa1920d6b 100644 --- a/jstests/sharding/addshard1.js +++ b/jstests/sharding/addshard1.js @@ -62,7 +62,7 @@ assert.eq( numObjs, sdb1.foo.count(), "wrong count after moving datbase that existed before addshard"); // make sure we can shard the original collections -sdb1.foo.ensureIndex({a: 1}, {unique: true}); // can't shard populated collection without an index +sdb1.foo.createIndex({a: 1}, {unique: true}); // can't shard populated collection without an index s.adminCommand({enablesharding: "testDB"}); s.adminCommand({shardcollection: "testDB.foo", key: {a: 1}}); s.adminCommand({split: "testDB.foo", middle: {a: Math.floor(numObjs / 2)}}); diff --git a/jstests/sharding/array_shard_key.js b/jstests/sharding/array_shard_key.js index 3acf841a1b0..686d1d1085f 100644 --- a/jstests/sharding/array_shard_key.js +++ b/jstests/sharding/array_shard_key.js @@ -71,7 +71,7 @@ value = coll.findOne({i: 1}); assert.commandWorked(coll.remove(Object.extend(value, {i: 1}))); assert.eq(coll.find().itcount(), 0); -coll.ensureIndex({_id: 1, i: 1, j: 1}); +coll.createIndex({_id: 1, i: 1, j: 1}); // Can insert document that will make index into a multi-key as long as it's not part of shard // key. coll.remove({}); @@ -119,7 +119,7 @@ for (var i = 0; i < 10; i++) { assert.commandWorked(coll.insert({i: [i, i + 1]})); } -coll.ensureIndex({_id: 1, i: 1}); +coll.createIndex({_id: 1, i: 1}); try { st.shardColl(coll, {_id: 1, i: 1}, {_id: ObjectId(), i: 1}); @@ -136,7 +136,7 @@ for (var i = 0; i < 10; i++) { assert.commandWorked(coll.insert({i: i})); } -coll.ensureIndex({_id: 1, i: 1}); +coll.createIndex({_id: 1, i: 1}); st.shardColl(coll, {_id: 1, i: 1}, {_id: ObjectId(), i: 1}); diff --git a/jstests/sharding/bulk_insert.js b/jstests/sharding/bulk_insert.js index 93192010dd9..a36c7c6c091 100644 --- a/jstests/sharding/bulk_insert.js +++ b/jstests/sharding/bulk_insert.js @@ -22,8 +22,8 @@ st.ensurePrimaryShard(collSh.getDB() + "", st.shard0.shardName); assert.commandWorked(admin.runCommand({movePrimary: collUn.getDB() + "", to: st.shard1.shardName})); -printjson(collSh.ensureIndex({ukey: 1}, {unique: true})); -printjson(collUn.ensureIndex({ukey: 1}, {unique: true})); +printjson(collSh.createIndex({ukey: 1}, {unique: true})); +printjson(collUn.createIndex({ukey: 1}, {unique: true})); assert.commandWorked(admin.runCommand({shardCollection: collSh + "", key: {ukey: 1}})); assert.commandWorked(admin.runCommand({split: collSh + "", middle: {ukey: 0}})); diff --git a/jstests/sharding/coll_epoch_test1.js b/jstests/sharding/coll_epoch_test1.js index 4249265797e..115418017a2 100644 --- a/jstests/sharding/coll_epoch_test1.js +++ b/jstests/sharding/coll_epoch_test1.js @@ -45,7 +45,7 @@ st.configRS.awaitLastOpCommitted(); jsTest.log("Re-enabling sharding with a different key..."); st.ensurePrimaryShard(coll.getDB().getName(), st.shard1.shardName); -assert.commandWorked(coll.ensureIndex({notId: 1})); +assert.commandWorked(coll.createIndex({notId: 1})); assert.commandWorked(admin.runCommand({shardCollection: coll + "", key: {notId: 1}})); bulk = insertMongos.getCollection(coll + "").initializeUnorderedBulkOp(); diff --git a/jstests/sharding/covered_shard_key_indexes.js b/jstests/sharding/covered_shard_key_indexes.js index 773a3d0927b..300632c0d76 100644 --- a/jstests/sharding/covered_shard_key_indexes.js +++ b/jstests/sharding/covered_shard_key_indexes.js @@ -25,19 +25,19 @@ assert.commandWorked( assert.commandWorked(coll.insert({_id: true, a: true, b: true})); // Index without shard key query - not covered -assert.commandWorked(coll.ensureIndex({a: 1})); +assert.commandWorked(coll.createIndex({a: 1})); assert.eq(1, coll.find({a: true}).explain(true).executionStats.totalDocsExamined); assert.eq(1, coll.find({a: true}, {_id: 1, a: 1}).explain(true).executionStats.totalDocsExamined); // Index with shard key query - covered when projecting assert.commandWorked(coll.dropIndexes()); -assert.commandWorked(coll.ensureIndex({a: 1, _id: 1})); +assert.commandWorked(coll.createIndex({a: 1, _id: 1})); assert.eq(1, coll.find({a: true}).explain(true).executionStats.totalDocsExamined); assert.eq(0, coll.find({a: true}, {_id: 1, a: 1}).explain(true).executionStats.totalDocsExamined); // Compound index with shard key query - covered when projecting assert.commandWorked(coll.dropIndexes()); -assert.commandWorked(coll.ensureIndex({a: 1, b: 1, _id: 1})); +assert.commandWorked(coll.createIndex({a: 1, b: 1, _id: 1})); assert.eq(1, coll.find({a: true, b: true}).explain(true).executionStats.totalDocsExamined); assert.eq( 0, @@ -52,7 +52,7 @@ st.printShardingStatus(); assert.commandWorked(coll.insert({_id: true, a: true, b: true})); // Index without shard key query - not covered -assert.commandWorked(coll.ensureIndex({a: 1})); +assert.commandWorked(coll.createIndex({a: 1})); assert.eq(1, coll.find({a: true}).explain(true).executionStats.totalDocsExamined); assert.eq(1, coll.find({a: true}, {_id: 0, a: 1}).explain(true).executionStats.totalDocsExamined); @@ -70,7 +70,7 @@ st.printShardingStatus(); assert.commandWorked(coll.insert({_id: true, a: true, b: true, c: true, d: true})); // Index without shard key query - not covered -assert.commandWorked(coll.ensureIndex({c: 1})); +assert.commandWorked(coll.createIndex({c: 1})); assert.eq(1, coll.find({c: true}).explain(true).executionStats.totalDocsExamined); assert.eq(1, coll.find({c: true}, {_id: 0, a: 1, b: 1, c: 1}) @@ -79,7 +79,7 @@ assert.eq(1, // Index with shard key query - covered when projecting assert.commandWorked(coll.dropIndex({c: 1})); -assert.commandWorked(coll.ensureIndex({c: 1, b: 1, a: 1})); +assert.commandWorked(coll.createIndex({c: 1, b: 1, a: 1})); assert.eq(1, coll.find({c: true}).explain(true).executionStats.totalDocsExamined); assert.eq(0, coll.find({c: true}, {_id: 0, a: 1, b: 1, c: 1}) @@ -88,7 +88,7 @@ assert.eq(0, // Compound index with shard key query - covered when projecting assert.commandWorked(coll.dropIndex({c: 1, b: 1, a: 1})); -assert.commandWorked(coll.ensureIndex({c: 1, d: 1, a: 1, b: 1, _id: 1})); +assert.commandWorked(coll.createIndex({c: 1, d: 1, a: 1, b: 1, _id: 1})); assert.eq(1, coll.find({c: true, d: true}).explain(true).executionStats.totalDocsExamined); assert.eq(0, coll.find({c: true, d: true}, {a: 1, b: 1, c: 1, d: 1}) @@ -104,7 +104,7 @@ st.printShardingStatus(); assert.commandWorked(coll.insert({_id: true, a: {b: true}, c: true})); // Index without shard key query - not covered -assert.commandWorked(coll.ensureIndex({c: 1})); +assert.commandWorked(coll.createIndex({c: 1})); assert.eq(1, coll.find({c: true}).explain(true).executionStats.totalDocsExamined); assert.eq( 1, @@ -112,7 +112,7 @@ assert.eq( // Index with shard key query - can be covered given the appropriate projection. assert.commandWorked(coll.dropIndex({c: 1})); -assert.commandWorked(coll.ensureIndex({c: 1, 'a.b': 1})); +assert.commandWorked(coll.createIndex({c: 1, 'a.b': 1})); assert.eq(1, coll.find({c: true}).explain(true).executionStats.totalDocsExamined); assert.eq( 0, @@ -127,7 +127,7 @@ st.printShardingStatus(); assert.commandWorked(st.shard0.getCollection(coll.toString()).insert({_id: "bad data", c: true})); // Index without shard key query - not covered but succeeds -assert.commandWorked(coll.ensureIndex({c: 1})); +assert.commandWorked(coll.createIndex({c: 1})); var explain = coll.find({c: true}).explain(true).executionStats; assert.eq(1, explain.nReturned); assert.eq(1, explain.totalDocsExamined); @@ -137,7 +137,7 @@ assert.eq(0, getChunkSkips(explain.executionStages.shards[0].executionStages)); // // NOTE: This is weird and only a result of the fact that we don't have a dedicated "does not // exist" value for indexes -assert.commandWorked(coll.ensureIndex({c: 1, a: 1})); +assert.commandWorked(coll.createIndex({c: 1, a: 1})); var explain = coll.find({c: true}, {_id: 0, a: 1, c: 1}).explain(true).executionStats; assert.eq(1, explain.nReturned); assert.eq(0, explain.totalDocsExamined); diff --git a/jstests/sharding/create_idx_empty_primary.js b/jstests/sharding/create_idx_empty_primary.js index 2641d7f7416..462a866e236 100644 --- a/jstests/sharding/create_idx_empty_primary.js +++ b/jstests/sharding/create_idx_empty_primary.js @@ -17,7 +17,7 @@ assert.commandWorked( assert.commandWorked(testDB.user.insert({_id: 0})); -var res = testDB.user.ensureIndex({i: 1}); +var res = testDB.user.createIndex({i: 1}); assert.commandWorked(res); var indexes = testDB.user.getIndexes(); diff --git a/jstests/sharding/delete_during_migrate.js b/jstests/sharding/delete_during_migrate.js index 108097bf808..3477f57bc85 100644 --- a/jstests/sharding/delete_during_migrate.js +++ b/jstests/sharding/delete_during_migrate.js @@ -28,7 +28,7 @@ for (var i = 0; i < 200000; i++) { assert.commandWorked(bulk.execute()); // enable sharding of the collection. Only 1 chunk. -t.ensureIndex({a: 1}); +t.createIndex({a: 1}); assert.commandWorked(st.s0.adminCommand({shardcollection: ns, key: {a: 1}})); diff --git a/jstests/sharding/drop_indexes_with_stale_config_error.js b/jstests/sharding/drop_indexes_with_stale_config_error.js index f84bcc88941..20d969fd865 100644 --- a/jstests/sharding/drop_indexes_with_stale_config_error.js +++ b/jstests/sharding/drop_indexes_with_stale_config_error.js @@ -25,7 +25,7 @@ assert.commandWorked(st.s.adminCommand({split: ns, middle: {x: 0}})); assert.commandWorked(st.s.adminCommand({moveChunk: ns, find: {x: 100}, to: st.shard1.shardName})); flushRoutersAndRefreshShardMetadata(st, {ns}); -assert.commandWorked(mongos0Coll.ensureIndex({x: 1})); +assert.commandWorked(mongos0Coll.createIndex({x: 1})); // Move chunk without refreshing the recipient so that the recipient shard throws a // StaleShardVersion error upon receiving the drop index command. diff --git a/jstests/sharding/features2.js b/jstests/sharding/features2.js index 9626392a43f..1cae75c30ae 100644 --- a/jstests/sharding/features2.js +++ b/jstests/sharding/features2.js @@ -12,7 +12,7 @@ let db = s.getDB("test"); db.foo.save({x: 1}); db.foo.save({x: 2}); db.foo.save({x: 3}); -db.foo.ensureIndex({x: 1}); +db.foo.createIndex({x: 1}); let a = s.shard0.getDB("test"); let b = s.shard1.getDB("test"); @@ -73,7 +73,7 @@ db.mr.save({x: 1, tags: ["a", "b"]}); db.mr.save({x: 2, tags: ["b", "c"]}); db.mr.save({x: 3, tags: ["c", "a"]}); db.mr.save({x: 4, tags: ["b", "c"]}); -db.mr.ensureIndex({x: 1}); +db.mr.createIndex({x: 1}); let m = function() { this.tags.forEach(function(z) { diff --git a/jstests/sharding/fts_score_sort_sharded.js b/jstests/sharding/fts_score_sort_sharded.js index 262a676d89c..1532ccf724b 100644 --- a/jstests/sharding/fts_score_sort_sharded.js +++ b/jstests/sharding/fts_score_sort_sharded.js @@ -26,7 +26,7 @@ assert.commandWorked(coll.insert({_id: 1, a: "pizza"})); assert.commandWorked(coll.insert({_id: -1, a: "pizza pizza"})); assert.commandWorked(coll.insert({_id: 2, a: "pizza pizza pizza"})); assert.commandWorked(coll.insert({_id: -2, a: "pizza pizza pizza pizza"})); -assert.commandWorked(coll.ensureIndex({a: "text"})); +assert.commandWorked(coll.createIndex({a: "text"})); // // Execute query with sort on document score, verify results are in correct order. @@ -76,7 +76,7 @@ assert.commandWorked(coll.insert({_id: 0, a: "pizza", b: [1, 4]})); assert.commandWorked(coll.insert({_id: 1, a: "pizza pizza", b: [6, 7]})); assert.commandWorked(coll.insert({_id: 2, a: "pizza", b: [2, 3]})); assert.commandWorked(coll.insert({_id: 3, a: "pizza pizza", b: [5, 8]})); -assert.commandWorked(coll.ensureIndex({a: "text"})); +assert.commandWorked(coll.createIndex({a: "text"})); results = coll.find({$text: {$search: "pizza"}}, {s: {$meta: "textScore"}}) .sort({s: {$meta: "textScore"}, b: 1}) diff --git a/jstests/sharding/hash_shard_non_empty.js b/jstests/sharding/hash_shard_non_empty.js index 865c103ce14..01692518b66 100644 --- a/jstests/sharding/hash_shard_non_empty.js +++ b/jstests/sharding/hash_shard_non_empty.js @@ -12,7 +12,7 @@ s.stopBalancer(); db.getCollection(coll).insert({a: 1}); -db.getCollection(coll).ensureIndex({a: "hashed"}); +db.getCollection(coll).createIndex({a: "hashed"}); var res = db.adminCommand({shardcollection: dbname + "." + coll, key: {a: "hashed"}}); assert.eq(res.ok, 1, "shardcollection didn't work"); s.printShardingStatus(); diff --git a/jstests/sharding/hash_shard_unique_compound.js b/jstests/sharding/hash_shard_unique_compound.js index 460d28789b9..acec60bf667 100644 --- a/jstests/sharding/hash_shard_unique_compound.js +++ b/jstests/sharding/hash_shard_unique_compound.js @@ -21,7 +21,7 @@ assert.commandWorked(db.adminCommand({enablesharding: dbName})); assert.commandWorked(db.adminCommand({shardcollection: ns, key: {a: "hashed"}})); // Create unique index -assert.commandWorked(coll.ensureIndex({a: 1, b: 1}, {unique: true})); +assert.commandWorked(coll.createIndex({a: 1, b: 1}, {unique: true})); jsTest.log("------ indexes -------"); jsTest.log(tojson(coll.getIndexes())); @@ -31,7 +31,7 @@ jsTest.log("------ dropping sharded collection to start part 2 -------"); coll.drop(); // Create unique index -assert.commandWorked(coll.ensureIndex({a: 1, b: 1}, {unique: true})); +assert.commandWorked(coll.createIndex({a: 1, b: 1}, {unique: true})); // shard a fresh collection using a hashed shard key assert.commandWorked(db.adminCommand({shardcollection: ns, key: {a: "hashed"}}), diff --git a/jstests/sharding/index1.js b/jstests/sharding/index1.js index 67c4c3ceeb6..019a1100919 100644 --- a/jstests/sharding/index1.js +++ b/jstests/sharding/index1.js @@ -23,8 +23,8 @@ for (var i = 0; i < 22; i++) { if (i == 0) { // Unique index exists, but not the right one. - coll.ensureIndex({num: 1}, {unique: true}); - coll.ensureIndex({x: 1}); + coll.createIndex({num: 1}, {unique: true}); + coll.createIndex({x: 1}); passed = false; try { @@ -37,8 +37,8 @@ for (var i = 0; i < 22; i++) { } if (i == 1) { // Unique index exists as prefix, also index exists - coll.ensureIndex({x: 1}); - coll.ensureIndex({x: 1, num: 1}, {unique: true}); + coll.createIndex({x: 1}); + coll.createIndex({x: 1, num: 1}, {unique: true}); try { s.adminCommand({shardcollection: "" + coll, key: {x: 1}}); @@ -49,8 +49,8 @@ for (var i = 0; i < 22; i++) { } if (i == 2) { // Non-unique index exists as prefix, also index exists. No unique index. - coll.ensureIndex({x: 1}); - coll.ensureIndex({x: 1, num: 1}); + coll.createIndex({x: 1}); + coll.createIndex({x: 1, num: 1}); passed = false; try { @@ -66,8 +66,8 @@ for (var i = 0; i < 22; i++) { } if (i == 3) { // Unique index exists as prefix, also unique index exists - coll.ensureIndex({num: 1}, {unique: true}); - coll.ensureIndex({num: 1, x: 1}, {unique: true}); + coll.createIndex({num: 1}, {unique: true}); + coll.createIndex({num: 1, x: 1}, {unique: true}); try { s.adminCommand({shardcollection: "" + coll, key: {num: 1}, unique: true}); @@ -78,7 +78,7 @@ for (var i = 0; i < 22; i++) { } if (i == 4) { // Unique index exists as id, also unique prefix index exists - coll.ensureIndex({_id: 1, num: 1}, {unique: true}); + coll.createIndex({_id: 1, num: 1}, {unique: true}); try { s.adminCommand({shardcollection: "" + coll, key: {_id: 1}, unique: true}); @@ -89,7 +89,7 @@ for (var i = 0; i < 22; i++) { } if (i == 5) { // Unique index exists as id, also unique prefix index exists - coll.ensureIndex({_id: 1, num: 1}, {unique: true}); + coll.createIndex({_id: 1, num: 1}, {unique: true}); try { s.adminCommand({shardcollection: "" + coll, key: {_id: 1, num: 1}, unique: true}); @@ -102,7 +102,7 @@ for (var i = 0; i < 22; i++) { coll.remove({}); // Unique index does not exist, also unique prefix index exists - coll.ensureIndex({num: 1, _id: 1}, {unique: true}); + coll.createIndex({num: 1, _id: 1}, {unique: true}); try { s.adminCommand({shardcollection: "" + coll, key: {num: 1}, unique: true}); @@ -165,8 +165,8 @@ for (var i = 0; i < 22; i++) { } if (i == 9) { // Unique index exists on a different field as well - coll.ensureIndex({num: 1}, {unique: true}); - coll.ensureIndex({x: 1}); + coll.createIndex({num: 1}, {unique: true}); + coll.createIndex({x: 1}); passed = false; try { @@ -189,7 +189,7 @@ for (var i = 0; i < 22; i++) { assert(!passed, "Should not be able to shard without index"); // now add containing index and try sharding by prefix - coll.ensureIndex({num: 1, x: 1}); + coll.createIndex({num: 1, x: 1}); try { s.adminCommand({shardcollection: "" + coll, key: {num: 1}}); @@ -208,7 +208,7 @@ for (var i = 0; i < 22; i++) { coll.remove({}); // empty collection with useful index. check new index not created - coll.ensureIndex({num: 1, x: 1}); + coll.createIndex({num: 1, x: 1}); try { s.adminCommand({shardcollection: "" + coll, key: {num: 1}}); @@ -226,7 +226,7 @@ for (var i = 0; i < 22; i++) { if (i == 12) { // check multikey values for x make index unusable for shard key coll.save({num: 100, x: [2, 3]}); - coll.ensureIndex({num: 1, x: 1}); + coll.createIndex({num: 1, x: 1}); passed = false; try { @@ -239,7 +239,7 @@ for (var i = 0; i < 22; i++) { } if (i == 13) { coll.save({num: [100, 200], x: 10}); - coll.ensureIndex({num: 1, x: 1}); + coll.createIndex({num: 1, x: 1}); passed = false; try { @@ -252,7 +252,7 @@ for (var i = 0; i < 22; i++) { } if (i == 14) { coll.save({num: 100, x: 10, y: [1, 2]}); - coll.ensureIndex({num: 1, x: 1, y: 1}); + coll.createIndex({num: 1, x: 1, y: 1}); passed = false; try { @@ -265,7 +265,7 @@ for (var i = 0; i < 22; i++) { } if (i == 15) { // try sharding with a hashed index - coll.ensureIndex({num: "hashed"}); + coll.createIndex({num: "hashed"}); try { s.adminCommand({shardcollection: "" + coll, key: {num: "hashed"}}); @@ -276,7 +276,7 @@ for (var i = 0; i < 22; i++) { } if (i == 16) { // create hashed index, but try to declare it unique when sharding - coll.ensureIndex({num: "hashed"}); + coll.createIndex({num: "hashed"}); passed = false; try { @@ -289,8 +289,8 @@ for (var i = 0; i < 22; i++) { } if (i == 17) { // create hashed index, but unrelated unique index present - coll.ensureIndex({x: "hashed"}); - coll.ensureIndex({num: 1}, {unique: true}); + coll.createIndex({x: "hashed"}); + coll.createIndex({num: 1}, {unique: true}); passed = false; try { @@ -303,8 +303,8 @@ for (var i = 0; i < 22; i++) { } if (i == 18) { // create hashed index, and a regular unique index exists on same field - coll.ensureIndex({num: "hashed"}); - coll.ensureIndex({num: 1}, {unique: true}); + coll.createIndex({num: "hashed"}); + coll.createIndex({num: 1}, {unique: true}); try { s.adminCommand({shardcollection: "" + coll, key: {num: "hashed"}}); @@ -315,7 +315,7 @@ for (var i = 0; i < 22; i++) { } if (i == 19) { // Create sparse index. - coll.ensureIndex({x: 1}, {sparse: true}); + coll.createIndex({x: 1}, {sparse: true}); passed = false; try { @@ -328,7 +328,7 @@ for (var i = 0; i < 22; i++) { } if (i == 20) { // Create partial index. - coll.ensureIndex({x: 1}, {filter: {num: {$gt: 1}}}); + coll.createIndex({x: 1}, {filter: {num: {$gt: 1}}}); passed = false; try { @@ -344,8 +344,8 @@ for (var i = 0; i < 22; i++) { // where // both are prefixed by the shard key. - coll.ensureIndex({x: 1, num: 1}, {filter: {num: {$gt: 1}}}); - coll.ensureIndex({x: 1, num: -1}); + coll.createIndex({x: 1, num: 1}, {filter: {num: {$gt: 1}}}); + coll.createIndex({x: 1, num: -1}); try { s.adminCommand({shardcollection: "" + coll, key: {x: 1}}); diff --git a/jstests/sharding/key_many.js b/jstests/sharding/key_many.js index 86ac72100bd..e3ef862e8e8 100644 --- a/jstests/sharding/key_many.js +++ b/jstests/sharding/key_many.js @@ -219,7 +219,7 @@ for (var i = 0; i < types.length; i++) { assert.commandWorked( c.update(makeObjectDotted(curT.values[3]), {$set: {xx: 17}}, {upsert: true})); - assert.commandWorked(c.ensureIndex({_id: 1})); + assert.commandWorked(c.createIndex({_id: 1})); // multi update var mysum = 0; diff --git a/jstests/sharding/limit_push.js b/jstests/sharding/limit_push.js index ef6b7a1c903..a6773f1263e 100644 --- a/jstests/sharding/limit_push.js +++ b/jstests/sharding/limit_push.js @@ -9,7 +9,7 @@ var db = s.getDB("test"); for (i = 0; i < 100; i++) { db.limit_push.insert({_id: i, x: i}); } -db.limit_push.ensureIndex({x: 1}); +db.limit_push.createIndex({x: 1}); assert.eq(100, db.limit_push.find().length(), "Incorrect number of documents"); // Shard the collection diff --git a/jstests/sharding/mongos_validate_writes.js b/jstests/sharding/mongos_validate_writes.js index fbcd98249f6..0852dccf763 100644 --- a/jstests/sharding/mongos_validate_writes.js +++ b/jstests/sharding/mongos_validate_writes.js @@ -19,7 +19,7 @@ var staleCollB = staleMongosB.getCollection(coll + ""); assert.commandWorked(admin.runCommand({enableSharding: coll.getDB() + ""})); st.ensurePrimaryShard(coll.getDB().getName(), st.shard1.shardName); -coll.ensureIndex({a: 1}); +coll.createIndex({a: 1}); // Shard the collection on {a: 1} and move one chunk to another shard. Updates need to be across // two shards to trigger an error, otherwise they are versioned and will succeed after raising @@ -32,7 +32,7 @@ staleCollB.findOne(); // Change the collection sharding state coll.drop(); -coll.ensureIndex({b: 1}); +coll.createIndex({b: 1}); st.shardColl(coll, {b: 1}, {b: 0}, {b: 1}, coll.getDB(), true); // Make sure that we can successfully insert, even though we have stale state @@ -40,7 +40,7 @@ assert.commandWorked(staleCollA.insert({b: "b"})); // Change the collection sharding state coll.drop(); -coll.ensureIndex({c: 1}); +coll.createIndex({c: 1}); st.shardColl(coll, {c: 1}, {c: 0}, {c: 1}, coll.getDB(), true); // Make sure we can successfully upsert, even though we have stale state @@ -52,7 +52,7 @@ assert.commandFailedWithCode(staleCollB.update({b: "b"}, {b: "b"}, true), // Change the collection sharding state coll.drop(); -coll.ensureIndex({d: 1}); +coll.createIndex({d: 1}); st.shardColl(coll, {d: 1}, {d: 0}, {d: 1}, coll.getDB(), true); // Make sure we can successfully update, even though we have stale state @@ -68,7 +68,7 @@ assert.eq(staleCollB.findOne().x, "x"); // Change the collection sharding state coll.drop(); -coll.ensureIndex({e: 1}); +coll.createIndex({e: 1}); // Deletes need to be across two shards to trigger an error. st.ensurePrimaryShard(coll.getDB().getName(), st.shard0.shardName); st.shardColl(coll, {e: 1}, {e: 0}, {e: 1}, coll.getDB(), true); diff --git a/jstests/sharding/move_chunk_missing_idx.js b/jstests/sharding/move_chunk_missing_idx.js index 16cc64ddddd..f81369a4a48 100644 --- a/jstests/sharding/move_chunk_missing_idx.js +++ b/jstests/sharding/move_chunk_missing_idx.js @@ -19,7 +19,7 @@ testDB.adminCommand({shardCollection: 'test.user', key: {x: 1}}); // 2. Split chunk into 3 parts. // 3. Move 1 chunk to 2nd shard - should have no issues -testDB.user.ensureIndex({a: 1, b: 1}); +testDB.user.createIndex({a: 1, b: 1}); testDB.adminCommand({split: 'test.user', middle: {x: 0}}); testDB.adminCommand({split: 'test.user', middle: {x: 10}}); diff --git a/jstests/sharding/move_chunk_wc.js b/jstests/sharding/move_chunk_wc.js index 7dc75204d19..b37e2392203 100644 --- a/jstests/sharding/move_chunk_wc.js +++ b/jstests/sharding/move_chunk_wc.js @@ -30,7 +30,7 @@ var numberDoc = 20; var s0 = st.shard0.shardName; var s1 = st.shard1.shardName; -coll.ensureIndex({x: 1}, {unique: true}); +coll.createIndex({x: 1}, {unique: true}); st.ensurePrimaryShard(db.toString(), s0); st.shardColl(collName, {x: 1}, {x: numberDoc / 2}, {x: numberDoc / 2}, db.toString(), true); diff --git a/jstests/sharding/prefix_shard_key.js b/jstests/sharding/prefix_shard_key.js index fdec2e887ec..b25df2d838b 100644 --- a/jstests/sharding/prefix_shard_key.js +++ b/jstests/sharding/prefix_shard_key.js @@ -49,7 +49,7 @@ assert.throws(function() { }); // create usable index -assert.commandWorked(coll.ensureIndex({num: 1, x: 1})); +assert.commandWorked(coll.createIndex({num: 1, x: 1})); // usable index, doc with empty 'num' value assert.commandWorked(coll.insert({x: -5})); @@ -84,7 +84,7 @@ assert.commandWorked(s.s0.adminCommand({ // Migrations and splits will still work on a sharded collection that only has multi key // index. -db.user.ensureIndex({num: 1, x: 1}); +db.user.createIndex({num: 1, x: 1}); db.adminCommand({shardCollection: 'test.user', key: {num: 1}}); var indexCount = db.user.getIndexes().length; @@ -152,11 +152,11 @@ for (i = 0; i < 3; i++) { // declare a longer index if (i == 0) { - assert.commandWorked(coll2.ensureIndex({skey: 1, extra: 1})); + assert.commandWorked(coll2.createIndex({skey: 1, extra: 1})); } else if (i == 1) { - assert.commandWorked(coll2.ensureIndex({skey: 1, extra: -1})); + assert.commandWorked(coll2.createIndex({skey: 1, extra: -1})); } else if (i == 2) { - assert.commandWorked(coll2.ensureIndex({skey: 1, extra: 1, superfluous: -1})); + assert.commandWorked(coll2.createIndex({skey: 1, extra: 1, superfluous: -1})); } // then shard collection on prefix diff --git a/jstests/sharding/printShardingStatus.js b/jstests/sharding/printShardingStatus.js index 691f627ef72..e0439d63bc1 100644 --- a/jstests/sharding/printShardingStatus.js +++ b/jstests/sharding/printShardingStatus.js @@ -115,7 +115,7 @@ config.getCollectionInfos().forEach(function(c) { delete i.key; delete i.ns; delete i.v; - assert.commandWorked(configCopy.getCollection(c.name).ensureIndex(key, i)); + assert.commandWorked(configCopy.getCollection(c.name).createIndex(key, i)); }); }); diff --git a/jstests/sharding/query/explain_cmd.js b/jstests/sharding/query/explain_cmd.js index b07eacbfb3f..fb1d789e1db 100644 --- a/jstests/sharding/query/explain_cmd.js +++ b/jstests/sharding/query/explain_cmd.js @@ -12,8 +12,8 @@ var explain; // 'b'. var collSharded = db.getCollection("mongos_explain_cmd"); collSharded.drop(); -collSharded.ensureIndex({a: 1}); -collSharded.ensureIndex({b: 1}); +collSharded.createIndex({a: 1}); +collSharded.createIndex({b: 1}); // Enable sharding. assert.commandWorked(db.adminCommand({enableSharding: db.getName()})); @@ -65,8 +65,8 @@ assert.commandFailed(explain); // Setup a collection that is not sharded. var collUnsharded = db.getCollection("mongos_explain_cmd_unsharded"); collUnsharded.drop(); -collUnsharded.ensureIndex({a: 1}); -collUnsharded.ensureIndex({b: 1}); +collUnsharded.createIndex({a: 1}); +collUnsharded.createIndex({b: 1}); for (var i = 0; i < 3; i++) { collUnsharded.insert({_id: i, a: i, b: 1}); diff --git a/jstests/sharding/query/explain_exec_stats_on_shards.js b/jstests/sharding/query/explain_exec_stats_on_shards.js index fa2a21864d8..253b47a3238 100644 --- a/jstests/sharding/query/explain_exec_stats_on_shards.js +++ b/jstests/sharding/query/explain_exec_stats_on_shards.js @@ -98,7 +98,7 @@ st.ensurePrimaryShard(db.getName(), st.shard0.shardName); // Setup an unsharded collection. const unshardedColl = db.getCollection(`${jsTest.name()}_unsharded`); unshardedColl.drop(); - assert.commandWorked(unshardedColl.ensureIndex({a: 1})); + assert.commandWorked(unshardedColl.createIndex({a: 1})); // Add documents to the collection. const numDocs = 10; diff --git a/jstests/sharding/query/explain_find_and_modify_sharded.js b/jstests/sharding/query/explain_find_and_modify_sharded.js index a8dad43a201..65f5dc17d6c 100644 --- a/jstests/sharding/query/explain_find_and_modify_sharded.js +++ b/jstests/sharding/query/explain_find_and_modify_sharded.js @@ -17,7 +17,7 @@ var shardKey = {a: 1}; var shardedColl = testDB.getCollection(collName); shardedColl.drop(); assert.commandWorked(testDB.createCollection(collName)); -assert.commandWorked(shardedColl.ensureIndex(shardKey)); +assert.commandWorked(shardedColl.createIndex(shardKey)); // Enable sharding on the database and shard the collection. // Use "st.shard0.shardName" as the primary shard. diff --git a/jstests/sharding/query/find_getmore_cmd.js b/jstests/sharding/query/find_getmore_cmd.js index d2dcc311523..997d3bb2207 100644 --- a/jstests/sharding/query/find_getmore_cmd.js +++ b/jstests/sharding/query/find_getmore_cmd.js @@ -25,7 +25,7 @@ assert.commandWorked(coll.insert({_id: 1, a: 5})); assert.commandWorked(coll.insert({_id: 5, a: 20, b: "foo foo foo"})); assert.commandWorked(coll.insert({_id: 9, a: 3})); -assert.commandWorked(coll.ensureIndex({b: "text"})); +assert.commandWorked(coll.createIndex({b: "text"})); assert.commandWorked(db.adminCommand({enableSharding: db.getName()})); st.ensurePrimaryShard(db.getName(), st.shard0.shardName); diff --git a/jstests/sharding/query/geo_near_sharded.js b/jstests/sharding/query/geo_near_sharded.js index cf09b14a533..d68dcdec140 100644 --- a/jstests/sharding/query/geo_near_sharded.js +++ b/jstests/sharding/query/geo_near_sharded.js @@ -39,7 +39,7 @@ function test(st, db, sharded, indexType) { assert.commandWorked(bulk.execute()); assert.eq(db[coll].count(), numPts); - assert.commandWorked(db[coll].ensureIndex({loc: indexType})); + assert.commandWorked(db[coll].createIndex({loc: indexType})); let res = assert.commandWorked(db.runCommand({ aggregate: coll, diff --git a/jstests/sharding/read_pref_cmd.js b/jstests/sharding/read_pref_cmd.js index 3fa06255bfc..d3ac3f4c03a 100644 --- a/jstests/sharding/read_pref_cmd.js +++ b/jstests/sharding/read_pref_cmd.js @@ -307,7 +307,7 @@ let testConnReadPreference = function(conn, isMongos, rsNodes, {readPref, expect cmdTest( {dbStats: 1}, allowedOnSecondary.kAlways, true, formatProfileQuery(kDbName, {dbStats: 1})); - assert.commandWorked(shardedColl.ensureIndex({loc: '2d'})); + assert.commandWorked(shardedColl.createIndex({loc: '2d'})); // TODO: SERVER-38961 Remove when simultaneous index builds complete. // Run a no-op command and wait for it to be applied on secondaries. Due to the asynchronous diff --git a/jstests/sharding/refine_shardkey_config_cache_refresh.js b/jstests/sharding/refine_shardkey_config_cache_refresh.js index 9b343353bd3..595e4f87cda 100644 --- a/jstests/sharding/refine_shardkey_config_cache_refresh.js +++ b/jstests/sharding/refine_shardkey_config_cache_refresh.js @@ -22,7 +22,7 @@ assert.commandWorked(st.s.adminCommand({split: 'test.user', middle: {x: 10}})); assert.commandWorked(testDB.user.insert({x: 1, y: 1})); assert.commandWorked(testDB.user.insert({x: 10, y: 1})); -testDB.user.ensureIndex({x: 1, y: 1}); +testDB.user.createIndex({x: 1, y: 1}); let priConn = st.rs0.getPrimary(); assert.commandWorked( diff --git a/jstests/sharding/shard1.js b/jstests/sharding/shard1.js index d00a961be52..12f326a32f6 100644 --- a/jstests/sharding/shard1.js +++ b/jstests/sharding/shard1.js @@ -11,7 +11,7 @@ assert.commandWorked(db.foo.insert({num: 1, name: "eliot"})); assert.commandWorked(db.foo.insert({num: 2, name: "sara"})); assert.commandWorked(db.foo.insert({num: -1, name: "joe"})); -assert.commandWorked(db.foo.ensureIndex({num: 1})); +assert.commandWorked(db.foo.createIndex({num: 1})); assert.eq(3, db.foo.find().length(), "A"); diff --git a/jstests/sharding/shard7.js b/jstests/sharding/shard7.js index 094688d6e37..9f56553aa7f 100644 --- a/jstests/sharding/shard7.js +++ b/jstests/sharding/shard7.js @@ -47,7 +47,7 @@ assert.commandWorked(c.update(unsatisfiable, {$set: {c: 1}}, false, true)); assert.eq(2, c.count()); assert.eq(0, c.count({c: 1})); -c.ensureIndex({loc: '2d'}); +c.createIndex({loc: '2d'}); c.save({a: 2, b: 2, loc: [0, 0]}); near = c.aggregate({$geoNear: {near: [0, 0], query: unsatisfiable, distanceField: "dist"}}).toArray(); diff --git a/jstests/sharding/shard_insert_getlasterror_w2.js b/jstests/sharding/shard_insert_getlasterror_w2.js index 9db83bf5781..629b97d321a 100644 --- a/jstests/sharding/shard_insert_getlasterror_w2.js +++ b/jstests/sharding/shard_insert_getlasterror_w2.js @@ -47,7 +47,7 @@ assert.commandWorked(mongosConn.adminCommand({addshard: replSet1.getURL()})); // Enable sharding on test db and its collection foo assert.commandWorked(mongosConn.getDB('admin').runCommand({enablesharding: testDBName})); -testDB[testCollName].ensureIndex({x: 1}); +testDB[testCollName].createIndex({x: 1}); assert.commandWorked(mongosConn.getDB('admin').runCommand( {shardcollection: testDBName + '.' + testCollName, key: {x: 1}})); diff --git a/jstests/sharding/sharding_rs1.js b/jstests/sharding/sharding_rs1.js index 61fe245d75b..02b5e13b213 100644 --- a/jstests/sharding/sharding_rs1.js +++ b/jstests/sharding/sharding_rs1.js @@ -52,7 +52,7 @@ assert.eq(num, db.foo.find().itcount(), "C2"); assert.eq(num, db.foo.find().sort({_id: 1}).itcount(), "C3"); assert.eq(num, db.foo.find().sort({_id: -1}).itcount(), "C4"); -db.foo.ensureIndex({x: 1}); +db.foo.createIndex({x: 1}); assert.eq(num, db.foo.find().sort({x: 1}).itcount(), "C5"); assert.eq(num, db.foo.find().sort({x: -1}).itcount(), "C6"); diff --git a/jstests/sharding/sharding_rs2.js b/jstests/sharding/sharding_rs2.js index 8ae4a16185b..4c8f70c569d 100644 --- a/jstests/sharding/sharding_rs2.js +++ b/jstests/sharding/sharding_rs2.js @@ -122,7 +122,7 @@ assert.lte(before.query + 10, after.query, "B3"); // --- add more data ---- -db.foo.ensureIndex({x: 1}); +db.foo.createIndex({x: 1}); var bulk = db.foo.initializeUnorderedBulkOp(); for (var i = 0; i < 100; i++) { diff --git a/jstests/sharding/stats.js b/jstests/sharding/stats.js index 0f9f00a667c..f69aefc6825 100644 --- a/jstests/sharding/stats.js +++ b/jstests/sharding/stats.js @@ -144,7 +144,7 @@ collStatComp(coll_not_scaled, coll_scaled_1024, 1024, true); (function() { var t = db.foo; -assert.commandWorked(t.ensureIndex({a: 1})); +assert.commandWorked(t.createIndex({a: 1})); assert.eq(2, t.getIndexes().length); var isWiredTiger = diff --git a/jstests/sharding/trace_missing_docs_test.js b/jstests/sharding/trace_missing_docs_test.js index ab7b1c058a8..460f392e1c8 100644 --- a/jstests/sharding/trace_missing_docs_test.js +++ b/jstests/sharding/trace_missing_docs_test.js @@ -20,7 +20,7 @@ var testDocMissing = function(useReplicaSet) { assert.commandWorked(admin.runCommand({enableSharding: coll.getDB() + ""})); st.ensurePrimaryShard(coll.getDB() + "", st.shard0.shardName); - coll.ensureIndex({sk: 1}); + coll.createIndex({sk: 1}); assert.commandWorked(admin.runCommand({shardCollection: coll + "", key: {sk: 1}})); assert.commandWorked(coll.insert({_id: 12345, sk: 67890, hello: "world"})); |