CDRIVER-5937 remove deprecated mongoc_bulk_operation_* API (#1949)

Author: kevinAlbs

NEWS

@@ -38,8 +38,14 @@ 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()`.
+* 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:

src/libmongoc/doc/mongoc_bulk_operation_delete.rst

@@ -42,11 +42,8 @@ After adding all of the write operations to the :symbol:`mongoc_bulk_operation_t
     :titlesonly:
     :maxdepth: 1
 
-    mongoc_bulk_operation_delete
-    mongoc_bulk_operation_delete_one
     mongoc_bulk_operation_destroy
     mongoc_bulk_operation_execute
-    mongoc_bulk_operation_get_hint
     mongoc_bulk_operation_get_server_id
     mongoc_bulk_operation_get_write_concern
     mongoc_bulk_operation_insert
@@ -60,7 +57,6 @@ After adding all of the write operations to the :symbol:`mongoc_bulk_operation_t
     mongoc_bulk_operation_set_bypass_document_validation
     mongoc_bulk_operation_set_client_session
     mongoc_bulk_operation_set_comment
-    mongoc_bulk_operation_set_hint
     mongoc_bulk_operation_set_server_id
     mongoc_bulk_operation_set_let
     mongoc_bulk_operation_update

src/libmongoc/doc/mongoc_bulk_operation_delete_one.rst

@@ -311,26 +311,6 @@ mongoc_bulk_operation_remove_one (mongoc_bulk_operation_t *bulk, /* IN */
    EXIT;
 }
 
-void
-mongoc_bulk_operation_delete (mongoc_bulk_operation_t *bulk, const bson_t *selector)
-{
-   ENTRY;
-
-   mongoc_bulk_operation_remove (bulk, selector);
-
-   EXIT;
-}
-
-void
-mongoc_bulk_operation_delete_one (mongoc_bulk_operation_t *bulk, const bson_t *selector)
-{
-   ENTRY;
-
-   mongoc_bulk_operation_remove_one (bulk, selector);
-
-   EXIT;
-}
-
 void
 mongoc_bulk_operation_insert (mongoc_bulk_operation_t *bulk, const bson_t *document)
 {
@@ -925,12 +905,6 @@ mongoc_bulk_operation_set_client_session (mongoc_bulk_operation_t *bulk,
 }
 
 
-uint32_t
-mongoc_bulk_operation_get_hint (const mongoc_bulk_operation_t *bulk)
-{
-   return mongoc_bulk_operation_get_server_id (bulk);
-}
-
 uint32_t
 mongoc_bulk_operation_get_server_id (const mongoc_bulk_operation_t *bulk)
 {
@@ -939,11 +913,6 @@ mongoc_bulk_operation_get_server_id (const mongoc_bulk_operation_t *bulk)
    return bulk->server_id;
 }
 
-void
-mongoc_bulk_operation_set_hint (mongoc_bulk_operation_t *bulk, uint32_t server_id)
-{
-   mongoc_bulk_operation_set_server_id (bulk, server_id);
-}
 
 void
 mongoc_bulk_operation_set_server_id (mongoc_bulk_operation_t *bulk, uint32_t server_id)

src/libmongoc/doc/mongoc_bulk_operation_get_hint.rst

@@ -47,12 +47,6 @@ mongoc_bulk_operation_destroy (mongoc_bulk_operation_t *bulk);
 MONGOC_EXPORT (uint32_t)
 mongoc_bulk_operation_execute (mongoc_bulk_operation_t *bulk, bson_t *reply, bson_error_t *error);
 
-BSON_DEPRECATED_FOR (mongoc_bulk_operation_remove)
-MONGOC_EXPORT (void) mongoc_bulk_operation_delete (mongoc_bulk_operation_t *bulk, const bson_t *selector);
-
-BSON_DEPRECATED_FOR (mongoc_bulk_operation_remove_one)
-MONGOC_EXPORT (void) mongoc_bulk_operation_delete_one (mongoc_bulk_operation_t *bulk, const bson_t *selector);
-
 MONGOC_EXPORT (void)
 mongoc_bulk_operation_insert (mongoc_bulk_operation_t *bulk, const bson_t *document);
 
@@ -153,17 +147,9 @@ mongoc_bulk_operation_set_client (mongoc_bulk_operation_t *bulk, void *client);
 MONGOC_EXPORT (void)
 mongoc_bulk_operation_set_client_session (mongoc_bulk_operation_t *bulk,
                                           struct _mongoc_client_session_t *client_session);
-// `mongoc_bulk_operation_set_hint` is deprecated for the more aptly named `mongoc_bulk_operation_set_server_id`.
-
-BSON_DEPRECATED_FOR (mongoc_bulk_operation_set_server_id)
-MONGOC_EXPORT (void) mongoc_bulk_operation_set_hint (mongoc_bulk_operation_t *bulk, uint32_t server_id);
 
 MONGOC_EXPORT (void)
 mongoc_bulk_operation_set_server_id (mongoc_bulk_operation_t *bulk, uint32_t server_id);
-// `mongoc_bulk_operation_get_hint` is deprecated for the more aptly named `mongoc_bulk_operation_get_server_id`.
-
-BSON_DEPRECATED_FOR (mongoc_bulk_operation_get_server_id)
-MONGOC_EXPORT (uint32_t) mongoc_bulk_operation_get_hint (const mongoc_bulk_operation_t *bulk);
 
 MONGOC_EXPORT (uint32_t)
 mongoc_bulk_operation_get_server_id (const mongoc_bulk_operation_t *bulk);

src/libmongoc/doc/mongoc_bulk_operation_set_hint.rst

@@ -4689,12 +4689,12 @@ test_bulk_write_multiple_errors (void *unused)
 
    mongoc_bulk_operation_insert (bulk,
                                  tmp_bson ("{'_id': 1}")); // fail via failPoint
-   mongoc_bulk_operation_delete (bulk,
+   mongoc_bulk_operation_remove (bulk,
                                  tmp_bson ("{'_id': 1}")); // fail via failPoint
 
    mongoc_bulk_operation_insert (bulk, tmp_bson ("{'_id': 4}")); // succeed
 
-   mongoc_bulk_operation_delete (bulk, tmp_bson ("{'_id': 4}")); // suceed
+   mongoc_bulk_operation_remove (bulk, tmp_bson ("{'_id': 4}")); // suceed
 
    mongoc_bulk_operation_insert (bulk, tmp_bson ("{'_id': 5}")); // suceed
    mongoc_bulk_operation_insert (bulk, tmp_bson ("{'_id': 5}")); // duplicate key error