CDRIVER-1462 remove mongoc_collection_create_index_2 from 1.4

ajdavis · ajdavis · commit 2c95f9c48b03 · 2016-08-10T11:59:54.000-04:00
This reverts commit dc9fd22. # Conflicts: # tests/test-mongoc-collection.c
diff --git a/build/autotools/versions.ldscript b/build/autotools/versions.ldscript
@@ -48,7 +48,6 @@ LIBMONGOC_1.0 {
         mongoc_collection_count;
         mongoc_collection_create_bulk_operation;
         mongoc_collection_create_index;
-        mongoc_collection_create_index_2;
         mongoc_collection_delete;
         mongoc_collection_destroy;
         mongoc_collection_drop;
diff --git a/build/cmake/libmongoc-experimental.def b/build/cmake/libmongoc-experimental.def
@@ -98,7 +98,6 @@ mongoc_collection_count
 mongoc_collection_count_with_opts
 mongoc_collection_create_bulk_operation
 mongoc_collection_create_index
-mongoc_collection_create_index_2
 mongoc_collection_delete
 mongoc_collection_destroy
 mongoc_collection_drop
diff --git a/build/cmake/libmongoc-ssl-experimental.def b/build/cmake/libmongoc-ssl-experimental.def
@@ -100,7 +100,6 @@ mongoc_collection_count
 mongoc_collection_count_with_opts
 mongoc_collection_create_bulk_operation
 mongoc_collection_create_index
-mongoc_collection_create_index_2
 mongoc_collection_delete
 mongoc_collection_destroy
 mongoc_collection_drop
diff --git a/build/cmake/libmongoc-ssl.def b/build/cmake/libmongoc-ssl.def
@@ -97,7 +97,6 @@ mongoc_collection_count
 mongoc_collection_count_with_opts
 mongoc_collection_create_bulk_operation
 mongoc_collection_create_index
-mongoc_collection_create_index_2
 mongoc_collection_delete
 mongoc_collection_destroy
 mongoc_collection_drop
diff --git a/build/cmake/libmongoc.def b/build/cmake/libmongoc.def
@@ -95,7 +95,6 @@ mongoc_collection_count
 mongoc_collection_count_with_opts
 mongoc_collection_create_bulk_operation
 mongoc_collection_create_index
-mongoc_collection_create_index_2
 mongoc_collection_delete
 mongoc_collection_destroy
 mongoc_collection_drop
diff --git a/doc/mongoc_collection_create_index_2.page b/doc/mongoc_collection_create_index_2.page
diff --git a/src/libmongoc.symbols b/src/libmongoc.symbols
@@ -102,7 +102,6 @@ mongoc_collection_count
 mongoc_collection_count_with_opts
 mongoc_collection_create_bulk_operation
 mongoc_collection_create_index
-mongoc_collection_create_index_2
 mongoc_collection_delete
 mongoc_collection_destroy
 mongoc_collection_drop
diff --git a/src/mongoc/mongoc-collection.c b/src/mongoc/mongoc-collection.c
@@ -982,23 +982,6 @@ mongoc_collection_create_index (mongoc_collection_t      *collection,
                                 const bson_t             *keys,
                                 const mongoc_index_opt_t *opt,
                                 bson_error_t             *error)
-{
-   bson_t reply;
-   bool ret;
-
-   ret = mongoc_collection_create_index_2 (collection, keys, opt,
-                                           &reply, error);
-
-   bson_destroy (&reply);
-   return ret;
-}
-
-bool
-mongoc_collection_create_index_2 (mongoc_collection_t      *collection,
-                                  const bson_t             *keys,
-                                  const mongoc_index_opt_t *opt,
-                                  bson_t                   *reply,
-                                  bson_error_t             *error)
 {
    const mongoc_index_opt_t *def_opt;
    const mongoc_index_opt_geo_t *def_geo;
@@ -1007,16 +990,14 @@ mongoc_collection_create_index_2 (mongoc_collection_t      *collection,
    bson_t cmd = BSON_INITIALIZER;
    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;
-   bool reply_initialized = false;
-
-   ENTRY;
 
    BSON_ASSERT (collection);
    BSON_ASSERT (keys);
@@ -1039,7 +1020,7 @@ mongoc_collection_create_index_2 (mongoc_collection_t      *collection,
                          "Cannot generate index name from invalid `keys` argument"
                          );
          bson_destroy (&cmd);
-         GOTO (done);
+         return false;
       }
    }
 
@@ -1120,9 +1101,8 @@ mongoc_collection_create_index_2 (mongoc_collection_t      *collection,
    bson_append_document_end (&ar, &doc);
    bson_append_array_end (&cmd, &ar);
 
-   ret = mongoc_collection_command_simple (collection, &cmd, NULL, reply,
+   ret = mongoc_collection_command_simple (collection, &cmd, NULL, &reply,
                                            &local_error);
-   reply_initialized = true;
 
    /*
     * If we failed due to the command not being found, then use the legacy
@@ -1132,24 +1112,16 @@ mongoc_collection_create_index_2 (mongoc_collection_t      *collection,
       if (local_error.code == MONGOC_ERROR_QUERY_COMMAND_NOT_FOUND) {
          ret = _mongoc_collection_create_index_legacy (collection, keys, opt,
                                                        error);
-         /* Clear the error reply from the first request */
-         if (reply) {
-            bson_reinit (reply);
-         }
       } else if (error) {
          memcpy (error, &local_error, sizeof *error);
       }
    }
 
    bson_destroy (&cmd);
+   bson_destroy (&reply);
    bson_free (alloc_name);
 
-done:
-   if (!reply_initialized && reply) {
-      bson_init (reply);
-   }
-
-   RETURN (ret);
+   return ret;
 }
 
 
diff --git a/src/mongoc/mongoc-collection.h b/src/mongoc/mongoc-collection.h
@@ -89,11 +89,6 @@ bool                          mongoc_collection_create_index         (mongoc_col
                                                                       const bson_t                  *keys,
                                                                       const mongoc_index_opt_t      *opt,
                                                                       bson_error_t                  *error);
-bool                          mongoc_collection_create_index_2       (mongoc_collection_t           *collection,
-                                                                      const bson_t                  *keys,
-                                                                      const mongoc_index_opt_t      *opt,
-                                                                      bson_t                        *reply,
-                                                                      bson_error_t                  *error);
 bool                          mongoc_collection_ensure_index         (mongoc_collection_t           *collection,
                                                                       const bson_t                  *keys,
                                                                       const mongoc_index_opt_t      *opt,
diff --git a/tests/test-mongoc-collection.c b/tests/test-mongoc-collection.c
