collection: use write commands for delete/remove.

Author: Christian Hergert

src/mongoc/mongoc-collection.c

@@ -1000,6 +1000,10 @@ mongoc_collection_insert (mongoc_collection_t          *collection,
 
    bson_clear (&collection->gle);
 
+   if (!write_concern) {
+      write_concern = collection->write_concern;
+   }
+
    if (!(flags & MONGOC_INSERT_NO_VALIDATE)) {
       if (!bson_validate (document,
                           (BSON_VALIDATE_UTF8 |
@@ -1217,44 +1221,38 @@ mongoc_collection_remove (mongoc_collection_t          *collection,
                           const mongoc_write_concern_t *write_concern,
                           bson_error_t                 *error)
 {
-   uint32_t hint;
-   mongoc_rpc_t rpc;
+   mongoc_write_command_t command;
+   mongoc_write_result_t result;
+   bool multi;
+   bool ret;
 
-   bson_return_val_if_fail(collection, false);
-   bson_return_val_if_fail(selector, false);
+   ENTRY;
+
+   bson_return_val_if_fail (collection, false);
+   bson_return_val_if_fail (selector, false);
 
    bson_clear (&collection->gle);
 
    if (!write_concern) {
       write_concern = collection->write_concern;
    }
 
-   if (!_mongoc_client_warm_up (collection->client, error)) {
-      return false;
-   }
+   multi = !(flags & MONGOC_REMOVE_SINGLE_REMOVE);
 
-   rpc.delete.msg_len = 0;
-   rpc.delete.request_id = 0;
-   rpc.delete.response_to = 0;
-   rpc.delete.opcode = MONGOC_OPCODE_DELETE;
-   rpc.delete.zero = 0;
-   rpc.delete.collection = collection->ns;
-   rpc.delete.flags = flags;
-   rpc.delete.selector = bson_get_data(selector);
-
-   if (!(hint = _mongoc_client_sendv(collection->client, &rpc, 1, 0,
-                                     write_concern, NULL, error))) {
-      return false;
-   }
+   _mongoc_write_result_init (&result);
+   _mongoc_write_command_init_delete (&command, selector, multi, true);
 
-   if (_mongoc_write_concern_has_gle(write_concern)) {
-      if (!_mongoc_client_recv_gle (collection->client, hint,
-                                    &collection->gle, error)) {
-         return false;
-      }
-   }
+   _mongoc_write_command_execute (&command, collection->client, 0,
+                                  collection->db, collection->collection,
+                                  write_concern, &result);
 
-   return true;
+   collection->gle = bson_new ();
+   ret = _mongoc_write_result_complete (&result, collection->gle, error);
+
+   _mongoc_write_result_destroy (&result);
+   _mongoc_write_command_destroy (&command);
+
+   RETURN (ret);
 }