CDRIVER-3035 allow bulk OP_INSERT for w:0 insert_many

jmikola · jmikola · commit 8c5da424138c · 2019-11-07T14:57:36.000-05:00
Since libmongoc requires MongoDB 3.0+, OP_INSERT is only used for w:0
writes. The allow_bulk_op_insert flag is removed since there is no need
to limit OP_INSERT to single inserts.
diff --git a/src/libmongoc/src/mongoc/mongoc-bulk-operation.c b/src/libmongoc/src/mongoc/mongoc-bulk-operation.c
@@ -382,8 +382,7 @@ mongoc_bulk_operation_insert_with_opts (mongoc_bulk_operation_t *bulk,
       document,
       &insert_opts.extra,
       bulk->flags,
-      bulk->operation_id,
-      !mongoc_write_concern_is_acknowledged (bulk->write_concern));
+      bulk->operation_id);
 
    _mongoc_array_append_val (&bulk->commands, command);
 
diff --git a/src/libmongoc/src/mongoc/mongoc-collection.c b/src/libmongoc/src/mongoc/mongoc-collection.c
@@ -1517,8 +1517,7 @@ mongoc_collection_insert_bulk (mongoc_collection_t *collection,
       NULL,
       NULL,
       write_flags,
-      ++collection->client->cluster.operation_id,
-      true);
+      ++collection->client->cluster.operation_id);
 
    for (i = 0; i < n_documents; i++) {
       _mongoc_write_command_insert_append (&command, documents[i]);
@@ -1634,8 +1633,7 @@ mongoc_collection_insert_one (mongoc_collection_t *collection,
       &command,
       document,
       &insert_one_opts.extra,
-      ++collection->client->cluster.operation_id,
-      false);
+      ++collection->client->cluster.operation_id);
 
    command.flags.bypass_document_validation = insert_one_opts.bypass;
    _mongoc_collection_write_command_execute_idl (
@@ -1717,8 +1715,7 @@ mongoc_collection_insert_many (mongoc_collection_t *collection,
       &command,
       NULL,
       &insert_many_opts.extra,
-      ++collection->client->cluster.operation_id,
-      false);
+      ++collection->client->cluster.operation_id);
 
    command.flags.ordered = insert_many_opts.ordered;
    command.flags.bypass_document_validation = insert_many_opts.bypass;
