Fixes for batched update/delete

o Expands scope to all bulk write methods
o Fixes for 2.4
o Fixes for upserts

Author: hanumantmk

src/mongoc/mongoc-bulk-operation.c

@@ -128,12 +128,12 @@ mongoc_bulk_operation_remove (mongoc_bulk_operation_t *bulk,     /* IN */
                                    bulk->commands.len - 1);
       if ((last->type == MONGOC_WRITE_COMMAND_DELETE) &&
           last->u.delete.multi) {
-         _mongoc_write_command_delete_append (last, &selector, 1);
+         _mongoc_write_command_delete_append (last, selector);
          EXIT;
       }
    }
 
-   _mongoc_write_command_init_delete (&command, &selector, 1, true, bulk->ordered);
+   _mongoc_write_command_init_delete (&command, selector, true, bulk->ordered);
 
    _mongoc_array_append_val (&bulk->commands, command);
 
@@ -159,13 +159,12 @@ mongoc_bulk_operation_remove_one (mongoc_bulk_operation_t *bulk,     /* IN */
                                    bulk->commands.len - 1);
       if ((last->type == MONGOC_WRITE_COMMAND_DELETE) &&
           !last->u.delete.multi) {
-         _mongoc_write_command_delete_append (last, &selector, 1);
+         _mongoc_write_command_delete_append (last, selector);
          EXIT;
       }
    }
 
-   _mongoc_write_command_init_delete (&command, &selector, 1, false,
-      bulk->ordered);
+   _mongoc_write_command_init_delete (&command, selector, false, bulk->ordered);
 
    _mongoc_array_append_val (&bulk->commands, command);
 
@@ -237,6 +236,7 @@ mongoc_bulk_operation_replace_one (mongoc_bulk_operation_t *bulk,
 {
    mongoc_write_command_t command = { 0 };
    size_t err_off;
+   mongoc_write_command_t *last;
 
    bson_return_if_fail (bulk);
    bson_return_if_fail (selector);
@@ -253,6 +253,16 @@ mongoc_bulk_operation_replace_one (mongoc_bulk_operation_t *bulk,
       EXIT;
    }
 
+   if (bulk->commands.len) {
+      last = &_mongoc_array_index (&bulk->commands,
+                                   mongoc_write_command_t,
+                                   bulk->commands.len - 1);
+      if (last->type == MONGOC_WRITE_COMMAND_UPDATE) {
+         _mongoc_write_command_update_append (last, selector, document, upsert, false);
+         EXIT;
+      }
+   }
+
    _mongoc_write_command_init_update (&command, selector, document, upsert,
                                       false, bulk->ordered);
    _mongoc_array_append_val (&bulk->commands, command);
@@ -293,7 +303,7 @@ mongoc_bulk_operation_update (mongoc_bulk_operation_t *bulk,
                                    mongoc_write_command_t,
                                    bulk->commands.len - 1);
       if (last->type == MONGOC_WRITE_COMMAND_UPDATE) {
-         _mongoc_write_command_update_append (last, selector, document, multi, upsert);
+         _mongoc_write_command_update_append (last, selector, document, upsert, multi);
          EXIT;
       }
    }
@@ -313,6 +323,7 @@ mongoc_bulk_operation_update_one (mongoc_bulk_operation_t *bulk,
 {
    mongoc_write_command_t command = { 0 };
    bson_iter_t iter;
+   mongoc_write_command_t *last;
 
    bson_return_if_fail (bulk);
    bson_return_if_fail (selector);
@@ -330,6 +341,16 @@ mongoc_bulk_operation_update_one (mongoc_bulk_operation_t *bulk,
       }
    }
 
+   if (bulk->commands.len) {
+      last = &_mongoc_array_index (&bulk->commands,
+                                   mongoc_write_command_t,
+                                   bulk->commands.len - 1);
+      if (last->type == MONGOC_WRITE_COMMAND_UPDATE) {
+         _mongoc_write_command_update_append (last, selector, document, upsert, false);
+         EXIT;
+      }
+   }
+
    _mongoc_write_command_init_update (&command, selector, document, upsert,
                                       false, bulk->ordered);
    _mongoc_array_append_val (&bulk->commands, command);

src/mongoc/mongoc-collection.c

@@ -1395,7 +1395,7 @@ mongoc_collection_remove (mongoc_collection_t          *collection,
    multi = !(flags & MONGOC_REMOVE_SINGLE_REMOVE);
 
    _mongoc_write_result_init (&result);
-   _mongoc_write_command_init_delete (&command, &selector, 1, multi, true);
+   _mongoc_write_command_init_delete (&command, selector, multi, true);
 
    _mongoc_write_command_execute (&command, collection->client, 0,
                                   collection->db, collection->collection,

src/mongoc/mongoc-error.h

@@ -80,7 +80,8 @@ typedef enum
    MONGOC_ERROR_COMMAND_INVALID_ARG,
 
    MONGOC_ERROR_COLLECTION_INSERT_FAILED,
-    MONGOC_ERROR_COLLECTION_UPDATE_FAILED,
+   MONGOC_ERROR_COLLECTION_UPDATE_FAILED,
+   MONGOC_ERROR_COLLECTION_DELETE_FAILED,
    MONGOC_ERROR_COLLECTION_DOES_NOT_EXIST = 26,
 
    MONGOC_ERROR_GRIDFS_INVALID_FILENAME,

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

@@ -91,11 +91,10 @@ void _mongoc_write_command_init_insert (mongoc_write_command_t        *command,
                                         uint32_t                       n_documents,
                                         bool                           ordered,
                                         bool                           allow_bulk_op_insert);
-void _mongoc_write_command_init_delete (mongoc_write_command_t *command,
-                                        const bson_t * const   *selectors,
-                                        uint32_t                n_selectors,
-                                        bool                    multi,
-                                        bool                    ordered);
+void _mongoc_write_command_init_delete (mongoc_write_command_t        *command,
+                                        const bson_t                  *selectors,
+                                        bool                           multi,
+                                        bool                           ordered);
 void _mongoc_write_command_init_update (mongoc_write_command_t        *command,
                                         const bson_t                  *selector,
                                         const bson_t                  *update,
@@ -109,12 +108,11 @@ void _mongoc_write_command_insert_append (mongoc_write_command_t      *command,
 void _mongoc_write_command_update_append (mongoc_write_command_t      *command,
                                           const bson_t                *selector,
                                           const bson_t                *update,
-                                          bool                        upsert,
-                                          bool                        multi);
+                                          bool                         upsert,
+                                          bool                         multi);
 
 void _mongoc_write_command_delete_append (mongoc_write_command_t *command,
-                                          const bson_t * const   *selectors,
-                                          uint32_t                n_selectors);
+                                          const bson_t           *selector);
 
 void _mongoc_write_command_execute     (mongoc_write_command_t        *command,
                                         mongoc_client_t               *client,