CDRIVER-470 added wiredtiger index options

Closes #126

Author: Shraya Ramani

build/autotools/versions.ldscript

@@ -229,6 +229,8 @@ LIBMONGOC_1.1 {
         mongoc_database_find_collections;
         mongoc_index_opt_geo_get_default;
         mongoc_index_opt_geo_init;
+        mongoc_index_opt_wt_get_default;
+        mongoc_index_opt_wt_init;
         mongoc_rand_add;
         mongoc_rand_seed;
         mongoc_rand_status;

build/cmake/libmongoc-ssl.def

@@ -140,6 +140,8 @@ mongoc_index_opt_geo_get_default
 mongoc_index_opt_geo_init
 mongoc_index_opt_get_default
 mongoc_index_opt_init
+mongoc_index_opt_wt_get_default
+mongoc_index_opt_wt_init
 mongoc_init
 mongoc_log
 mongoc_log_default_handler

build/cmake/libmongoc.def

@@ -138,6 +138,8 @@ mongoc_index_opt_geo_get_default
 mongoc_index_opt_geo_init
 mongoc_index_opt_get_default
 mongoc_index_opt_init
+mongoc_index_opt_wt_get_default
+mongoc_index_opt_wt_init
 mongoc_init
 mongoc_log
 mongoc_log_default_handler

src/libmongoc.symbols

@@ -139,6 +139,8 @@ mongoc_index_opt_geo_get_default
 mongoc_index_opt_geo_init
 mongoc_index_opt_get_default
 mongoc_index_opt_init
+mongoc_index_opt_wt_get_default
+mongoc_index_opt_wt_init
 mongoc_init
 mongoc_log
 mongoc_log_default_handler

src/mongoc/mongoc-collection.c

@@ -789,7 +789,11 @@ mongoc_collection_create_index (mongoc_collection_t      *collection,
    bson_t ar;
    bson_t doc;
    bson_t reply;
+   bson_t storage_doc;
+   bson_t wt_doc;
    const mongoc_index_opt_geo_t *geo_opt;
+   const mongoc_index_opt_storage_t *storage_opt;
+   const mongoc_index_opt_wt_t *wt_opt;
    char *alloc_name = NULL;
    bool ret = false;
 
@@ -862,6 +866,21 @@ mongoc_collection_create_index (mongoc_collection_t      *collection,
           BSON_APPEND_DOUBLE (&doc, "bucketSize", geo_opt->haystack_bucket_size);
        }
    }
+
+   if (opt->storage_options) {
+      storage_opt = opt->storage_options;
+      switch (storage_opt->type) {
+      case MONGOC_INDEX_STORAGE_OPT_WIREDTIGER:
+         wt_opt = (mongoc_index_opt_wt_t *)storage_opt;
+         BSON_APPEND_DOCUMENT_BEGIN (&doc, "storageEngine", &storage_doc);
+         BSON_APPEND_DOCUMENT_BEGIN (&storage_doc, "wiredtiger", &wt_doc);
+         BSON_APPEND_UTF8 (&wt_doc, "configString", wt_opt->config_str);
+         bson_append_document_end (&storage_doc, &wt_doc);
+         bson_append_document_end (&doc, &storage_doc);
+         break;
+      }
+   }
+
    bson_append_document_end (&ar, &doc);
    bson_append_array_end (&cmd, &ar);
 

src/mongoc/mongoc-index.c

@@ -32,6 +32,7 @@ static mongoc_index_opt_t gMongocIndexOptDefault = {
    0,
    -1,
    -1,
+   NULL,
    NULL
 };
 
@@ -43,6 +44,11 @@ static mongoc_index_opt_geo_t gMongocIndexOptGeoDefault = {
    2
 };
 
+static mongoc_index_opt_wt_t gMongocIndexOptWTDefault = {
+   { MONGOC_INDEX_STORAGE_OPT_WIREDTIGER },
+   ""
+};
+
 const mongoc_index_opt_t *
 mongoc_index_opt_get_default (void)
 {
@@ -55,6 +61,12 @@ mongoc_index_opt_geo_get_default (void)
    return &gMongocIndexOptGeoDefault;
 }
 
+const mongoc_index_opt_wt_t *
+mongoc_index_opt_wt_get_default (void)
+{
+   return &gMongocIndexOptWTDefault;
+}
+
 void
 mongoc_index_opt_init (mongoc_index_opt_t *opt)
 {
@@ -70,3 +82,10 @@ mongoc_index_opt_geo_init (mongoc_index_opt_geo_t *opt)
 
    memcpy (opt, &gMongocIndexOptGeoDefault, sizeof *opt);
 }
+
+void mongoc_index_opt_wt_init (mongoc_index_opt_wt_t *opt)
+{
+   BSON_ASSERT(opt);
+
+   memcpy (opt, &gMongocIndexOptWTDefault, sizeof *opt);
+}

src/mongoc/mongoc-index.h

@@ -38,27 +38,47 @@ typedef struct
 
 typedef struct
 {
-   bool                   is_initialized;
-   bool                   background;
-   bool                   unique;
-   const char             *name;
-   bool                   drop_dups;
-   bool                   sparse;
-   int32_t                expire_after_seconds;
-   int32_t                v;
-   const bson_t           *weights;
-   const char             *default_language;
-   const char             *language_override;
-   mongoc_index_opt_geo_t *geo_options;
-   void                   *padding[7];
+   int type;
+} mongoc_index_opt_storage_t;
+
+typedef enum
+{
+   MONGOC_INDEX_STORAGE_OPT_MMAPV1,
+   MONGOC_INDEX_STORAGE_OPT_WIREDTIGER,
+} mongoc_index_storage_opt_type_t;
+
+typedef struct
+{
+   mongoc_index_opt_storage_t base;
+   const char* config_str;
+   void *padding[8];
+} mongoc_index_opt_wt_t;
+
+typedef struct
+{
+   bool                        is_initialized;
+   bool                        background;
+   bool                        unique;
+   const char                 *name;
+   bool                        drop_dups;
+   bool                        sparse;
+   int32_t                     expire_after_seconds;
+   int32_t                     v;
+   const bson_t               *weights;
+   const char                 *default_language;
+   const char                 *language_override;
+   mongoc_index_opt_geo_t     *geo_options;
+   mongoc_index_opt_storage_t *storage_options;
+   void                       *padding[6];
 } mongoc_index_opt_t;
 
 
 const mongoc_index_opt_t     *mongoc_index_opt_get_default     (void) BSON_GNUC_CONST;
 const mongoc_index_opt_geo_t *mongoc_index_opt_geo_get_default (void) BSON_GNUC_CONST;
+const mongoc_index_opt_wt_t  *mongoc_index_opt_wt_get_default  (void) BSON_GNUC_CONST;
 void                          mongoc_index_opt_init            (mongoc_index_opt_t *opt);
 void                          mongoc_index_opt_geo_init        (mongoc_index_opt_geo_t *opt);
-
+void                          mongoc_index_opt_wt_init         (mongoc_index_opt_wt_t *opt);
 
 BSON_END_DECLS
 

tests/test-mongoc-collection.c

@@ -637,6 +637,47 @@ test_index_geo (void)
    mongoc_client_destroy(client);
 }
 
