CDRIVER-5949 remove deprecated database API

NEWS

@@ -64,11 +64,6 @@ Unreleased (2.0.0)
 * `mongoc_client_find_databases` is removed. Use `mongoc_client_find_databases_with_opts` instead.
 * `mongoc_client_get_max_message_size` is removed.
 * `mongoc_client_get_max_bson_size` is removed.
-* Deprecated API for `mongoc_bulk_operation_t` is removed:
-  * `mongoc_bulk_operation_delete` is removed. Use `mongoc_bulk_operation_remove()` instead.
-  * `mongoc_bulk_operation_delete_one` is removed. Use `mongoc_bulk_operation_remove_one` instead.
-  * `mongoc_bulk_operation_get_hint` is removed. Use `mongoc_bulk_operation_get_server_id` instead.
-  * `mongoc_bulk_operation_set_hint` is removed. Use `mongoc_bulk_operation_set_server_id` instead.
 * Deprecated `mongoc_apm_command_*_get_server_connection_id` functions are removed. Use `mongoc_apm_command_*_get_server_connection_id_int64` instead.
 * Deprecated index management API is removed:
   * `mongoc_collection_create_index_with_opts`, `mongoc_collection_create_index`, and `mongoc_collection_ensure_index` are removed. Use `mongoc_collection_create_indexes_with_opts` instead.