diff --git a/src/libmongoc/src/mongoc/mongoc-write-command-legacy.c b/src/libmongoc/src/mongoc/mongoc-write-command-legacy.c
@@ -245,7 +245,6 @@ _mongoc_write_command_insert_legacy (mongoc_write_command_t *command,
    uint32_t idx = 0;
    int32_t max_msg_size;
    int32_t max_bson_obj_size;
-   bool singly;
    bson_reader_t *reader;
    const bson_t *bson;
    bool eof;
@@ -265,8 +264,6 @@ _mongoc_write_command_insert_legacy (mongoc_write_command_t *command,
    max_bson_obj_size = mongoc_server_stream_max_bson_obj_size (server_stream);
    max_msg_size = mongoc_server_stream_max_msg_size (server_stream);
 
-   singly = !command->u.insert.allow_bulk_op_insert;
-
    if (!command->n_documents) {
       bson_set_error (error,
                       MONGOC_ERROR_COLLECTION,
@@ -303,8 +300,7 @@ _mongoc_write_command_insert_legacy (mongoc_write_command_t *command,
             /* send the batch so far (if any) and return the error */
             break;
          }
-      } else if ((n_docs_in_batch == 1 && singly) ||
-                 size > (max_msg_size - bson->len)) {
+      } else if (size > (max_msg_size - bson->len)) {
          /* batch is full, send it and then start the next batch */
          has_more = true;
          break;
diff --git a/src/libmongoc/src/mongoc/mongoc-write-command-private.h b/src/libmongoc/src/mongoc/mongoc-write-command-private.h
@@ -58,11 +58,6 @@ typedef struct {
    mongoc_bulk_write_flags_t flags;
    int64_t operation_id;
    bson_t cmd_opts;
-   union {
-      struct {
-         bool allow_bulk_op_insert;
-      } insert;
-   } u;
 } mongoc_write_command_t;
 
 
@@ -112,14 +107,12 @@ _mongoc_write_command_init_insert (mongoc_write_command_t *command,
                                    const bson_t *document,
                                    const bson_t *cmd_opts,
                                    mongoc_bulk_write_flags_t flags,
-                                   int64_t operation_id,
-                                   bool allow_bulk_op_insert);
+                                   int64_t operation_id);
 void
 _mongoc_write_command_init_insert_idl (mongoc_write_command_t *command,
                                        const bson_t *document,
                                        const bson_t *cmd_opts,
-                                       int64_t operation_id,
-                                       bool allow_bulk_op_insert);
+                                       int64_t operation_id);
 void
 _mongoc_write_command_init_delete (mongoc_write_command_t *command,
                                    const bson_t *selectors,
diff --git a/src/libmongoc/src/mongoc/mongoc-write-command.c b/src/libmongoc/src/mongoc/mongoc-write-command.c
@@ -198,8 +198,7 @@ _mongoc_write_command_init_insert (mongoc_write_command_t *command, /* IN */
                                    const bson_t *document,          /* IN */
                                    const bson_t *cmd_opts,          /* IN */
                                    mongoc_bulk_write_flags_t flags, /* IN */
-                                   int64_t operation_id,            /* IN */
-                                   bool allow_bulk_op_insert)       /* IN */
+                                   int64_t operation_id)            /* IN */
 {
    ENTRY;
 
@@ -208,7 +207,6 @@ _mongoc_write_command_init_insert (mongoc_write_command_t *command, /* IN */
    _mongoc_write_command_init_bulk (
       command, MONGOC_WRITE_COMMAND_INSERT, flags, operation_id, cmd_opts);
 
-   command->u.insert.allow_bulk_op_insert = (uint8_t) allow_bulk_op_insert;
    /* must handle NULL document from mongoc_collection_insert_bulk */
    if (document) {
       _mongoc_write_command_insert_append (command, document);
@@ -222,8 +220,7 @@ void
 _mongoc_write_command_init_insert_idl (mongoc_write_command_t *command,
                                        const bson_t *document,
                                        const bson_t *cmd_opts,
-                                       int64_t operation_id,
-                                       bool allow_bulk_op_insert)
+                                       int64_t operation_id)
 {
    mongoc_bulk_write_flags_t flags = MONGOC_BULK_WRITE_FLAGS_INIT;
 
@@ -234,7 +231,6 @@ _mongoc_write_command_init_insert_idl (mongoc_write_command_t *command,
    _mongoc_write_command_init_bulk (
       command, MONGOC_WRITE_COMMAND_INSERT, flags, operation_id, cmd_opts);
 
-   command->u.insert.allow_bulk_op_insert = (uint8_t) allow_bulk_op_insert;
    /* must handle NULL document from mongoc_collection_insert_bulk */
    if (document) {
       _mongoc_write_command_insert_append (command, document);
diff --git a/src/libmongoc/tests/test-mongoc-write-commands.c b/src/libmongoc/tests/test-mongoc-write-commands.c
@@ -51,8 +51,7 @@ test_split_insert (void)
                                       docs[0],
                                       NULL,
                                       write_flags,
-                                      ++client->cluster.operation_id,
-                                      true);
+                                      ++client->cluster.operation_id);
 
    for (i = 1; i < 3000; i++) {
       _mongoc_write_command_insert_append (&command, docs[i]);
@@ -127,7 +126,7 @@ test_invalid_write_concern (void)
    doc = BCON_NEW ("_id", BCON_INT32 (0));
 
    _mongoc_write_command_init_insert (
-      &command, doc, NULL, write_flags, ++client->cluster.operation_id, true);
+      &command, doc, NULL, write_flags, ++client->cluster.operation_id);
    _mongoc_write_result_init (&result);
    server_stream =
       mongoc_cluster_stream_for_writes (&client->cluster, NULL, NULL, &error);
@@ -524,6 +523,59 @@ test_opmsg_disconnect_mid_batch (void)
    test_opmsg_disconnect_mid_batch_helper (WIRE_VERSION_OP_MSG - 1);
 }
 
+static void
+test_w0_legacy_insert_many (void)
+{
+   mock_server_t *server;
+   mongoc_client_t *client;
+   mongoc_collection_t *coll;
+   bson_t **docs;
+   bson_error_t error;
+   future_t *future;
+   request_t *request;
+   bson_t opts;
+   mongoc_write_concern_t *wc;
+
+   /* wire version will use OP_INSERT for w:0 insert many (since no OP_MSG) */
+   server = mock_server_new ();
+   mock_server_auto_ismaster (server,
+                              "{'ismaster': true,"
+                              " 'maxWireVersion': 5}");
+   mock_server_run (server);
+
+   docs = bson_malloc (sizeof (bson_t *) * 2);
+   docs[0] = BCON_NEW ("x", BCON_INT32 (1));
+   docs[1] = BCON_NEW ("x", BCON_INT32 (2));
+
+   client = mongoc_client_new_from_uri (mock_server_get_uri (server));
+   coll = mongoc_client_get_collection (client, "db", "coll");
+
+   /* Add unacknowldged write concern */
+   bson_init (&opts);
+   wc = mongoc_write_concern_new ();
+   mongoc_write_concern_set_w (wc, 0);
+   mongoc_write_concern_append (wc, &opts);
+   mongoc_write_concern_destroy (wc);
+
+   future = future_collection_insert_many (
+      coll, (const bson_t **) docs, 2, &opts, NULL, &error);
+   /* Mock server receives one OP_INSERT with two documents */
+   request = mock_server_receives_bulk_insert (server, "db.coll", 0, 2);
+   BSON_ASSERT (request);
+
+   mock_server_replies_ok_and_destroys (request);
+   BSON_ASSERT (future_get_bool (future));
+
+   future_destroy (future);
+   bson_destroy (docs[0]);
+   bson_destroy (docs[1]);
+   bson_free (docs);
+   bson_destroy (&opts);
+   mongoc_collection_destroy (coll);
+   mongoc_client_destroy (client);
+   mock_server_destroy (server);
+}
+
 void
 test_write_command_install (TestSuite *suite)
 {
@@ -544,4 +596,7 @@ test_write_command_install (TestSuite *suite)
    TestSuite_AddMockServerTest (suite,
                                 "/WriteCommand/insert_disconnect_mid_batch",
                                 test_opmsg_disconnect_mid_batch);
+   TestSuite_AddMockServerTest (suite,
+                                "/WriteCommand/w0_legacy_insert_many",
+                                test_w0_legacy_insert_many);
 }
