write-commands: coalesce repeated calls for bulk insert.

Author: Christian Hergert

src/mongoc/mongoc-bulk-operation.c

@@ -151,13 +151,28 @@ mongoc_bulk_operation_insert (mongoc_bulk_operation_t *bulk,
                               const bson_t            *document)
 {
    mongoc_write_command_t command = { 0 };
+   mongoc_write_command_t *last;
+
+   ENTRY;
 
    bson_return_if_fail (bulk);
    bson_return_if_fail (document);
 
+   if (bulk->commands.len) {
+      last = &_mongoc_array_index (&bulk->commands,
+                                   mongoc_write_command_t,
+                                   bulk->commands.len - 1);
+      if (last->type == MONGOC_WRITE_COMMAND_INSERT) {
+         _mongoc_write_command_insert_append (last, &document, 1);
+         EXIT;
+      }
+   }
+
    _mongoc_write_command_init_insert (&command, &document, 1, bulk->ordered,
                                       false);
    _mongoc_array_append_val (&bulk->commands, command);
+
+   EXIT;
 }
 
 

src/mongoc/mongoc-write-command-private.h

@@ -93,6 +93,9 @@ void _mongoc_write_command_init_update (mongoc_write_command_t        *command,
                                         bool                           upsert,
                                         bool                           multi,
                                         bool                           ordered);
+void _mongoc_write_command_insert_append (mongoc_write_command_t      *command,
+                                          const bson_t * const        *documents,
+                                          uint32_t                     n_documents);
 void _mongoc_write_command_execute     (mongoc_write_command_t        *command,
                                         mongoc_client_t               *client,
                                         uint32_t                       hint,

src/mongoc/mongoc-write-command.c

@@ -55,12 +55,9 @@ static bson_t gEmptyWriteConcern = BSON_INITIALIZER;
 
 
 void
-_mongoc_write_command_init_insert
-      (mongoc_write_command_t *command,              /* IN */
-       const bson_t * const   *documents,            /* IN */
-       uint32_t                n_documents,          /* IN */
-       bool                    ordered,              /* IN */
-       bool                    allow_bulk_op_insert) /* IN */
+_mongoc_write_command_insert_append (mongoc_write_command_t *command,
+                                     const bson_t * const   *documents,
+                                     uint32_t                n_documents)
 {
    const char *key;
    bson_iter_t iter;
@@ -72,12 +69,8 @@ _mongoc_write_command_init_insert
    ENTRY;
 
    BSON_ASSERT (command);
-
-   command->type = MONGOC_WRITE_COMMAND_INSERT;
-   command->u.insert.documents = bson_new ();
-   command->u.insert.n_documents = n_documents;
-   command->u.insert.ordered = ordered;
-   command->u.insert.allow_bulk_op_insert = allow_bulk_op_insert;
+   BSON_ASSERT (command->type == MONGOC_WRITE_COMMAND_INSERT);
+   BSON_ASSERT (!n_documents || documents);
 
    for (i = 0; i < n_documents; i++) {
       BSON_ASSERT (documents [i]);
@@ -108,6 +101,33 @@ _mongoc_write_command_init_insert
 }
 
 
+void
+_mongoc_write_command_init_insert
+      (mongoc_write_command_t *command,              /* IN */
+       const bson_t * const   *documents,            /* IN */
+       uint32_t                n_documents,          /* IN */
+       bool                    ordered,              /* IN */
+       bool                    allow_bulk_op_insert) /* IN */
+{
+   ENTRY;
+
+   BSON_ASSERT (command);
+   BSON_ASSERT (!n_documents || documents);
+
+   command->type = MONGOC_WRITE_COMMAND_INSERT;
+   command->u.insert.documents = bson_new ();
+   command->u.insert.n_documents = n_documents;
+   command->u.insert.ordered = ordered;
+   command->u.insert.allow_bulk_op_insert = allow_bulk_op_insert;
+
+   if (n_documents) {
+      _mongoc_write_command_insert_append (command, documents, n_documents);
+   }
+
+   EXIT;
+}
+
+
 void
 _mongoc_write_command_init_delete (mongoc_write_command_t *command,  /* IN */
                                    const bson_t           *selector, /* IN */