@@ -99,6 +94,9 @@ Unreleased (2.0.0)
       * `mongoc_bulk_operation_t`
 * `mongoc_collection_stats` is removed. Use the [$collStats aggregation pipeline stage](https://www.mongodb.com/docs/manual/reference/operator/aggregation/collStats/) with `mongoc_collection_aggregate` instead.
 * `mongoc_collection_validate` is removed. Run the [validate](https://www.mongodb.com/docs/manual/reference/command/validate/) command directly with `mongoc_client_read_command_with_opts` instead.
+* Deprecated API for `mongoc_database_t` is removed:
+  * `mongoc_database_find_collections` is removed. Use `mongoc_database_find_collections_with_opts` instead.
+  * `mongoc_database_get_collection_names` is removed. Use `mongoc_database_get_collection_names_with_opts` instead.
 
 ### Forwarding headers (`#include <bson.h>` and `#include <mongoc.h>`)
 

src/libmongoc/doc/mongoc_database_t.rst

@@ -34,10 +34,8 @@ Read preferences and write concerns are inherited from the parent client. They c
     mongoc_database_destroy
     mongoc_database_drop
     mongoc_database_drop_with_opts
-    mongoc_database_find_collections
     mongoc_database_find_collections_with_opts
     mongoc_database_get_collection
-    mongoc_database_get_collection_names
     mongoc_database_get_collection_names_with_opts
     mongoc_database_get_name
     mongoc_database_get_read_concern

src/libmongoc/src/mongoc/mongoc-database.c

@@ -674,36 +674,6 @@ mongoc_database_has_collection (mongoc_database_t *database, const char *name, b
 }
 
 
-mongoc_cursor_t *
-mongoc_database_find_collections (mongoc_database_t *database, const bson_t *filter, bson_error_t *error)
-{
-   bson_t opts = BSON_INITIALIZER;
-   mongoc_cursor_t *cursor;
-
-   BSON_ASSERT_PARAM (database);
-
-   if (filter) {
-      if (!BSON_APPEND_DOCUMENT (&opts, "filter", filter)) {
-         _mongoc_set_error (error, MONGOC_ERROR_BSON, MONGOC_ERROR_BSON_INVALID, "Invalid 'filter' parameter.");
-         bson_destroy (&opts);
-         return NULL;
-      }
-   }
-
-   cursor = mongoc_database_find_collections_with_opts (database, &opts);
-
-   bson_destroy (&opts);
-
-   /* this deprecated API returns NULL on error */
-   if (mongoc_cursor_error (cursor, error)) {
-      mongoc_cursor_destroy (cursor);
-      return NULL;
-   }
-
-   return cursor;
-}
-
-
 mongoc_cursor_t *
 mongoc_database_find_collections_with_opts (mongoc_database_t *database, const bson_t *opts)
 {
@@ -726,13 +696,6 @@ mongoc_database_find_collections_with_opts (mongoc_database_t *database, const b
 }
 
 
-char **
-mongoc_database_get_collection_names (mongoc_database_t *database, bson_error_t *error)
-{
-   return mongoc_database_get_collection_names_with_opts (database, NULL, error);
-}
-
-
 char **
 mongoc_database_get_collection_names_with_opts (mongoc_database_t *database, const bson_t *opts, bson_error_t *error)
 {

src/libmongoc/src/mongoc/mongoc-database.h

@@ -133,19 +133,10 @@ mongoc_database_get_read_concern (const mongoc_database_t *database);
 MONGOC_EXPORT (void)
 mongoc_database_set_read_concern (mongoc_database_t *database, const mongoc_read_concern_t *read_concern);
 
-BSON_DEPRECATED_FOR (mongoc_database_find_collections_with_opts)
-MONGOC_EXPORT (mongoc_cursor_t *)
-   mongoc_database_find_collections (mongoc_database_t *database, const bson_t *filter, bson_error_t *error)
-      BSON_GNUC_WARN_UNUSED_RESULT;
-
 MONGOC_EXPORT (mongoc_cursor_t *)
 mongoc_database_find_collections_with_opts (mongoc_database_t *database, const bson_t *opts)
    BSON_GNUC_WARN_UNUSED_RESULT;
 
-BSON_DEPRECATED_FOR (mongoc_database_get_collection_names_with_opts)
-MONGOC_EXPORT (char **) mongoc_database_get_collection_names (mongoc_database_t *database, bson_error_t *error)
-   BSON_GNUC_WARN_UNUSED_RESULT;
-
 MONGOC_EXPORT (char **)
 mongoc_database_get_collection_names_with_opts (mongoc_database_t *database, const bson_t *opts, bson_error_t *error)
    BSON_GNUC_WARN_UNUSED_RESULT;

src/libmongoc/tests/test-mongoc-database.c

@@ -518,7 +518,6 @@ test_get_collection_info (void)
    bson_iter_t col_iter;
    bson_t capped_options = BSON_INITIALIZER;
    bson_t noopts_options = BSON_INITIALIZER;
-   bson_t name_filter = BSON_INITIALIZER;
    const bson_t *doc;
    int num_infos = 0;
 
@@ -551,19 +550,12 @@ test_get_collection_info (void)
    ASSERT_OR_PRINT (collection, error);
    mongoc_collection_destroy (collection);
 
-   /* first we filter on collection name. */
-   BSON_APPEND_UTF8 (&name_filter, "name", noopts_name);
-
    /* We only test with filters since get_collection_names will
     * test w/o filters for us. */
 
    /* Filter on an exact match of name */
-   BEGIN_IGNORE_DEPRECATIONS
-   cursor = mongoc_database_find_collections (database, &name_filter, &error);
-   END_IGNORE_DEPRECATIONS
+   cursor = mongoc_database_find_collections_with_opts (database, tmp_bson ("{'filter': {'name': '%s'}}", noopts_name));
    BSON_ASSERT (cursor);
-   BSON_ASSERT (!error.domain);
-   BSON_ASSERT (!error.code);
 
    while (mongoc_cursor_next (cursor, &doc)) {
       if (bson_iter_init (&col_iter, doc) && bson_iter_find (&col_iter, "name") && BSON_ITER_HOLDS_UTF8 (&col_iter) &&
@@ -575,6 +567,8 @@ test_get_collection_info (void)
       }
    }
 
+   ASSERT_OR_PRINT (!mongoc_cursor_error (cursor, &error), error);
+
    BSON_ASSERT (1 == num_infos);
 
    mongoc_cursor_destroy (cursor);
@@ -588,64 +582,11 @@ test_get_collection_info (void)
 
    bson_destroy (&capped_options);
    bson_destroy (&noopts_options);
-   bson_destroy (&name_filter);
 
    mongoc_database_destroy (database);
    mongoc_client_destroy (client);
 }
 
-static void
-test_get_collection_info_regex (void)
-{
-   mongoc_database_t *database;
-   mongoc_collection_t *collection;
-   mongoc_client_t *client;
-   mongoc_cursor_t *cursor;
-   bson_error_t error = {0};
-   bson_iter_t col_iter;
-   bson_t name_filter = BSON_INITIALIZER;
-   const bson_t *doc;
-   char *dbname;
-
-   client = test_framework_new_default_client ();
-   BSON_ASSERT (client);
-
-   dbname = gen_collection_name ("test_get_collection_info_regex");
-   database = mongoc_client_get_database (client, dbname);
-   mongoc_database_drop_with_opts (database, NULL, NULL);
-
-   collection = mongoc_database_create_collection (database, "abbbc", NULL, &error);
-   ASSERT_OR_PRINT (collection, error);
-   mongoc_collection_destroy (collection);
-
-   collection = mongoc_database_create_collection (database, "foo", NULL, &error);
-   ASSERT_OR_PRINT (collection, error);
-
-   BSON_APPEND_REGEX (&name_filter, "name", "ab+c", NULL);
-
-   BEGIN_IGNORE_DEPRECATIONS
-   cursor = mongoc_database_find_collections (database, &name_filter, &error);
-   END_IGNORE_DEPRECATIONS
-
-   BSON_ASSERT (cursor);
-   BSON_ASSERT (!error.domain);
-   BSON_ASSERT (!error.code);
-
-   BSON_ASSERT (mongoc_cursor_next (cursor, &doc));
-   BSON_ASSERT (bson_iter_init_find (&col_iter, doc, "name"));
-   BSON_ASSERT (0 == strcmp (bson_iter_utf8 (&col_iter, NULL), "abbbc"));
-
-   /* only one match */
-   BSON_ASSERT (!mongoc_cursor_next (cursor, &doc));
-   ASSERT_OR_PRINT (!mongoc_cursor_error (cursor, &error), error);
-   mongoc_cursor_destroy (cursor);
-
-   bson_destroy (&name_filter);
-   mongoc_collection_destroy (collection);
-   bson_free (dbname);
-   mongoc_database_destroy (database);
-   mongoc_client_destroy (client);
-}
 
 static void
 test_get_collection_info_with_opts_regex (void)
@@ -986,7 +927,6 @@ test_database_install (TestSuite *suite)
    TestSuite_AddLive (suite, "/Database/drop", test_drop);
    TestSuite_AddLive (suite, "/Database/create_collection", test_create_collection);
    TestSuite_AddLive (suite, "/Database/get_collection_info", test_get_collection_info);
-   TestSuite_AddLive (suite, "/Database/get_collection_info_regex", test_get_collection_info_regex);
    TestSuite_AddLive (suite, "/Database/get_collection_info_with_opts_regex", test_get_collection_info_with_opts_regex);
    TestSuite_AddMockServerTest (suite, "/Database/get_collection/getmore_cmd", test_get_collection_info_getmore_cmd);
    TestSuite_AddLive (suite, "/Database/get_collection", test_get_collection);