CSHARP-736: Don't cache EnsureIndex and deprecate CreateIndex.

Author: rstam

MongoDB.Driver/GridFS/MongoGridFS.cs

@@ -426,33 +426,13 @@ public void EnsureIndexes(int maxFiles)
             // 1. we might be reading from a secondary
             // 2. we might be authenticating as a read-only uaser
 
-            // avoid round trip to count files if possible
-            var indexCache = _database.Server.IndexCache;
-            if (indexCache.Contains(_files, "filename_1_uploadDate_1") &&
-                indexCache.Contains(_chunks, "files_id_1_n_1"))
-            {
-                return;
-            }
-
             // only create indexes if number of GridFS files is still small (to avoid performance surprises)
             var count = _files.Count();
             if (count < maxFiles)
             {
                 _files.EnsureIndex("filename", "uploadDate");
                 _chunks.EnsureIndex(IndexKeys.Ascending("files_id", "n"), IndexOptions.SetUnique(true));
             }
-            else
-            {
-                // at least check to see if the indexes exist so we can stop calling files.Count()
-                if (_files.IndexExistsByName("filename_1_uploadDate_1"))
-                {
-                    indexCache.Add(_files, "filename_1_uploadDate_1");
-                }
-                if (_chunks.IndexExistsByName("files_id_1_n_1"))
-                {
-                    indexCache.Add(_chunks, "files_id_1_n_1");
-                }
-            }
         }
 
         /// <summary>

MongoDB.Driver/IndexCache.cs

@@ -173,6 +173,7 @@ public virtual long Count(IMongoQuery query)
         /// <param name="keys">The indexed fields (usually an IndexKeysDocument or constructed using the IndexKeys builder).</param>
         /// <param name="options">The index options(usually an IndexOptionsDocument or created using the IndexOption builder).</param>
         /// <returns>A WriteConcernResult.</returns>
