CDRIVER-945: Change of hearts. Remove _set_write_concern

For consistency with all other helpers, the write concern should be set
at the collection level, not per command.

Author: bjori

build/autotools/versions.ldscript

@@ -283,7 +283,6 @@ LIBMONGOC_1.3 {
         mongoc_find_and_modify_opts_set_flags;
         mongoc_find_and_modify_opts_set_sort;
         mongoc_find_and_modify_opts_set_update;
-        mongoc_find_and_modify_opts_set_write_concern;
         mongoc_read_concern_copy;
         mongoc_read_concern_destroy;
         mongoc_read_concern_get_level;

build/cmake/libmongoc-ssl.def

@@ -125,7 +125,6 @@ mongoc_find_and_modify_opts_set_fields
 mongoc_find_and_modify_opts_set_flags
 mongoc_find_and_modify_opts_set_sort
 mongoc_find_and_modify_opts_set_update
-mongoc_find_and_modify_opts_set_write_concern
 mongoc_get_major_version
 mongoc_get_micro_version
 mongoc_get_minor_version

build/cmake/libmongoc.def

@@ -123,7 +123,6 @@ mongoc_find_and_modify_opts_set_fields
 mongoc_find_and_modify_opts_set_flags
 mongoc_find_and_modify_opts_set_sort
 mongoc_find_and_modify_opts_set_update
-mongoc_find_and_modify_opts_set_write_concern
 mongoc_get_major_version
 mongoc_get_micro_version
 mongoc_get_minor_version

src/libmongoc.symbols

@@ -128,7 +128,6 @@ mongoc_find_and_modify_opts_set_fields
 mongoc_find_and_modify_opts_set_flags
 mongoc_find_and_modify_opts_set_sort
 mongoc_find_and_modify_opts_set_update
-mongoc_find_and_modify_opts_set_write_concern
 mongoc_get_major_version
 mongoc_get_micro_version
 mongoc_get_minor_version

src/mongoc/mongoc-collection.c

@@ -2064,7 +2064,6 @@ mongoc_collection_find_and_modify_with_opts (mongoc_collection_t
    const char *name;
    bool ret;
    bson_t command = BSON_INITIALIZER;
-   mongoc_write_concern_t *wc;
 
    ENTRY;
 
@@ -2112,10 +2111,8 @@ mongoc_collection_find_and_modify_with_opts (mongoc_collection_t
                         !!opts->bypass_document_validation);
    }
 
-   wc = opts->write_concern ? opts->write_concern : collection->write_concern;
-
    if (server_stream->sd->max_wire_version >= WIRE_VERSION_FAM_WRITE_CONCERN) {
-      if (!_mongoc_write_concern_is_valid (wc)) {
+      if (!_mongoc_write_concern_is_valid (collection->write_concern)) {
          bson_set_error (error,
                          MONGOC_ERROR_COMMAND,
                          MONGOC_ERROR_COMMAND_INVALID_ARG,
@@ -2125,8 +2122,8 @@ mongoc_collection_find_and_modify_with_opts (mongoc_collection_t
          RETURN (false);
       }
 
-      if (_mongoc_write_concern_needs_gle (wc)) {
-         _BSON_APPEND_WRITE_CONCERN (&command, wc);
+      if (_mongoc_write_concern_needs_gle (collection->write_concern)) {
+         _BSON_APPEND_WRITE_CONCERN (&command, collection->write_concern);
       }
    }
 
@@ -2211,7 +2208,6 @@ mongoc_collection_find_and_modify (mongoc_collection_t *collection,
    mongoc_find_and_modify_opts_set_update (opts, update);
    mongoc_find_and_modify_opts_set_fields (opts, fields);
    mongoc_find_and_modify_opts_set_flags (opts, flags);
-   mongoc_find_and_modify_opts_set_write_concern (opts, collection->write_concern);
 
    ret = mongoc_collection_find_and_modify_with_opts (collection, query, opts, reply, error);
    mongoc_find_and_modify_opts_destroy (opts);

src/mongoc/mongoc-find-and-modify-private.h

@@ -31,7 +31,6 @@ struct _mongoc_find_and_modify_opts_t
    bson_t                                    *sort;
    bson_t                                    *update;
    bson_t                                    *fields;
-   mongoc_write_concern_t                    *write_concern;
    mongoc_find_and_modify_flags_t             flags;
    mongoc_write_bypass_document_validation_t  bypass_document_validation;
 };

src/mongoc/mongoc-find-and-modify.c

@@ -105,22 +105,6 @@ mongoc_find_and_modify_opts_set_bypass_document_validation (mongoc_find_and_modi
    return true;
 }
 
-bool
-mongoc_find_and_modify_opts_set_write_concern (mongoc_find_and_modify_opts_t *opts,
-                                               const mongoc_write_concern_t  *write_concern)
-{
-   BSON_ASSERT (opts);
-
-   if (_mongoc_write_concern_is_valid (write_concern)) {
-      if (opts->write_concern) {
-         mongoc_write_concern_destroy (opts->write_concern);
-      }
-      opts->write_concern = mongoc_write_concern_copy (write_concern);
-      return true;
-   }
-   return false;
-}
-
 /**
  * mongoc_find_and_modify_opts_destroy:
  * @opts: A mongoc_find_and_modify_opts_t.
@@ -134,9 +118,6 @@ mongoc_find_and_modify_opts_destroy (mongoc_find_and_modify_opts_t *opts)
       _mongoc_bson_destroy_if_set (opts->sort);
       _mongoc_bson_destroy_if_set (opts->update);
       _mongoc_bson_destroy_if_set (opts->fields);
-      if (opts->write_concern) {
-         mongoc_write_concern_destroy (opts->write_concern);
-      }
       bson_free (opts);
    }
 }

src/mongoc/mongoc-find-and-modify.h

@@ -53,9 +53,6 @@ mongoc_find_and_modify_opts_set_flags         (mongoc_find_and_modify_opts_t
 bool
 mongoc_find_and_modify_opts_set_bypass_document_validation (mongoc_find_and_modify_opts_t *opts,
                                                             bool                           bypass);
-bool
-mongoc_find_and_modify_opts_set_write_concern (mongoc_find_and_modify_opts_t        *opts,
-                                               const mongoc_write_concern_t         *write_concern);
 void
 mongoc_find_and_modify_opts_destroy           (mongoc_find_and_modify_opts_t *opts);
 

tests/test-mongoc-find-and-modify.c

@@ -83,7 +83,7 @@ test_find_and_modify_write_concern (int wire_version)
    write_concern = mongoc_write_concern_new ();
    mongoc_write_concern_set_w (write_concern, 42);
    opts = mongoc_find_and_modify_opts_new ();
-   mongoc_find_and_modify_opts_set_write_concern (opts, write_concern);
+   mongoc_collection_set_write_concern (collection, write_concern);
    mongoc_find_and_modify_opts_set_update (opts, update);
    mongoc_find_and_modify_opts_set_flags (opts, MONGOC_FIND_AND_MODIFY_RETURN_NEW);