+static void
+test_index_storage (void)
+{
+   mongoc_collection_t *collection;
+   mongoc_database_t *database;
+   mongoc_client_t *client;
+   mongoc_index_opt_t opt;
+   mongoc_index_opt_wt_t wt_opt;
+   bson_error_t error;
+   bool r;
+   bson_t keys;
+
+   mongoc_index_opt_init (&opt);
+   mongoc_index_opt_wt_init (&wt_opt);
+
+   client = mongoc_client_new (gTestUri);
+   ASSERT (client);
+
+   database = get_test_database (client);
+   ASSERT (database);
+
+   collection = get_test_collection (client, "test_storage_index");
+   ASSERT (collection);
+
+   /* Create a simple index */
+   bson_init (&keys);
+   bson_append_int32 (&keys, "hello", -1, 1);
+
+   /* Add storage option to the index */
+   wt_opt.base.type = MONGOC_INDEX_STORAGE_OPT_WIREDTIGER;
+   wt_opt.config_str = "block_compressor=zlib";
+
+   opt.storage_options = (mongoc_index_opt_storage_t *)&wt_opt;
+
+   r = mongoc_collection_create_index (collection, &keys, &opt, &error);
+   ASSERT (r);
+
+   mongoc_collection_destroy (collection);
+   mongoc_database_destroy (database);
+   mongoc_client_destroy (client);
+}
 
 static void
 test_count (void)
@@ -1336,6 +1377,7 @@ test_collection_install (TestSuite *suite)
    TestSuite_Add (suite, "/Collection/index", test_index);
    TestSuite_Add (suite, "/Collection/index_compound", test_index_compound);
    TestSuite_Add (suite, "/Collection/index_geo", test_index_geo);
+   TestSuite_Add (suite, "/Collection/index_storage", test_index_storage);
    TestSuite_Add (suite, "/Collection/regex", test_regex);
    TestSuite_Add (suite, "/Collection/update", test_update);
    TestSuite_Add (suite, "/Collection/remove", test_remove);