CDRIVER-1986 remove deprecated mongoc_collection_save

NEWS

@@ -15,6 +15,7 @@ Unreleased (2.0.0)
 * `mongoc_server_description_ismaster` is removed. Use the equivalent `mongoc_server_description_hello` instead.
 * `MONGOC_QUERY_SLAVE_OK` is removed. Use the equivalent `MONGOC_QUERY_SECONDARY_OK` instead.
 * `MONGOC_URI_SLAVEOK` is removed. It was unused.
+* `mongoc_collection_save` is removed. Use `mongoc_collection_insert_one` or `mongoc_collection_replace_one` instead.
 
 ### Forwarding headers (`#include <bson.h>` and `#include <mongoc.h>`)
 

src/libmongoc/doc/mongoc_collection_t.rst

@@ -71,7 +71,6 @@ Read preferences and write concerns are inherited from the parent client. They c
     mongoc_collection_rename
     mongoc_collection_rename_with_opts
     mongoc_collection_replace_one
-    mongoc_collection_save
     mongoc_collection_set_read_concern
     mongoc_collection_set_read_prefs
     mongoc_collection_set_write_concern

src/libmongoc/src/mongoc/mongoc-collection.c

@@ -2297,66 +2297,6 @@ mongoc_collection_replace_one (mongoc_collection_t *collection,
 }
 
 
-/*
- *--------------------------------------------------------------------------
- *
- * mongoc_collection_save --
- *
- *       Save @document to @collection.
- *
- *       If the document has an _id field, it will be updated. Otherwise,
- *       the document will be inserted into the collection.
- *
- * Returns:
- *       true if successful; otherwise false and @error is set.
- *
- * Side effects:
- *       @error is set upon failure if non-NULL.
- *
- *--------------------------------------------------------------------------
- */
-
-bool
-mongoc_collection_save (mongoc_collection_t *collection,
-                        const bson_t *document,
-                        const mongoc_write_concern_t *write_concern,
-                        bson_error_t *error)
-{
-   bson_iter_t iter;
-   bool ret;
-   bson_t selector;
-
-   BSON_ASSERT_PARAM (collection);
-   BSON_ASSERT_PARAM (document);
-
-   BEGIN_IGNORE_DEPRECATIONS
-   if (!bson_iter_init_find (&iter, document, "_id")) {
-      return mongoc_collection_insert (collection, MONGOC_INSERT_NONE, document, write_concern, error);
-   }
-
-   bson_init (&selector);
-   if (!bson_append_iter (&selector, NULL, 0, &iter)) {
-      _mongoc_set_error (
-         error, MONGOC_ERROR_COMMAND, MONGOC_ERROR_COMMAND_INVALID_ARG, "Failed to append bson to create update.");
-      bson_destroy (&selector);
-      return false;
-   }
-
-   /* this document will be inserted, validate same as for inserts */
-   if (!_mongoc_validate_new_document (document, _mongoc_default_insert_vflags, error)) {
-      return false;
-   }
-
-   ret = mongoc_collection_update (
-      collection, MONGOC_UPDATE_UPSERT | MONGOC_UPDATE_NO_VALIDATE, &selector, document, write_concern, error);
-   END_IGNORE_DEPRECATIONS
-
-   bson_destroy (&selector);
-
-   return ret;
-}
-
-
 bool
 mongoc_collection_remove (mongoc_collection_t *collection,
                           mongoc_remove_flags_t flags,

src/libmongoc/src/mongoc/mongoc-collection.h

@@ -258,12 +258,6 @@ MONGOC_EXPORT (bool) mongoc_collection_delete (mongoc_collection_t *collection,
                                                const mongoc_write_concern_t *write_concern,
                                                bson_error_t *error);
 
-BSON_DEPRECATED_FOR (mongoc_collection_insert_one or mongoc_collection_replace_one)
-MONGOC_EXPORT (bool) mongoc_collection_save (mongoc_collection_t *collection,
-                                             const bson_t *document,
-                                             const mongoc_write_concern_t *write_concern,
-                                             bson_error_t *error);
-
 MONGOC_EXPORT (bool)
 mongoc_collection_remove (mongoc_collection_t *collection,
                           mongoc_remove_flags_t flags,

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

@@ -854,59 +854,6 @@ test_insert_command_keys (void)
 }
 
 
-static void
-test_save (void)
-{
-   mongoc_collection_t *collection;
-   mongoc_database_t *database;
-   mongoc_client_t *client;
-   bson_context_t *context;
-   bson_error_t error;
-   bson_oid_t oid;
-   unsigned i;
-   bson_t b;
-   bool r;
-
-   client = test_framework_new_default_client ();
-   ASSERT (client);
-
-   database = get_test_database (client);
-   ASSERT (database);
-
-   collection = get_test_collection (client, "test_save");
-   ASSERT (collection);
-
-   /* don't care if ns not found. */
-   (void) mongoc_collection_drop (collection, &error);
-
-   context = bson_context_new (BSON_CONTEXT_NONE);
-   ASSERT (context);
-
-   BEGIN_IGNORE_DEPRECATIONS
-
-   for (i = 0; i < 10; i++) {
-      bson_init (&b);
-      bson_oid_init (&oid, context);
-      bson_append_oid (&b, "_id", 3, &oid);
-      bson_append_utf8 (&b, "hello", 5, "/world", 5);
-      ASSERT_OR_PRINT (mongoc_collection_save (collection, &b, NULL, &error), error);
-      bson_destroy (&b);
-   }
-
-   r = mongoc_collection_save (collection, tmp_bson ("{'': 1}"), NULL, &error);
-
-   END_IGNORE_DEPRECATIONS
-
-   ASSERT (!r);
-   ASSERT_ERROR_CONTAINS (error, MONGOC_ERROR_COMMAND, MONGOC_ERROR_COMMAND_INVALID_ARG, "invalid document");
-
-   mongoc_collection_destroy (collection);
-   mongoc_database_destroy (database);
-   bson_context_destroy (context);
-   mongoc_client_destroy (client);
-}
-
-
 static void
 test_regex (void)
 {
@@ -5810,7 +5757,6 @@ test_collection_install (TestSuite *suite)
    TestSuite_AddFull (
       suite, "/Collection/insert/oversize", test_insert_oversize, NULL, NULL, test_framework_skip_if_slow_or_live);
    TestSuite_AddMockServerTest (suite, "/Collection/insert/keys", test_insert_command_keys);
-   TestSuite_AddLive (suite, "/Collection/save", test_save);
    TestSuite_AddLive (suite, "/Collection/insert/w0", test_insert_w0);
    TestSuite_AddLive (suite, "/Collection/update/w0", test_update_w0);
    TestSuite_AddLive (suite, "/Collection/remove/w0", test_remove_w0);