CSHARP-1108: support for storage options in create index and create collection.

Author: craiggwilson

MongoDB.Driver/Builders/CollectionOptionsBuilder.cs

@@ -75,6 +75,16 @@ public static CollectionOptionsBuilder SetMaxSize(long value)
         {
             return new CollectionOptionsBuilder().SetMaxSize(value);
         }
+
+        /// <summary>
+        /// Sets the storage options.
+        /// </summary>
+        /// <param name="value">The value.</param>
+        /// <returns>The builder (so method calls can be chained).</returns>
+        public static CollectionOptionsBuilder SetStorageOptions(BsonDocument value)
+        {
+            return new CollectionOptionsBuilder().SetStorageOptions(value);
+        }
     }
 
     /// <summary>
@@ -140,6 +150,17 @@ public CollectionOptionsBuilder SetMaxSize(long value)
             return this;
         }
 
+        /// <summary>
+        /// Sets the storage options.
+        /// </summary>
+        /// <param name="value">The value.</param>
+        /// <returns>The builder (so method calls can be chained).</returns>
+        public CollectionOptionsBuilder SetStorageOptions(BsonDocument value)
+        {
+            _document["storageOptions"] = value;
+            return this;
+        }
+
         /// <summary>
         /// Returns the result of the builder as a BsonDocument.
         /// </summary>

MongoDB.Driver/Builders/IndexOptionsBuilder.cs

@@ -109,6 +109,16 @@ public static IndexOptionsBuilder SetSparse(bool value)
             return new IndexOptionsBuilder().SetSparse(value);
         }
 
+        /// <summary>
+        /// Sets the storage options.
+        /// </summary>
+        /// <param name="value">The value.</param>
+        /// <returns>The builder (so method calls can be chained).</returns>
+        public static IndexOptionsBuilder SetStorageOptions(BsonDocument value)
+        {
+            return new IndexOptionsBuilder().SetStorageOptions(value);
+        }
+
         /// <summary>
         /// Sets the default language for the text index.
         /// </summary>
@@ -261,6 +271,17 @@ public IndexOptionsBuilder SetSparse(bool value)
             return this;
         }
 
+        /// <summary>
+        /// Sets the storage options.
+        /// </summary>
+        /// <param name="value">The value.</param>
+        /// <returns>The builder (so method calls can be chained).</returns>
+        public IndexOptionsBuilder SetStorageOptions(BsonDocument value)
+        {
+            _document["storageOptions"] = value;
+            return this;
+        }
+
         /// <summary>
         /// Sets the default language for the text index.
         /// </summary>
@@ -434,6 +455,16 @@ public static IndexOptionsBuilder<TDocument> SetSparse(bool value)
             return new IndexOptionsBuilder<TDocument>().SetSparse(value);
         }
 
+        /// <summary>
+        /// Sets the storage options.
+        /// </summary>
+        /// <param name="value">The value.</param>
+        /// <returns>The builder (so method calls can be chained).</returns>
+        public static IndexOptionsBuilder<TDocument> SetStorageOptions(BsonDocument value)
+        {
+            return new IndexOptionsBuilder<TDocument>().SetStorageOptions(value);
+        }
+
         /// <summary>
         /// Sets the default language for the text index.
         /// </summary>
@@ -591,6 +622,17 @@ public IndexOptionsBuilder<TDocument> SetSparse(bool value)
             return this;
         }
 
+        /// <summary>
+        /// Sets the storage options.
+        /// </summary>
+        /// <param name="value">The value.</param>
+        /// <returns>The builder (so method calls can be chained).</returns>
+        public IndexOptionsBuilder<TDocument> SetStorageOptions(BsonDocument value)
+        {
+            _indexOptionsBuilder.SetStorageOptions(value);
+            return this;
+        }
+
         /// <summary>
         /// Sets the default language for the text index.
         /// </summary>
@@ -676,6 +718,5 @@ protected override void Serialize(BsonWriter bsonWriter, Type nominalType, IBson
         {
             ((IBsonSerializable)_indexOptionsBuilder).Serialize(bsonWriter, nominalType, options);
         }
-
     }
 }

