CSHARP-889: using new createIndexes commands when talking with a 2.6 server.

Author: craiggwilson

MongoDB.Driver/Communication/FeatureDetection/FeatureSetDetector.cs

@@ -50,6 +50,7 @@ internal class FeatureSetDetector
             // added in 2.5.5
             new FeatureSetDependency(
                 new ServerVersionDependency(2, 5, 5),
+                FeatureId.CreateIndexCommand,
                 FeatureId.TextSearchQuery,
                 FeatureId.WriteCommands),
        };

MongoDB.Driver/FeatureId.cs

@@ -37,6 +37,10 @@ public enum FeatureId
         /// </summary>
         AggregateOutputToCollection,
         /// <summary>
+        /// The create index command feature.
+        /// </summary>
+        CreateIndexCommand,
+        /// <summary>
         /// The max time feature.
         /// </summary>
         MaxTime,

MongoDB.Driver/GridFS/MongoGridFS.cs

@@ -595,8 +595,8 @@ public void EnsureIndexes(int maxFiles)
             var count = filesCollection.Count();
             if (count < maxFiles)
             {
-                filesCollection.EnsureIndex("filename", "uploadDate");
-                chunksCollection.EnsureIndex(IndexKeys.Ascending("files_id", "n"), IndexOptions.SetUnique(true));
+                filesCollection.CreateIndex("filename", "uploadDate");
+                chunksCollection.CreateIndex(IndexKeys.Ascending("files_id", "n"), IndexOptions.SetUnique(true));
             }
         }
 

MongoDB.Driver/MongoCollection.cs

@@ -288,35 +288,37 @@ 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();
-            var optionsDocument = options.ToBsonDocument();
-            var indexes = _database.GetCollection("system.indexes");
-            var indexName = GetIndexName(keysDocument, optionsDocument);
-            var index = new BsonDocument
+            using (_database.RequestStart(ReadPreference.Primary))
             {
-                { "name", indexName },
-                { "ns", FullName },
-                { "key", keysDocument }
-            };
-            index.Merge(optionsDocument);
-            var insertOptions = new MongoInsertOptions
-            {
-                CheckElementNames = false,
-                WriteConcern = WriteConcern.Acknowledged
-            };
-            var result = indexes.Insert(index, insertOptions);
-            return result;
+                if (_server.RequestConnection.ServerInstance.Supports(FeatureId.CreateIndexCommand))
+                {
+                    try
+                    {
+                        CreateIndexWithCommand(keys, options);
+                        var fakeResponse = new BsonDocument("ok", 1);
+                        return new WriteConcernResult(fakeResponse);
+                    }
+                    catch (MongoCommandException ex)
+                    {
+                        var translatedResult = new WriteConcernResult(ex.CommandResult.Response);
+                        translatedResult.Command = ex.CommandResult.Command;
+                        throw new WriteConcernException(ex.Message, translatedResult);
+                    }
+                }
+                else
+                {
+                    return CreateIndexWithInsert(keys, options);
+                }
+            }
         }
 
         /// <summary>
         /// Creates an index for this collection.
         /// </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);
@@ -327,7 +329,6 @@ 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));
@@ -487,33 +488,30 @@ public virtual CommandResult DropIndexByName(string indexName)
         /// </summary>
         /// <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>
+        [Obsolete("Use CreateIndex instead.")]
         public virtual void EnsureIndex(IMongoIndexKeys keys, IMongoIndexOptions options)
         {
-#pragma warning disable 618
             CreateIndex(keys, options);
-#pragma warning restore
         }
 
         /// <summary>
         /// Ensures that the desired index exists and creates it if it does not.
         /// </summary>
         /// <param name="keys">The indexed fields (usually an IndexKeysDocument or constructed using the IndexKeys builder).</param>
+        [Obsolete("Use CreateIndex instead.")]
         public virtual void EnsureIndex(IMongoIndexKeys keys)
         {
-#pragma warning disable 618
             CreateIndex(keys);
-#pragma warning restore
         }
 
         /// <summary>
         /// Ensures that the desired index exists and creates it if it does not.
         /// </summary>
         /// <param name="keyNames">The names of the indexed fields.</param>
+        [Obsolete("Use CreateIndex instead.")]
         public virtual void EnsureIndex(params string[] keyNames)
         {
-#pragma warning disable 618
             CreateIndex(keyNames);
-#pragma warning restore
         }
 
         /// <summary>
@@ -2159,6 +2157,30 @@ private void AssignId(InsertRequest request)
             }
         }
 
+        private CommandResult CreateIndexWithCommand(IMongoIndexKeys keys, IMongoIndexOptions options)
+        {
+            var command = new CommandDocument
+            {
+                { "createIndexes", Name },
+                { "indexes", new BsonArray { GetIndexDocument(keys, options) } }
+            };
+
+            return RunCommandAs<CommandResult>(command);
+        }
+
+        private WriteConcernResult CreateIndexWithInsert(IMongoIndexKeys keys, IMongoIndexOptions options)
+        {
+            var index = GetIndexDocument(keys, options);
+            var insertOptions = new MongoInsertOptions
+            {
+                CheckElementNames = false,
+                WriteConcern = WriteConcern.Acknowledged
+            };
+            var indexes = _database.GetCollection("system.indexes");
+            var result = indexes.Insert(index, insertOptions);
+            return result;
+        }
+
         private MongoCursor FindAs(Type documentType, IMongoQuery query, IBsonSerializer serializer, IBsonSerializationOptions serializationOptions)
         {
             return MongoCursor.Create(documentType, this, query, _settings.ReadPreference, serializer, serializationOptions);
@@ -2197,6 +2219,22 @@ private BsonBinaryWriterSettings GetBinaryWriterSettings()
             };
         }
 
+        private BsonDocument GetIndexDocument(IMongoIndexKeys keys, IMongoIndexOptions options)
+        {
+            var keysDocument = keys.ToBsonDocument();
+            var optionsDocument = options.ToBsonDocument();
+            var indexName = GetIndexName(keysDocument, optionsDocument);
+            var index = new BsonDocument
+            {
+                { "ns", FullName },
+                { "name", indexName },
+                { "key", keysDocument }
+            };
+            index.Merge(optionsDocument);
+
+            return index;
+        }
+
         private string GetIndexName(BsonDocument keys, BsonDocument options)
         {
             if (options != null)