CSHARP-1108: changed storageOptions to storageEngine

Author: craiggwilson

MongoDB.Driver/Builders/CollectionOptionsBuilder.cs

@@ -77,13 +77,13 @@ public static CollectionOptionsBuilder SetMaxSize(long value)
         }
 
         /// <summary>
-        /// Sets the storage options.
+        /// Sets the storage engine options.
         /// </summary>
         /// <param name="value">The value.</param>
         /// <returns>The builder (so method calls can be chained).</returns>
-        public static CollectionOptionsBuilder SetStorageOptions(BsonDocument value)
+        public static CollectionOptionsBuilder SetStorageEngineOptions(BsonDocument value)
         {
-            return new CollectionOptionsBuilder().SetStorageOptions(value);
+            return new CollectionOptionsBuilder().SetStorageEngineOptions(value);
         }
     }
 
@@ -155,9 +155,9 @@ public CollectionOptionsBuilder SetMaxSize(long value)
         /// </summary>
         /// <param name="value">The value.</param>
         /// <returns>The builder (so method calls can be chained).</returns>
-        public CollectionOptionsBuilder SetStorageOptions(BsonDocument value)
+        public CollectionOptionsBuilder SetStorageEngineOptions(BsonDocument value)
         {
-            _document["storageOptions"] = value;
+            _document["storageEngine"] = value;
             return this;
         }
 

MongoDB.Driver/Builders/IndexOptionsBuilder.cs

@@ -114,9 +114,9 @@ public static IndexOptionsBuilder SetSparse(bool value)
         /// </summary>
         /// <param name="value">The value.</param>
         /// <returns>The builder (so method calls can be chained).</returns>
-        public static IndexOptionsBuilder SetStorageOptions(BsonDocument value)
+        public static IndexOptionsBuilder SetStorageEngineOptions(BsonDocument value)
         {
-            return new IndexOptionsBuilder().SetStorageOptions(value);
+            return new IndexOptionsBuilder().SetStorageEngineOptions(value);
         }
 
         /// <summary>
@@ -276,9 +276,9 @@ public IndexOptionsBuilder SetSparse(bool value)
         /// </summary>
         /// <param name="value">The value.</param>
         /// <returns>The builder (so method calls can be chained).</returns>
-        public IndexOptionsBuilder SetStorageOptions(BsonDocument value)
+        public IndexOptionsBuilder SetStorageEngineOptions(BsonDocument value)
         {
-            _document["storageOptions"] = value;
+            _document["storageEngine"] = value;
             return this;
         }
 
@@ -460,9 +460,9 @@ public static IndexOptionsBuilder<TDocument> SetSparse(bool value)
         /// </summary>
         /// <param name="value">The value.</param>
         /// <returns>The builder (so method calls can be chained).</returns>
-        public static IndexOptionsBuilder<TDocument> SetStorageOptions(BsonDocument value)
+        public static IndexOptionsBuilder<TDocument> SetStorageEngineOptions(BsonDocument value)
         {
-            return new IndexOptionsBuilder<TDocument>().SetStorageOptions(value);
+            return new IndexOptionsBuilder<TDocument>().SetStorageEngineOptions(value);
         }
 
         /// <summary>
@@ -627,9 +627,9 @@ public IndexOptionsBuilder<TDocument> SetSparse(bool value)
         /// </summary>
         /// <param name="value">The value.</param>
         /// <returns>The builder (so method calls can be chained).</returns>
-        public IndexOptionsBuilder<TDocument> SetStorageOptions(BsonDocument value)
+        public IndexOptionsBuilder<TDocument> SetStorageEngineOptions(BsonDocument value)
         {
-            _indexOptionsBuilder.SetStorageOptions(value);
+            _indexOptionsBuilder.SetStorageEngineOptions(value);
             return this;
         }
 

MongoDB.DriverUnitTests/MongoCollectionTests.cs

@@ -603,18 +603,23 @@ public void TestCreateCollectionSetCappedSetMaxSize()
         }
 
         [Test]
-        [RequiresServer(StorageEngines = "wiredtiger")]
+        [RequiresServer(MinimumVersion = "2.7.0")]
         public void TestCreateCollectionSetStorageOptions()
         {
-            var collection = _database.GetCollection("cappedcollection");
+            var collection = _database.GetCollection("storage_engine_collection");
             collection.Drop();
             Assert.IsFalse(collection.Exists());
-            var options = CollectionOptions.SetStorageOptions(
-                new BsonDocument("wiredtiger", new BsonDocument("configString", "block_compressor=zlib")));
+            var storageEngineOptions = new BsonDocument
+            {
+                { "wiredtiger", new BsonDocument("configString", "block_compressor=zlib") },
+                { "mmapv1", new BsonDocument() }
+            };
+            var options = CollectionOptions.SetStorageEngineOptions(storageEngineOptions);
             _database.CreateCollection(collection.Name, options);
-            Assert.IsTrue(collection.Exists());
-            var stats = collection.GetStats();
-            collection.Drop();
+
+            var result = _database.RunCommand("listCollections");
+            var resultCollection = result.Response["collections"].AsBsonArray.Where(doc => doc["name"] == collection.Name).Single();
+            Assert.AreEqual(storageEngineOptions, resultCollection["options"]["storageEngine"]);
         }
 
         [Test]
@@ -702,7 +707,7 @@ public void TestCreateIndexWithStorageOptions()
 
             _collection.CreateIndex(
                 IndexKeys.Ascending("x"),
-                IndexOptions.SetStorageOptions(
+                IndexOptions.SetStorageEngineOptions(
                     new BsonDocument("wiredtiger", new BsonDocument("configString", "block_compressor=zlib"))));
 
             var result = _collection.GetIndexes();