MongoDB.DriverUnitTests/MongoCollectionTests.cs

@@ -422,8 +422,8 @@ public void TestBulkWriteUnordered()
             _collection.Drop();
             _collection.BulkWrite(new BulkWriteArgs
             {
-                WriteConcern = WriteConcern.Acknowledged, 
-                IsOrdered = false, 
+                WriteConcern = WriteConcern.Acknowledged,
+                IsOrdered = false,
                 Requests = new WriteRequest[]
                 {
                     new UpdateRequest(Query.EQ("x", 1), Update.Set("y", 1)) { IsUpsert = true },
@@ -493,7 +493,7 @@ public void TestCountWithQuery()
         }
 
         [Test]
-        [RequiresServer(MinimumVersion="2.6.0")]
+        [RequiresServer(MinimumVersion = "2.6.0")]
         public void TestCountWithHint()
         {
             _collection.RemoveAll();
@@ -602,6 +602,21 @@ public void TestCreateCollectionSetCappedSetMaxSize()
             collection.Drop();
         }
 
+        [Test]
+        [RequiresServer(StorageEngines = "wiredtiger")]
+        public void TestCreateCollectionSetStorageOptions()
+        {
+            var collection = _database.GetCollection("cappedcollection");
+            collection.Drop();
+            Assert.IsFalse(collection.Exists());
+            var options = CollectionOptions.SetStorageOptions(
+                new BsonDocument("wiredtiger", new BsonDocument("configString", "block_compressor=zlib")));
+            _database.CreateCollection(collection.Name, options);
+            Assert.IsTrue(collection.Exists());
+            var stats = collection.GetStats();
+            collection.Drop();
+        }
+
         [Test]
         public void TestCreateIndex()
         {
@@ -677,6 +692,23 @@ public void TestCreateIndex()
             }
         }
 
+        [Test]
+        [RequiresServer(StorageEngines = "wiredtiger")]
+        public void TestCreateIndexWithStorageOptions()
+        {
+            _collection.Drop();
+            _collection.Insert(new BsonDocument("x", 1));
+            _collection.DropAllIndexes(); // doesn't drop the index on _id
+
+            _collection.CreateIndex(
+                IndexKeys.Ascending("x"),
+                IndexOptions.SetStorageOptions(
+                    new BsonDocument("wiredtiger", new BsonDocument("configString", "block_compressor=zlib"))));
+
+            var result = _collection.GetIndexes();
+            Assert.AreEqual(2, result.Count);
+        }
+
         [Test]
         public void TestDistinct()
         {
@@ -1758,9 +1790,9 @@ public void TestGeoSphericalIndex()
             if (_server.BuildInfo.Version >= new Version(2, 4, 0))
             {
                 if (_collection.Exists()) { _collection.Drop(); }
-                _collection.Insert(new PlaceGeoJson { Location = GeoJson.Point(GeoJson.Geographic(-74.0, 40.74)), Name = "10gen" , Type = "Office" });
-                _collection.Insert(new PlaceGeoJson { Location = GeoJson.Point(GeoJson.Geographic(-74.0, 41.73)), Name = "Three" , Type = "Coffee" });
-                _collection.Insert(new PlaceGeoJson { Location = GeoJson.Point(GeoJson.Geographic(-75.0, 40.74)), Name = "Two"   , Type = "Coffee" });
+                _collection.Insert(new PlaceGeoJson { Location = GeoJson.Point(GeoJson.Geographic(-74.0, 40.74)), Name = "10gen", Type = "Office" });
+                _collection.Insert(new PlaceGeoJson { Location = GeoJson.Point(GeoJson.Geographic(-74.0, 41.73)), Name = "Three", Type = "Coffee" });
+                _collection.Insert(new PlaceGeoJson { Location = GeoJson.Point(GeoJson.Geographic(-75.0, 40.74)), Name = "Two", Type = "Coffee" });
                 _collection.CreateIndex(IndexKeys.GeoSpatialSpherical("Location"));
 
                 // TODO: add Query builder support for 2dsphere queries