SERVER-50442 Remove ensureIndex shell function

This commit replaces all the usages of ensureIndex() with createIndex() in JS tests and JS shell""

25 files changed, 41 insertions, 41 deletions

diff --git a/jstests/concurrency/fsm_workloads/agg_out.js b/jstests/concurrency/fsm_workloads/agg_out.js
index 200ee7917fd..6c1d720558f 100644
--- a/jstests/concurrency/fsm_workloads/agg_out.js
+++ b/jstests/concurrency/fsm_workloads/agg_out.js
@@ -38,7 +38,7 @@ var $config = extendWorkload($config, function($config, $super) {
     $config.transitions = {
         query: {
             query: 0.68,
-            ensureIndexes: 0.1,
+            createIndexes: 0.1,
             dropIndex: 0.1,
             collMod: 0.1,
             // Converting the target collection to a capped collection or a sharded collection will
@@ -47,7 +47,7 @@ var $config = extendWorkload($config, function($config, $super) {
             convertToCapped: 0.01,
             shardCollection: 0.01,
         },
-        ensureIndexes: {query: 1},
+        createIndexes: {query: 1},
         dropIndex: {query: 1},
         collMod: {query: 1},
         convertToCapped: {query: 1},
@@ -85,9 +85,9 @@ var $config = extendWorkload($config, function($config, $super) {
      * Ensures all the indexes exist. This will have no affect unless some thread has already
      * dropped an index.
      */
-    $config.states.ensureIndexes = function ensureIndexes(db, unusedCollName) {
+    $config.states.createIndexes = function createIndexes(db, unusedCollName) {
         for (var i = 0; i < this.indexSpecs; ++i) {
-            assertWhenOwnDB.commandWorked(db[this.outputCollName].ensureIndex(this.indexSpecs[i]));
+            assertWhenOwnDB.commandWorked(db[this.outputCollName].createIndex(this.indexSpecs[i]));
         }
     };
 
diff --git a/jstests/concurrency/fsm_workloads/collmod.js b/jstests/concurrency/fsm_workloads/collmod.js
index 095602b43af..fdb93bfc65a 100644
--- a/jstests/concurrency/fsm_workloads/collmod.js
+++ b/jstests/concurrency/fsm_workloads/collmod.js
@@ -48,7 +48,7 @@ var $config = (function() {
         assertAlways.eq(this.numDocs, res.nInserted);
 
         // create TTL index
-        res = db[this.threadCollName].ensureIndex({createdAt: 1}, {expireAfterSeconds: 3600});
+        res = db[this.threadCollName].createIndex({createdAt: 1}, {expireAfterSeconds: 3600});
         assertAlways.commandWorked(res);
     }
 
diff --git a/jstests/concurrency/fsm_workloads/compact.js b/jstests/concurrency/fsm_workloads/compact.js
index cae5571f733..558cd5b5fd4 100644
--- a/jstests/concurrency/fsm_workloads/compact.js
+++ b/jstests/concurrency/fsm_workloads/compact.js
@@ -37,15 +37,15 @@ var $config = (function() {
 
         function createIndexes(db, collName) {
             // The number of indexes created here is also stored in data.nIndexes
-            var aResult = db[collName].ensureIndex({a: 1});
+            var aResult = db[collName].createIndex({a: 1});
 
             assertWorkedHandleTxnErrors(aResult, ErrorCodes.IndexBuildAlreadyInProgress);
 
-            var bResult = db[collName].ensureIndex({b: 1});
+            var bResult = db[collName].createIndex({b: 1});
 
             assertWorkedHandleTxnErrors(bResult, ErrorCodes.IndexBuildAlreadyInProgress);
 
-            var cResult = db[collName].ensureIndex({c: 1});
+            var cResult = db[collName].createIndex({c: 1});
 
             assertWorkedHandleTxnErrors(cResult, ErrorCodes.IndexBuildAlreadyInProgress);
         }
diff --git a/jstests/concurrency/fsm_workloads/convert_to_capped_collection_index.js b/jstests/concurrency/fsm_workloads/convert_to_capped_collection_index.js
index 70c2fbc3b4c..be4414f642d 100644
--- a/jstests/concurrency/fsm_workloads/convert_to_capped_collection_index.js
+++ b/jstests/concurrency/fsm_workloads/convert_to_capped_collection_index.js
@@ -20,7 +20,7 @@ load('jstests/concurrency/fsm_workloads/convert_to_capped_collection.js');  // f
 
 var $config = extendWorkload($config, function($config, $super) {
     $config.states.convertToCapped = function convertToCapped(db, collName) {
-        assertWhenOwnDB.commandWorked(db[this.threadCollName].ensureIndex({i: 1, rand: 1}));
+        assertWhenOwnDB.commandWorked(db[this.threadCollName].createIndex({i: 1, rand: 1}));
         assertWhenOwnDB.eq(2, db[this.threadCollName].getIndexes().length);
         $super.states.convertToCapped.apply(this, arguments);
     };
diff --git a/jstests/concurrency/fsm_workloads/count_indexed.js b/jstests/concurrency/fsm_workloads/count_indexed.js
index b8041d5f91a..9887d1a113e 100644
--- a/jstests/concurrency/fsm_workloads/count_indexed.js
+++ b/jstests/concurrency/fsm_workloads/count_indexed.js
@@ -25,7 +25,7 @@ var $config = extendWorkload($config, function($config, $super) {
     $config.states.init = function init(db, collName) {
         this.threadCollName = this.prefix + '_' + this.tid;
         $super.states.init.apply(this, arguments);
-        assertAlways.commandWorked(db[this.threadCollName].ensureIndex({tid: 1, i: 1}));
+        assertAlways.commandWorked(db[this.threadCollName].createIndex({tid: 1, i: 1}));
     };
 
     return $config;
diff --git a/jstests/concurrency/fsm_workloads/create_index_background.js b/jstests/concurrency/fsm_workloads/create_index_background.js
index e183a33e36d..2a55b307086 100644
--- a/jstests/concurrency/fsm_workloads/create_index_background.js
+++ b/jstests/concurrency/fsm_workloads/create_index_background.js
@@ -202,7 +202,7 @@ var $config = (function() {
         var nSetupDocs = this.nDocumentsToSeed * 200;
         var coll = db[collName];
 
-        var res = coll.ensureIndex({tid: 1});
+        var res = coll.createIndex({tid: 1});
         assertAlways.commandWorked(res, tojson(res));
 
         var bulk = coll.initializeUnorderedBulkOp();
diff --git a/jstests/concurrency/fsm_workloads/distinct.js b/jstests/concurrency/fsm_workloads/distinct.js
index 2832ea215d3..2c56372c7d7 100644
--- a/jstests/concurrency/fsm_workloads/distinct.js
+++ b/jstests/concurrency/fsm_workloads/distinct.js
@@ -21,7 +21,7 @@ var $config = (function() {
             var res = bulk.execute();
             assertAlways.commandWorked(res);
             assertAlways.eq(this.numDocs, res.nInserted);
-            assertAlways.commandWorked(db[this.threadCollName].ensureIndex({i: 1}));
+            assertAlways.commandWorked(db[this.threadCollName].createIndex({i: 1}));
         }
 
         function distinct(db, collName) {
diff --git a/jstests/concurrency/fsm_workloads/explain.js b/jstests/concurrency/fsm_workloads/explain.js
index b4943a23300..ca20aa4b8c9 100644
--- a/jstests/concurrency/fsm_workloads/explain.js
+++ b/jstests/concurrency/fsm_workloads/explain.js
@@ -26,7 +26,7 @@ var $config = (function() {
     };
 
     function setup(db, collName, cluster) {
-        assertAlways.commandWorked(db[collName].ensureIndex({j: 1}));
+        assertAlways.commandWorked(db[collName].createIndex({j: 1}));
     }
 
     var states = (function() {
diff --git a/jstests/concurrency/fsm_workloads/findAndModify_remove_queue.js b/jstests/concurrency/fsm_workloads/findAndModify_remove_queue.js
index 6c49a7cc249..e902ceb1959 100644
--- a/jstests/concurrency/fsm_workloads/findAndModify_remove_queue.js
+++ b/jstests/concurrency/fsm_workloads/findAndModify_remove_queue.js
@@ -97,8 +97,8 @@ var $config = (function() {
         assertAlways.commandWorked(res);
         assertAlways.eq(this.numDocs, res.nInserted);
 
-        this.getIndexSpecs().forEach(function ensureIndex(indexSpec) {
-            assertAlways.commandWorked(db[collName].ensureIndex(indexSpec));
+        this.getIndexSpecs().forEach(function createIndex(indexSpec) {
+            assertAlways.commandWorked(db[collName].createIndex(indexSpec));
         });
     }
 
diff --git a/jstests/concurrency/fsm_workloads/findAndModify_update.js b/jstests/concurrency/fsm_workloads/findAndModify_update.js
index 9035e6f472f..e97281b5a8a 100644
--- a/jstests/concurrency/fsm_workloads/findAndModify_update.js
+++ b/jstests/concurrency/fsm_workloads/findAndModify_update.js
@@ -83,7 +83,7 @@ var $config = (function() {
     };
 
     function setup(db, collName, cluster) {
-        var res = db[collName].ensureIndex({tid: 1, value: 1});
+        var res = db[collName].createIndex({tid: 1, value: 1});
         assertAlways.commandWorked(res);
     }
 
diff --git a/jstests/concurrency/fsm_workloads/indexed_insert_text.js b/jstests/concurrency/fsm_workloads/indexed_insert_text.js
index beea5501dd7..cb467a03a4a 100644
--- a/jstests/concurrency/fsm_workloads/indexed_insert_text.js
+++ b/jstests/concurrency/fsm_workloads/indexed_insert_text.js
@@ -37,7 +37,7 @@ var $config = (function() {
         var ixSpec = {};
         ixSpec[this.indexedField] = 'text';
         // Only allowed to create one text index, other tests may create one.
-        assertWhenOwnColl.commandWorked(db[collName].ensureIndex(ixSpec));
+        assertWhenOwnColl.commandWorked(db[collName].createIndex(ixSpec));
     }
 
     var text = [
diff --git a/jstests/concurrency/fsm_workloads/indexed_insert_ttl.js b/jstests/concurrency/fsm_workloads/indexed_insert_ttl.js
index 5a54c673cac..b0d999076e7 100644
--- a/jstests/concurrency/fsm_workloads/indexed_insert_ttl.js
+++ b/jstests/concurrency/fsm_workloads/indexed_insert_ttl.js
@@ -27,7 +27,7 @@ var $config = (function() {
     var transitions = {init: {insert: 1}, insert: {insert: 1}};
 
     function setup(db, collName, cluster) {
-        var res = db[collName].ensureIndex({indexed_insert_ttl: 1},
+        var res = db[collName].createIndex({indexed_insert_ttl: 1},
                                            {expireAfterSeconds: this.ttlSeconds});
         assertAlways.commandWorked(res);
     }
diff --git a/jstests/concurrency/fsm_workloads/indexed_insert_where.js b/jstests/concurrency/fsm_workloads/indexed_insert_where.js
index 5233c6c3e48..4cd751c1e1c 100644
--- a/jstests/concurrency/fsm_workloads/indexed_insert_where.js
+++ b/jstests/concurrency/fsm_workloads/indexed_insert_where.js
@@ -42,7 +42,7 @@ var $config = (function() {
     var transitions = {insert: {insert: 0.2, query: 0.8}, query: {insert: 0.8, query: 0.2}};
 
     var setup = function setup(db, collName, cluster) {
-        assertAlways.commandWorked(db[collName].ensureIndex({tid: 1}));
+        assertAlways.commandWorked(db[collName].createIndex({tid: 1}));
     };
 
     return {
diff --git a/jstests/concurrency/fsm_workloads/list_indexes.js b/jstests/concurrency/fsm_workloads/list_indexes.js
index ba5549e1e68..687f871a378 100644
--- a/jstests/concurrency/fsm_workloads/list_indexes.js
+++ b/jstests/concurrency/fsm_workloads/list_indexes.js
@@ -15,7 +15,7 @@ var $config = (function() {
 
             assertWhenOwnColl.commandWorked(db[collName].dropIndex(spec));
             sleep(100);
-            assertWhenOwnColl.commandWorked(db[collName].ensureIndex(spec));
+            assertWhenOwnColl.commandWorked(db[collName].createIndex(spec));
         }
 
         // List indexes, using a batchSize of 2 to ensure getmores happen.
@@ -38,7 +38,7 @@ var $config = (function() {
         for (var i = 0; i < this.threadCount; ++i) {
             var spec = {};
             spec['foo' + i] = 1;
-            assertAlways.commandWorked(db[collName].ensureIndex(spec));
+            assertAlways.commandWorked(db[collName].createIndex(spec));
         }
     }
 
diff --git a/jstests/concurrency/fsm_workloads/update_array.js b/jstests/concurrency/fsm_workloads/update_array.js
index 457392279fd..99e31e735a3 100644
--- a/jstests/concurrency/fsm_workloads/update_array.js
+++ b/jstests/concurrency/fsm_workloads/update_array.js
@@ -109,7 +109,7 @@ var $config = (function() {
 
     function setup(db, collName, cluster) {
         // index on 'arr', the field being updated
-        assertAlways.commandWorked(db[collName].ensureIndex({arr: 1}));
+        assertAlways.commandWorked(db[collName].createIndex({arr: 1}));
         for (var i = 0; i < this.numDocs; ++i) {
             var res = db[collName].insert({_id: i, arr: []});
             assertWhenOwnColl.commandWorked(res);
diff --git a/jstests/concurrency/fsm_workloads/update_check_index.js b/jstests/concurrency/fsm_workloads/update_check_index.js
index 8cfa98f6c84..71b8d32dfae 100644
--- a/jstests/concurrency/fsm_workloads/update_check_index.js
+++ b/jstests/concurrency/fsm_workloads/update_check_index.js
@@ -20,9 +20,9 @@ var $config = (function() {
     var transitions = {multiUpdate: {multiUpdate: 1.0}};
 
     function setup(db, collName, cluster) {
-        assertAlways.commandWorked(db[collName].ensureIndex({a: 1}));
-        assertAlways.commandWorked(db[collName].ensureIndex({b: 1}));
-        assertAlways.commandWorked(db[collName].ensureIndex({c: 1}));
+        assertAlways.commandWorked(db[collName].createIndex({a: 1}));
+        assertAlways.commandWorked(db[collName].createIndex({b: 1}));
+        assertAlways.commandWorked(db[collName].createIndex({c: 1}));
 
         for (var i = 0; i < 10; i++) {
             assertAlways.commandWorked(db[collName].insert({a: 1, b: 1, c: 1}));
diff --git a/jstests/concurrency/fsm_workloads/update_multifield.js b/jstests/concurrency/fsm_workloads/update_multifield.js
index 25be0291c5a..311039d3877 100644
--- a/jstests/concurrency/fsm_workloads/update_multifield.js
+++ b/jstests/concurrency/fsm_workloads/update_multifield.js
@@ -52,10 +52,10 @@ var $config = (function() {
     var transitions = {update: {update: 1}};
 
     function setup(db, collName, cluster) {
-        assertAlways.commandWorked(db[collName].ensureIndex({x: 1}));
-        assertAlways.commandWorked(db[collName].ensureIndex({y: 1}));
-        assertAlways.commandWorked(db[collName].ensureIndex({z: 1}));
-        assertAlways.commandWorked(db[collName].ensureIndex({x: 1, y: 1, z: 1}));
+        assertAlways.commandWorked(db[collName].createIndex({x: 1}));
+        assertAlways.commandWorked(db[collName].createIndex({y: 1}));
+        assertAlways.commandWorked(db[collName].createIndex({z: 1}));
+        assertAlways.commandWorked(db[collName].createIndex({x: 1, y: 1, z: 1}));
 
         // numDocs should be much less than threadCount, to make more threads use the same docs.
         this.numDocs = Math.floor(this.threadCount / 3);
diff --git a/jstests/concurrency/fsm_workloads/update_rename.js b/jstests/concurrency/fsm_workloads/update_rename.js
index c542382fc89..f76bbd5b81b 100644
--- a/jstests/concurrency/fsm_workloads/update_rename.js
+++ b/jstests/concurrency/fsm_workloads/update_rename.js
@@ -43,7 +43,7 @@ var $config = (function() {
         fieldNames.slice(1).forEach(function(fieldName) {
             var indexSpec = {};
             indexSpec[fieldName] = 1;
-            assertAlways.commandWorked(db[collName].ensureIndex(indexSpec));
+            assertAlways.commandWorked(db[collName].createIndex(indexSpec));
         });
 
         // numDocs should be much less than threadCount, to make more threads use the same docs.
diff --git a/jstests/concurrency/fsm_workloads/update_replace.js b/jstests/concurrency/fsm_workloads/update_replace.js
index c52c12f05a9..1d789b8eccc 100644
--- a/jstests/concurrency/fsm_workloads/update_replace.js
+++ b/jstests/concurrency/fsm_workloads/update_replace.js
@@ -57,12 +57,12 @@ var $config = (function() {
     var transitions = {update: {update: 1}};
 
     function setup(db, collName, cluster) {
-        assertAlways.commandWorked(db[collName].ensureIndex({a: 1}));
-        assertAlways.commandWorked(db[collName].ensureIndex({b: 1}));
+        assertAlways.commandWorked(db[collName].createIndex({a: 1}));
+        assertAlways.commandWorked(db[collName].createIndex({b: 1}));
         // no index on c
 
-        assertAlways.commandWorked(db[collName].ensureIndex({x: 1}));
-        assertAlways.commandWorked(db[collName].ensureIndex({y: 1}));
+        assertAlways.commandWorked(db[collName].createIndex({x: 1}));
+        assertAlways.commandWorked(db[collName].createIndex({y: 1}));
         // no index on z
 
         // numDocs should be much less than threadCount, to make more threads use the same docs.
diff --git a/jstests/concurrency/fsm_workloads/update_simple.js b/jstests/concurrency/fsm_workloads/update_simple.js
index 2d6754ec93a..519d807b855 100644
--- a/jstests/concurrency/fsm_workloads/update_simple.js
+++ b/jstests/concurrency/fsm_workloads/update_simple.js
@@ -27,7 +27,7 @@ var $config = (function() {
 
     function setup(db, collName, cluster) {
         // index on 'value', the field being updated
-        assertAlways.commandWorked(db[collName].ensureIndex({value: 1}));
+        assertAlways.commandWorked(db[collName].createIndex({value: 1}));
 
         // numDocs should be much less than threadCount, to make more threads use the same docs.
         this.numDocs = Math.floor(this.threadCount / 5);
diff --git a/jstests/concurrency/fsm_workloads/update_upsert_multi.js b/jstests/concurrency/fsm_workloads/update_upsert_multi.js
index bffcbc232fa..34d81924bb6 100644
--- a/jstests/concurrency/fsm_workloads/update_upsert_multi.js
+++ b/jstests/concurrency/fsm_workloads/update_upsert_multi.js
@@ -66,7 +66,7 @@ var $config = (function() {
     };
 
     function setup(db, collName, cluster) {
-        assertAlways.commandWorked(db[collName].ensureIndex({tid: 1, i: 1}));
+        assertAlways.commandWorked(db[collName].createIndex({tid: 1, i: 1}));
     }
 
     return {
diff --git a/jstests/concurrency/fsm_workloads/yield_geo_near.js b/jstests/concurrency/fsm_workloads/yield_geo_near.js
index e6509bb7503..f3016c5332e 100644
--- a/jstests/concurrency/fsm_workloads/yield_geo_near.js
+++ b/jstests/concurrency/fsm_workloads/yield_geo_near.js
@@ -74,7 +74,7 @@ var $config = extendWorkload($config, function($config, $super) {
             }
         }
         assertAlways.commandWorked(bulk.execute());
-        assertAlways.commandWorked(db[collName].ensureIndex(this.getIndexSpec()));
+        assertAlways.commandWorked(db[collName].createIndex(this.getIndexSpec()));
     };
 
     return $config;
diff --git a/jstests/concurrency/fsm_workloads/yield_rooted_or.js b/jstests/concurrency/fsm_workloads/yield_rooted_or.js
index b21e918e5bc..7b5cd4b3cdd 100644
--- a/jstests/concurrency/fsm_workloads/yield_rooted_or.js
+++ b/jstests/concurrency/fsm_workloads/yield_rooted_or.js
@@ -37,8 +37,8 @@ var $config = extendWorkload($config, function($config, $super) {
     $config.setup = function setup(db, collName, cluster) {
         $super.setup.apply(this, arguments);
 
-        assertAlways.commandWorked(db[collName].ensureIndex({c: 1}));
-        assertAlways.commandWorked(db[collName].ensureIndex({d: 1}));
+        assertAlways.commandWorked(db[collName].createIndex({c: 1}));
+        assertAlways.commandWorked(db[collName].createIndex({d: 1}));
     };
 
     return $config;
diff --git a/jstests/concurrency/fsm_workloads/yield_sort_merge.js b/jstests/concurrency/fsm_workloads/yield_sort_merge.js
index b66f185854d..2962744a482 100644
--- a/jstests/concurrency/fsm_workloads/yield_sort_merge.js
+++ b/jstests/concurrency/fsm_workloads/yield_sort_merge.js
@@ -45,7 +45,7 @@ var $config = extendWorkload($config, function($config, $super) {
     $config.setup = function setup(db, collName, cluster) {
         $super.setup.apply(this, arguments);
 
-        assertAlways.commandWorked(db[collName].ensureIndex({a: 1, b: 1}));
+        assertAlways.commandWorked(db[collName].createIndex({a: 1, b: 1}));
     };
 
     return $config;
diff --git a/jstests/concurrency/fsm_workloads/yield_text.js b/jstests/concurrency/fsm_workloads/yield_text.js
index 2b14a051b73..2bd4a5608ff 100644
--- a/jstests/concurrency/fsm_workloads/yield_text.js
+++ b/jstests/concurrency/fsm_workloads/yield_text.js
@@ -42,7 +42,7 @@ var $config = extendWorkload($config, function($config, $super) {
     $config.setup = function setup(db, collName, cluster) {
         $super.setup.apply(this, arguments);
 
-        assertWhenOwnColl.commandWorked(db[collName].ensureIndex({yield_text: 'text'}));
+        assertWhenOwnColl.commandWorked(db[collName].createIndex({yield_text: 'text'}));
     };
 
     return $config;