CDRIVER-5941 remove deprecated mongoc_client_t API (#1951)

* remove `mongoc_client_get_database_names`
* remove `mongoc_client_find_databases`
* remove `mongoc_client_get_max_message_size`
* remove `mongoc_client_get_max_bson_size`
* remove `mongoc_client_get_server_status`

Author: kevinAlbs

NEWS

@@ -38,14 +38,17 @@ Unreleased (2.0.0)
 * Support for LibreSSL (the CMake option `ENABLE_SSL=LIBRESSL`) is removed. Associated API is removed (`MONGOC_ENABLE_SSL_LIBRESSL` and  `mongoc_stream_tls_libressl_new`).
 * `MONGOC_WRITE_CONCERN_W_ERRORS_IGNORED` (value -1) is removed. Use `MONGOC_WRITE_CONCERN_W_UNACKNOWLEDGED` (value 0) which is handled equivalently. If specified in a URI, replace: `mongodb://host/?w=-1` with `mongodb://host/?w=0`.
 * The deprecated CMake option `ENABLE_AUTOMATIC_INIT_AND_CLEANUP` is removed. See [Initialization and cleanup](https://mongoc.org/libmongoc/1.30.2/init-cleanup.html) for expected use of `mongoc_init()` and `mongoc_cleanup()`.
+* `mongoc_client_get_database_names` is removed. Use `mongoc_client_get_database_names_with_opts` instead.
+* `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.
 
-
 ### Forwarding headers (`#include <bson.h>` and `#include <mongoc.h>`)
 
 The compatibility "forwarding" headers have been removed (previously added in 1.13.0). This means it is no longer valid to include the literal header names `mongoc.h` or `bson.h` directly:
@@ -77,6 +80,21 @@ if (!ok) {
 bson_destroy (cmd);
 ```
 
+### `mongoc_client_get_server_status`
+
+`mongoc_client_get_server_status` is removed. Use a command helper to run the "serverStatus" command instead:
+
+```c
+bson_t *cmd = BCON_NEW("serverStatus", BCON_INT32(1));
+if (!mongoc_client_command_simple(client, "db", cmd, NULL, &reply, &error)) {
+    printf("Failed to send 'serverStatus': %s\n", error.message);
+} else {
+  // TODO: use `reply`
+}
+bson_destroy(&reply);
+bson_destroy(cmd);
+```
+
 
 libmongoc 1.30.2
 ================

src/libmongoc/doc/mongoc_client_get_server_status.rst

@@ -71,7 +71,6 @@ Example
     mongoc_client_get_read_prefs
     mongoc_client_get_server_description
     mongoc_client_get_server_descriptions
-    mongoc_client_get_server_status
     mongoc_client_get_uri
     mongoc_client_get_write_concern
     mongoc_client_new

src/libmongoc/doc/mongoc_client_t.rst

@@ -2221,43 +2221,6 @@ mongoc_client_find_databases_with_opts (mongoc_client_t *client, const bson_t *o
 }
 
 
-int32_t
-mongoc_client_get_max_message_size (mongoc_client_t *client) /* IN */
-{
-   BSON_ASSERT_PARAM (client);
-
-   return mongoc_cluster_get_max_msg_size (&client->cluster);
-}
-
-
-int32_t
-mongoc_client_get_max_bson_size (mongoc_client_t *client) /* IN */
-{
-   BSON_ASSERT_PARAM (client);
-
-   return mongoc_cluster_get_max_bson_obj_size (&client->cluster);
-}
-
-
-bool
-mongoc_client_get_server_status (mongoc_client_t *client,         /* IN */
-                                 mongoc_read_prefs_t *read_prefs, /* IN */
-                                 bson_t *reply,                   /* OUT */
-                                 bson_error_t *error)             /* OUT */
-{
-   bson_t cmd = BSON_INITIALIZER;
-   bool ret = false;
-
-   BSON_ASSERT_PARAM (client);
-
-   BSON_APPEND_INT32 (&cmd, "serverStatus", 1);
-   ret = mongoc_client_command_simple (client, "admin", &cmd, read_prefs, reply, error);
-   bson_destroy (&cmd);
-
-   return ret;
-}
-
-
 void
 mongoc_client_set_stream_initiator (mongoc_client_t *client, mongoc_stream_initiator_t initiator, void *user_data)
 {

src/libmongoc/src/mongoc/mongoc-client.c

@@ -208,19 +208,6 @@ MONGOC_EXPORT (mongoc_cursor_t *) mongoc_client_find_databases (mongoc_client_t
 MONGOC_EXPORT (mongoc_cursor_t *)
 mongoc_client_find_databases_with_opts (mongoc_client_t *client, const bson_t *opts) BSON_GNUC_WARN_UNUSED_RESULT;
 
-BSON_DEPRECATED ("This function does not work with a mongoc_client_session_t, so this function is "
-                 "deprecated. Prefer to execute a command directly with mongoc_client_read_command_with_opts")
-MONGOC_EXPORT (bool) mongoc_client_get_server_status (mongoc_client_t *client,
-                                                      mongoc_read_prefs_t *read_prefs,
-                                                      bson_t *reply,
-                                                      bson_error_t *error);
-
-BSON_DEPRECATED ("Use of this function is deprecated")
-MONGOC_EXPORT (int32_t) mongoc_client_get_max_message_size (mongoc_client_t *client);
-
-BSON_DEPRECATED ("Use of this function is deprecated")
-MONGOC_EXPORT (int32_t) mongoc_client_get_max_bson_size (mongoc_client_t *client);
-
 MONGOC_EXPORT (const mongoc_write_concern_t *)
 mongoc_client_get_write_concern (const mongoc_client_t *client);
 

src/libmongoc/src/mongoc/mongoc-client.h

@@ -1719,31 +1719,6 @@ test_recovering (void *ctx)
 }
 
 
-static void
-test_server_status (void)
-{
-   mongoc_client_t *client;
-   bson_error_t error;
-   bson_iter_t iter;
-   bson_t reply;
-
-   client = test_framework_new_default_client ();
-   BSON_ASSERT (client);
-
-   BEGIN_IGNORE_DEPRECATIONS
-   ASSERT_OR_PRINT (mongoc_client_get_server_status (client, NULL, &reply, &error), error);
-   END_IGNORE_DEPRECATIONS
-
-   BSON_ASSERT (bson_iter_init_find (&iter, &reply, "host"));
-   BSON_ASSERT (bson_iter_init_find (&iter, &reply, "version"));
-   BSON_ASSERT (bson_iter_init_find (&iter, &reply, "ok"));
-
-   bson_destroy (&reply);
-
-   mongoc_client_destroy (client);
-}
-
-
 static void
 test_get_database_names (void)
 {
@@ -3925,7 +3900,6 @@ test_client_install (TestSuite *suite)
    TestSuite_AddMockServerTest (suite, "/Client/mongos_seeds_reconnect/single", test_mongos_seeds_reconnect_single);
    TestSuite_AddMockServerTest (suite, "/Client/mongos_seeds_reconnect/pooled", test_mongos_seeds_reconnect_pooled);
    TestSuite_AddFull (suite, "/Client/recovering", test_recovering, NULL, NULL, test_framework_skip_if_slow);
-   TestSuite_AddLive (suite, "/Client/server_status", test_server_status);
    TestSuite_AddMockServerTest (suite, "/Client/database_names", test_get_database_names);
    TestSuite_AddFull (
       suite, "/Client/connect/uds", test_mongoc_client_unix_domain_socket, NULL, NULL, test_framework_skip_if_no_uds);