Revert "CDRIVER-1322: mongoc_collection_aggregate_with_write_concern"

bjori · bjori · commit 35af0c287c8a · 2016-08-10T11:34:46.000-07:00
This reverts commit 2ba99c4. Conflicts: tests/test-mongoc-collection.c
diff --git a/build/autotools/versions.ldscript b/build/autotools/versions.ldscript
@@ -334,7 +334,6 @@ LIBMONGOC_1.4 {
         mongoc_client_set_apm_callbacks;
         mongoc_client_set_appname;
         mongoc_client_set_error_api;
-        mongoc_collection_aggregate_with_write_concern;
         mongoc_cursor_get_limit;
         mongoc_cursor_new_from_command_reply;
         mongoc_cursor_set_hint;
diff --git a/build/cmake/libmongoc-experimental.def b/build/cmake/libmongoc-experimental.def
@@ -90,7 +90,6 @@ mongoc_client_set_read_prefs
 mongoc_client_set_stream_initiator
 mongoc_client_set_write_concern
 mongoc_collection_aggregate
-mongoc_collection_aggregate_with_write_concern
 mongoc_collection_command
 mongoc_collection_command_simple
 mongoc_collection_copy
diff --git a/build/cmake/libmongoc-ssl-experimental.def b/build/cmake/libmongoc-ssl-experimental.def
@@ -92,7 +92,6 @@ mongoc_client_set_ssl_opts
 mongoc_client_set_stream_initiator
 mongoc_client_set_write_concern
 mongoc_collection_aggregate
-mongoc_collection_aggregate_with_write_concern
 mongoc_collection_command
 mongoc_collection_command_simple
 mongoc_collection_copy
diff --git a/src/libmongoc.symbols b/src/libmongoc.symbols
@@ -94,7 +94,6 @@ mongoc_client_set_ssl_opts
 mongoc_client_set_stream_initiator
 mongoc_client_set_write_concern
 mongoc_collection_aggregate
-mongoc_collection_aggregate_with_write_concern
 mongoc_collection_command
 mongoc_collection_command_simple
 mongoc_collection_copy
diff --git a/src/mongoc/mongoc-collection.c b/src/mongoc/mongoc-collection.c
@@ -295,28 +295,12 @@ mongoc_collection_copy (mongoc_collection_t *collection) /* IN */
  *--------------------------------------------------------------------------
  */
 
-
 mongoc_cursor_t *
 mongoc_collection_aggregate (mongoc_collection_t       *collection, /* IN */
                              mongoc_query_flags_t       flags,      /* IN */
                              const bson_t              *pipeline,   /* IN */
                              const bson_t              *options,    /* IN */
                              const mongoc_read_prefs_t *read_prefs) /* IN */
-{
-   return mongoc_collection_aggregate_with_write_concern (collection, flags,
-                                                          pipeline, options,
-                                                          read_prefs, NULL);
-}
-
-
-mongoc_cursor_t *
-mongoc_collection_aggregate_with_write_concern (
-        mongoc_collection_t       *collection, /* IN */
-        mongoc_query_flags_t       flags,      /* IN */
-        const bson_t              *pipeline,   /* IN */
-        const bson_t              *options,    /* IN */
-        const mongoc_read_prefs_t *read_prefs,
-        mongoc_write_concern_t    *write_concern) /* IN */
 {
    mongoc_server_description_t *selected_server = NULL;
    mongoc_cursor_t *cursor;
@@ -343,10 +327,6 @@ mongoc_collection_aggregate_with_write_concern (
       GOTO (done); 
    }
 
-   if (!_mongoc_write_concern_validate (write_concern, &cursor->error)) {
-      GOTO (done);
-   }
-
    selected_server = mongoc_topology_select(collection->client->topology,
                                             MONGOC_SS_READ,
                                             read_prefs,
@@ -427,13 +407,6 @@ mongoc_collection_aggregate_with_write_concern (
       BSON_APPEND_DOCUMENT (&command, "readConcern", read_concern_bson);
    }
 
-   if (write_concern &&
-       !_mongoc_write_concern_is_default (write_concern) &&
-       selected_server->max_wire_version >= WIRE_VERSION_CMD_WRITE_CONCERN) {
-      bson_append_document (&command, "writeConcern", 12,
-                            _mongoc_write_concern_get_bson (write_concern));
-   }
-
    if (use_cursor) {
       _mongoc_cursor_cursorid_init (cursor, &command);
    } else {
diff --git a/src/mongoc/mongoc-collection.h b/src/mongoc/mongoc-collection.h
@@ -43,13 +43,6 @@ mongoc_cursor_t               *mongoc_collection_aggregate           (mongoc_col
                                                                       const bson_t                  *pipeline,
                                                                       const bson_t                  *options,
                                                                       const mongoc_read_prefs_t     *read_prefs) BSON_GNUC_WARN_UNUSED_RESULT;
-mongoc_cursor_t               *mongoc_collection_aggregate_with_write_concern
-                                                                     (mongoc_collection_t           *collection,
-                                                                      mongoc_query_flags_t           flags,
-                                                                      const bson_t                  *pipeline,
-                                                                      const bson_t                  *options,
-                                                                      const mongoc_read_prefs_t     *read_prefs,
-                                                                      mongoc_write_concern_t        *write_concern) BSON_GNUC_WARN_UNUSED_RESULT;
 void                          mongoc_collection_destroy              (mongoc_collection_t           *collection);
 mongoc_collection_t          *mongoc_collection_copy                 (mongoc_collection_t           *collection);
 mongoc_cursor_t              *mongoc_collection_command              (mongoc_collection_t           *collection,
diff --git a/tests/test-mongoc-collection.c b/tests/test-mongoc-collection.c
@@ -3,7 +3,6 @@
 #include <mongoc-client-private.h>
 #include <mongoc-cursor-private.h>
 #include <mongoc-collection-private.h>
-#include <mongoc-write-concern-private.h>
 
 #include "TestSuite.h"
 
@@ -13,93 +12,6 @@
 #include "mock_server/mock-server.h"
 
 
-static void
-test_aggregate_w_write_concern (void *context) {
-   mongoc_cursor_t *cursor;
-   mongoc_client_t *client;
-   mongoc_collection_t *collection;
-   mongoc_write_concern_t *good_wc;
-   mongoc_write_concern_t *bad_wc;
-   bson_t *pipeline;
-   char *json;
-   bool wire_version_5;
-   const bson_t *doc;
-   bson_error_t error;
-
-   /* set up */
-   good_wc = mongoc_write_concern_new ();
-   bad_wc = mongoc_write_concern_new ();
-
-   client = test_framework_client_new ();
-   assert (client);
-   ASSERT (mongoc_client_set_error_api (client, 2));
-
-   collection = mongoc_client_get_collection (client, "test", "test");
-
-   /* determine server config */
-   wire_version_5 = test_framework_max_wire_version_at_least (5);
-
-   /* pipeline that writes to collection */
-   json = bson_strdup_printf ("[{'$out': '%s'}]",
-                              collection->collection);
-   pipeline = tmp_bson (json);
-
-   /* collection aggregate with valid writeConcern: no error */
-   mongoc_write_concern_set_w (good_wc, 1);
-   cursor = mongoc_collection_aggregate_with_write_concern (
-           collection, MONGOC_QUERY_NONE,
-           pipeline, NULL, NULL, good_wc);
-   ASSERT (cursor);
-   mongoc_cursor_next (cursor, &doc);
-
-   ASSERT_OR_PRINT (!mongoc_cursor_error (cursor, &error), error);
-   mongoc_cursor_destroy (cursor);
-
-   /* writeConcern that will not pass mongoc_write_concern_is_valid */
-   bad_wc->wtimeout = -10;
-   cursor = mongoc_collection_aggregate_with_write_concern (
-           collection, MONGOC_QUERY_NONE,
-           pipeline, NULL, NULL, bad_wc);
-   ASSERT (cursor);
-   ASSERT_ERROR_CONTAINS (
-           cursor->error, MONGOC_ERROR_COMMAND,
-           MONGOC_ERROR_COMMAND_INVALID_ARG,
-           "Invalid mongoc_write_concern_t");
-   bad_wc->wtimeout = 0;
-
-   /* collection aggregate with invalid writeConcern: skip mongos */
-   if (!test_framework_is_mongos ()) {
-      mongoc_cursor_destroy (cursor);
-
-      mongoc_write_concern_set_w (bad_wc, 99);
-      cursor = mongoc_collection_aggregate_with_write_concern (
-              collection, MONGOC_QUERY_NONE,
-              pipeline, NULL, NULL, bad_wc);
-      ASSERT (cursor);
-
-      mongoc_cursor_next (cursor, &doc);
-
-      if (wire_version_5) {
-         if (test_framework_is_replset ()) { /* replica set */
-            ASSERT_OR_PRINT (!mongoc_cursor_error (cursor, &error), error);
-         } else { /* standalone */
-            ASSERT_CMPINT (cursor->error.domain, ==, MONGOC_ERROR_SERVER);
-            ASSERT_CMPINT (cursor->error.code, ==, 2);
-         }
-      } else { /* if server wire version <= 4, no error */
-         ASSERT_OR_PRINT (!mongoc_cursor_error (cursor, &error), error);
-      }
-   }
-
-   mongoc_write_concern_destroy (good_wc);
-   mongoc_write_concern_destroy (bad_wc);
-   mongoc_collection_destroy (collection);
-   mongoc_cursor_destroy (cursor);
-   mongoc_client_destroy (client);
-   bson_free (json);
-}
-
-
 static void
 test_read_prefs_is_valid (void) {
    mongoc_collection_t *collection;
@@ -3451,10 +3363,7 @@ test_collection_install (TestSuite *suite)
 {
    test_aggregate_install (suite);
 
-   TestSuite_AddFull (suite, "/Collection/aggregate/write_concern",
-                      test_aggregate_w_write_concern, NULL, NULL,
-                      test_framework_skip_if_max_version_version_less_than_2);
-   TestSuite_AddLive (suite, "/Collection/read_prefs_is_valid",
+   TestSuite_AddLive (suite, "/Collection/read_prefs_is_valid", 
                       test_read_prefs_is_valid);
    TestSuite_AddLive (suite, "/Collection/insert_bulk", test_insert_bulk);
    TestSuite_AddLive (suite,