+        [Obsolete("Use EnsureIndex instead.")]
         public virtual WriteConcernResult CreateIndex(IMongoIndexKeys keys, IMongoIndexOptions options)
         {
             var keysDocument = keys.ToBsonDocument();
@@ -200,6 +201,7 @@ public virtual WriteConcernResult CreateIndex(IMongoIndexKeys keys, IMongoIndexO
         /// </summary>
         /// <param name="keys">The indexed fields (usually an IndexKeysDocument or constructed using the IndexKeys builder).</param>
         /// <returns>A WriteConcernResult.</returns>
+        [Obsolete("Use EnsureIndex instead.")]
         public virtual WriteConcernResult CreateIndex(IMongoIndexKeys keys)
         {
             return CreateIndex(keys, IndexOptions.Null);
@@ -210,6 +212,7 @@ public virtual WriteConcernResult CreateIndex(IMongoIndexKeys keys)
         /// </summary>
         /// <param name="keyNames">The names of the indexed fields.</param>
         /// <returns>A WriteConcernResult.</returns>
+        [Obsolete("Use EnsureIndex instead.")]
         public virtual WriteConcernResult CreateIndex(params string[] keyNames)
         {
             return CreateIndex(IndexKeys.Ascending(keyNames));
@@ -307,15 +310,6 @@ public virtual CommandResult DropIndex(params string[] keyNames)
         /// <returns>A <see cref="CommandResult"/>.</returns>
         public virtual CommandResult DropIndexByName(string indexName)
         {
-            // remove from cache first (even if command ends up failing)
-            if (indexName == "*")
-            {
-                _server.IndexCache.Reset(this);
-            }
-            else
-            {
-                _server.IndexCache.Remove(this, indexName);
-            }
             var command = new CommandDocument
             {
                 { "deleteIndexes", _name }, // not FullName
@@ -342,14 +336,9 @@ public virtual CommandResult DropIndexByName(string indexName)
         /// <param name="options">The index options(usually an IndexOptionsDocument or created using the IndexOption builder).</param>
         public virtual void EnsureIndex(IMongoIndexKeys keys, IMongoIndexOptions options)
         {
-            var keysDocument = keys.ToBsonDocument();
-            var optionsDocument = options.ToBsonDocument();
-            var indexName = GetIndexName(keysDocument, optionsDocument);
-            if (!_server.IndexCache.Contains(this, indexName))
-            {
-                CreateIndex(keys, options);
-                _server.IndexCache.Add(this, indexName);
-            }
+#pragma warning disable 618
+            CreateIndex(keys, options);
+#pragma warning restore
         }
 
         /// <summary>
@@ -358,7 +347,9 @@ public virtual void EnsureIndex(IMongoIndexKeys keys, IMongoIndexOptions options
         /// <param name="keys">The indexed fields (usually an IndexKeysDocument or constructed using the IndexKeys builder).</param>
         public virtual void EnsureIndex(IMongoIndexKeys keys)
         {
-            EnsureIndex(keys, IndexOptions.Null);
+#pragma warning disable 618
+            CreateIndex(keys);
+#pragma warning restore
         }
 
         /// <summary>
@@ -367,12 +358,9 @@ public virtual void EnsureIndex(IMongoIndexKeys keys)
         /// <param name="keyNames">The names of the indexed fields.</param>
         public virtual void EnsureIndex(params string[] keyNames)
         {
-            string indexName = GetIndexName(keyNames);
-            if (!_server.IndexCache.Contains(this, indexName))
-            {
-                CreateIndex(IndexKeys.Ascending(keyNames), IndexOptions.SetName(indexName));
-                _server.IndexCache.Add(this, indexName);
-            }
+#pragma warning disable 618
+            CreateIndex(keyNames);
+#pragma warning restore
         }
 
         /// <summary>
@@ -1343,16 +1331,6 @@ public virtual WriteConcernResult RemoveAll(WriteConcern writeConcern)
             return Remove(Query.Null, RemoveFlags.None, writeConcern);
         }
 
-        /// <summary>
-        /// Removes all entries for this collection in the index cache used by EnsureIndex. Call this method
-        /// when you know (or suspect) that a process other than this one may have dropped one or
-        /// more indexes.
-        /// </summary>
-        public virtual void ResetIndexCache()
-        {
-            _server.IndexCache.Reset(this);
-        }
-
         /// <summary>
         /// Saves a document to this collection. The document must have an identifiable Id field. Based on the value
         /// of the Id field Save will perform either an Insert or an Update.

MongoDB.Driver/MongoCollection.cs

@@ -303,7 +303,6 @@
     <Compile Include="Communication\Proxies\MongoServerProxyFactory.cs" />
     <Compile Include="Communication\Proxies\DiscoveringMongoServerProxy.cs" />
     <Compile Include="Communication\Proxies\IMongoServerProxy.cs" />
-    <Compile Include="IndexCache.cs" />
     <Compile Include="MongoCursorEnumerator.cs" />
     <Compile Include="Communication\Messages\MongoKillCursorsMessage.cs" />
     <Compile Include="Communication\Proxies\BlockingQueue.cs" />

MongoDB.Driver/MongoDB.Driver.csproj

@@ -360,7 +360,6 @@ public virtual CommandResult DropCollection(string collectionName)
             {
                 var command = new CommandDocument("drop", collectionName);
                 var result = RunCommandAs<CommandResult>(command);
-                _server.IndexCache.Reset(_name, collectionName);
                 return result;
             }
             catch (MongoCommandException ex)
@@ -879,16 +878,6 @@ public virtual IDisposable RequestStart(ReadPreference readPreference)
 
         // TODO: mongo shell has ResetError at the database level
 
-        /// <summary>
-        /// Removes all entries for this database in the index cache used by EnsureIndex. Call this method
-        /// when you know (or suspect) that a process other than this one may have dropped one or
-        /// more indexes.
-        /// </summary>
-        public virtual void ResetIndexCache()
-        {
-            _server.IndexCache.Reset(this);
-        }
-
         /// <summary>
         /// Runs a command on this database.
         /// </summary>