CDRIVER-1573 Rename bulk_operation_[update|remove]_with_opts to bulk_operation_[update|remove]_many_with_opts

bjori · bjori · commit 68283097da1f · 2016-10-12T11:16:28.000-07:00
diff --git a/doc/mongoc_bulk_operation_delete.page b/doc/mongoc_bulk_operation_delete.page
@@ -38,7 +38,7 @@ mongoc_bulk_operation_delete (mongoc_bulk_operation_t *bulk,
 
   <section id="seealso">
     <title>See Also</title>
-    <p><code xref="mongoc_bulk_operation_remove_with_opts">mongoc_bulk_operation_remove_with_opts()</code></p>
+    <p><code xref="mongoc_bulk_operation_remove_many_with_opts">mongoc_bulk_operation_remove_many_with_opts()</code></p>
     <p><code xref="mongoc_bulk_operation_remove_one_with_opts">mongoc_bulk_operation_remove_one_with_opts()</code></p>
   </section>
 
diff --git a/doc/mongoc_bulk_operation_delete_one.page b/doc/mongoc_bulk_operation_delete_one.page
@@ -39,7 +39,7 @@ mongoc_bulk_operation_delete_one (mongoc_bulk_operation_t *bulk,
   <section id="seealso">
     <title>See Also</title>
     <p><code xref="mongoc_bulk_operation_remove_one_with_opts">mongoc_bulk_operation_remove_one_with_opts()</code></p>
-    <p><code xref="mongoc_bulk_operation_remove_with_opts">mongoc_bulk_operation_remove_with_opts()</code></p>
+    <p><code xref="mongoc_bulk_operation_remove_many_with_opts">mongoc_bulk_operation_remove_many_with_opts()</code></p>
   </section>
 
   <section id="errors">
diff --git a/doc/mongoc_bulk_operation_remove.page b/doc/mongoc_bulk_operation_remove.page
@@ -31,7 +31,7 @@ mongoc_bulk_operation_remove (mongoc_bulk_operation_t *bulk,
     <title>See Also</title>
     <p><code xref="mongoc_bulk_operation_remove_one">mongoc_bulk_operation_remove_one()</code></p>
     <p><code xref="mongoc_bulk_operation_remove_one_with_opts">mongoc_bulk_operation_remove_one_with_opts()</code></p>
-    <p><code xref="mongoc_bulk_operation_remove_with_opts">mongoc_bulk_operation_remove_with_opts()</code></p>
+    <p><code xref="mongoc_bulk_operation_remove_many_with_opts">mongoc_bulk_operation_remove_many_with_opts()</code></p>
   </section>
 
   <section id="errors">
diff --git a/doc/mongoc_bulk_operation_remove_one.page b/doc/mongoc_bulk_operation_remove_one.page
@@ -30,7 +30,7 @@ mongoc_bulk_operation_remove_one (mongoc_bulk_operation_t *bulk,
   <section id="seealso">
     <title>See Also</title>
     <p><code xref="mongoc_bulk_operation_remove_one_with_opts">mongoc_bulk_operation_remove_one_with_opts()</code></p>
-    <p><code xref="mongoc_bulk_operation_remove_with_opts">mongoc_bulk_operation_remove_with_opts()</code></p>
+    <p><code xref="mongoc_bulk_operation_remove_many_with_opts">mongoc_bulk_operation_remove_many_with_opts()</code></p>
   </section>
 
   <section id="errors">
diff --git a/doc/mongoc_bulk_operation_remove_one_with_opts.page b/doc/mongoc_bulk_operation_remove_one_with_opts.page
@@ -34,7 +34,7 @@ mongoc_bulk_operation_remove_one_with_opts (mongoc_bulk_operation_t       *bulk,
   <section id="seealso">
     <title>See Also</title>
     <p><code xref="mongoc_bulk_operation_remove_one">mongoc_bulk_operation_remove_one()</code></p>
-    <p><code xref="mongoc_bulk_operation_remove_with_opts">mongoc_bulk_operation_remove_with_opts()</code></p>
+    <p><code xref="mongoc_bulk_operation_remove_many_with_opts">mongoc_bulk_operation_remove_many_with_opts()</code></p>
   </section>
 
   <section id="errors">
diff --git a/doc/mongoc_bulk_operation_remove_with_opts.page b/doc/mongoc_bulk_operation_remove_with_opts.page
@@ -4,19 +4,19 @@
       style="function"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/"
-      id="mongoc_bulk_operation_remove_with_opts">
+      id="mongoc_bulk_operation_remove_many_with_opts">
   <info>
     <link type="guide" xref="mongoc_bulk_operation_t" group="function"/>
   </info>
-  <title>mongoc_bulk_operation_remove_with_opts()</title>
+  <title>mongoc_bulk_operation_remove_many_with_opts()</title>
 
   <section id="synopsis">
     <title>Synopsis</title>
     <synopsis><code mime="text/x-csrc"><![CDATA[bool
-mongoc_bulk_operation_remove_with_opts (mongoc_bulk_operation_t       *bulk,
-                                        const bson_t                  *selector,
-                                        const bson_t                  *opts,
-                                        bson_error_t                  *error); /* OUT */
+mongoc_bulk_operation_remove_many_with_opts (mongoc_bulk_operation_t       *bulk,
+                                             const bson_t                  *selector,
+                                             const bson_t                  *opts,
+                                             bson_error_t                  *error); /* OUT */
 ]]></code></synopsis>
     <p>Delete documents as part of a bulk operation. This only queues the operation. To execute it, call <code xref="mongoc_bulk_operation_execute">mongoc_bulk_operation_execute()</code>.</p>
   </section>
diff --git a/doc/mongoc_bulk_operation_replace_one_with_opts.page b/doc/mongoc_bulk_operation_replace_one_with_opts.page
@@ -39,7 +39,7 @@ mongoc_bulk_operation_replace_one_with_opts (mongoc_bulk_operation_t       *bulk
 
   <section id="seealso">
     <title>See Also</title>
-    <p><code xref="mongoc_bulk_operation_remove_with_opts">mongoc_bulk_operation_remove_with_opts()</code></p>
+    <p><code xref="mongoc_bulk_operation_remove_many_with_opts">mongoc_bulk_operation_remove_many_with_opts()</code></p>
     <p><code xref="mongoc_bulk_operation_insert_with_opts">mongoc_bulk_operation_insert_with_opts()</code></p>
   </section>
 
diff --git a/doc/mongoc_bulk_operation_update.page b/doc/mongoc_bulk_operation_update.page
@@ -36,7 +36,7 @@ mongoc_bulk_operation_update (mongoc_bulk_operation_t *bulk,
   <section id="seealso">
     <title>See Also</title>
     <p><code xref="mongoc_bulk_operation_update_one">mongoc_bulk_operation_update_one()</code></p>
-    <p><code xref="mongoc_bulk_operation_update_with_opts">mongoc_bulk_operation_update_with_opts()</code></p>
+    <p><code xref="mongoc_bulk_operation_update_many_with_opts">mongoc_bulk_operation_update_many_with_opts()</code></p>
   </section>
 
   <section id="errors">
diff --git a/doc/mongoc_bulk_operation_update_one_with_opts.page b/doc/mongoc_bulk_operation_update_one_with_opts.page
@@ -39,7 +39,7 @@ mongoc_bulk_operation_update_one_with_opts (mongoc_bulk_operation_t       *bulk,
 
   <section id="seealso">
     <title>See Also</title>
-    <p><code xref="mongoc_bulk_operation_update">mongoc_bulk_operation_update_with_opts()</code></p>
+    <p><code xref="mongoc_bulk_operation_update">mongoc_bulk_operation_update_many_with_opts()</code></p>
   </section>
 
   <section id="errors">
diff --git a/doc/mongoc_bulk_operation_update_with_opts.page b/doc/mongoc_bulk_operation_update_with_opts.page
@@ -4,21 +4,21 @@
       style="function"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/"
-      id="mongoc_bulk_operation_update_with_opts">
+      id="mongoc_bulk_operation_update_many_with_opts">
 
   <info>
     <link type="guide" xref="mongoc_bulk_operation_t" group="function"/>
   </info>
-  <title>mongoc_bulk_operation_update_with_opts()</title>
+  <title>mongoc_bulk_operation_update_many_with_opts()</title>
 
   <section id="synopsis">
     <title>Synopsis</title>
     <synopsis><code mime="text/x-csrc"><![CDATA[bool
-mongoc_bulk_operation_update_with_opts (mongoc_bulk_operation_t       *bulk,
-                                        const bson_t                  *selector,
-                                        const bson_t                  *document,
-                                        const bson_t                  *opts,
-                                        bson_error_t                  *error); /* OUT */
+mongoc_bulk_operation_update_many_with_opts (mongoc_bulk_operation_t       *bulk,
+                                             const bson_t                  *selector,
+                                             const bson_t                  *document,
+                                             const bson_t                  *opts,
+                                             bson_error_t                  *error); /* OUT */
 ]]></code></synopsis>
     <p>This function queues an update as part of a bulk operation. This does not execute the operation. To execute the entirety of the bulk operation call <code xref="mongoc_bulk_operation_execute">mongoc_bulk_operation_execute()</code>.</p>
     <note style="warning"><p><code>document</code> MUST only contain fields whose key starts with <code>$</code>. See the update document specification for more details.</p></note>
diff --git a/examples/bulk/bulk2.c b/examples/bulk/bulk2.c
@@ -33,15 +33,15 @@ bulk2 (mongoc_collection_t *collection)
    /* {_id: 1} => {$set: {foo: "bar"}} */
    query = BCON_NEW ("_id", BCON_INT32 (1));
    doc = BCON_NEW ("$set", "{", "foo", BCON_UTF8 ("bar"), "}");
-   mongoc_bulk_operation_update_with_opts (bulk, query, doc, NULL, &error);
+   mongoc_bulk_operation_update_many_with_opts (bulk, query, doc, NULL, &error);
    bson_destroy (query);
    bson_destroy (doc);
 
    /* {_id: 4} => {'$inc': {'j': 1}} (upsert) */
    opts = BCON_NEW ("upsert", BCON_BOOL (true));
    query = BCON_NEW ("_id", BCON_INT32 (4));
    doc = BCON_NEW ("$inc", "{", "j", BCON_INT32 (1), "}");
-   mongoc_bulk_operation_update_with_opts (bulk, query, doc, opts, &error);
+   mongoc_bulk_operation_update_many_with_opts (bulk, query, doc, opts, &error);
    bson_destroy (query);
    bson_destroy (doc);
    bson_destroy (opts);
diff --git a/src/mongoc/mongoc-bulk-operation.c b/src/mongoc/mongoc-bulk-operation.c
@@ -127,7 +127,7 @@ mongoc_bulk_operation_remove (mongoc_bulk_operation_t *bulk,     /* IN */
    bson_init (&opts);
    BSON_APPEND_INT32 (&opts, "limit", 0);
 
-   mongoc_bulk_operation_remove_with_opts (bulk, selector, &opts, &error);
+   mongoc_bulk_operation_remove_many_with_opts (bulk, selector, &opts, &error);
    bson_destroy (&opts);
 }
 
@@ -142,7 +142,7 @@ mongoc_bulk_operation_remove_one (mongoc_bulk_operation_t *bulk,     /* IN */
    bson_init (&opts);
    BSON_APPEND_INT32 (&opts, "limit", 1);
 
-   mongoc_bulk_operation_remove_with_opts (bulk, selector, &opts, &error);
+   mongoc_bulk_operation_remove_many_with_opts (bulk, selector, &opts, &error);
    bson_destroy (&opts);
 }
 
@@ -167,25 +167,25 @@ mongoc_bulk_operation_remove_one_with_opts  (mongoc_bulk_operation_t       *bulk
          return false;
       }
 
-      return mongoc_bulk_operation_remove_with_opts (bulk, selector, opts, error);
+      return mongoc_bulk_operation_remove_many_with_opts (bulk, selector, opts, error);
    }
 
    bson_init (&opts_dup);
    BSON_APPEND_INT32 (&opts_dup, "limit", 1);
    if (opts) {
       bson_concat (&opts_dup, opts);
    }
-   retval = mongoc_bulk_operation_remove_with_opts (bulk, selector, &opts_dup, error);
+   retval = mongoc_bulk_operation_remove_many_with_opts (bulk, selector, &opts_dup, error);
    bson_destroy (&opts_dup);
 
    return retval;
 }
 
 bool
-mongoc_bulk_operation_remove_with_opts (mongoc_bulk_operation_t       *bulk,
-                                        const bson_t                  *selector,
-                                        const bson_t                  *opts,
-                                        bson_error_t                  *error) /* OUT */
+mongoc_bulk_operation_remove_many_with_opts (mongoc_bulk_operation_t       *bulk,
+                                             const bson_t                  *selector,
+                                             const bson_t                  *opts,
+                                             bson_error_t                  *error) /* OUT */
 {
    mongoc_write_command_t command = { 0 };
    mongoc_write_command_t *last;
@@ -346,7 +346,7 @@ mongoc_bulk_operation_update (mongoc_bulk_operation_t *bulk,
    BSON_APPEND_BOOL (&opts, "upsert", upsert);
    BSON_APPEND_BOOL (&opts, "multi", true);
 
-   mongoc_bulk_operation_update_with_opts (bulk, selector, document, &opts, &error);
+   mongoc_bulk_operation_update_many_with_opts (bulk, selector, document, &opts, &error);
    bson_destroy (&opts);
 
    if (error.domain) {
@@ -367,7 +367,7 @@ mongoc_bulk_operation_update_one (mongoc_bulk_operation_t *bulk,
    BSON_APPEND_BOOL (&opts, "upsert", upsert);
    BSON_APPEND_BOOL (&opts, "multi", false);
 
-   mongoc_bulk_operation_update_with_opts (bulk, selector, document, &opts, &error);
+   mongoc_bulk_operation_update_many_with_opts (bulk, selector, document, &opts, &error);
    bson_destroy (&opts);
 
    if (error.domain) {
@@ -397,26 +397,26 @@ mongoc_bulk_operation_update_one_with_opts (mongoc_bulk_operation_t *bulk,
          return false;
       }
 
-      return mongoc_bulk_operation_update_with_opts (bulk, selector, document, opts, error);
+      return mongoc_bulk_operation_update_many_with_opts (bulk, selector, document, opts, error);
    }
 
    bson_init (&opts_dup);
    BSON_APPEND_BOOL (&opts_dup, "multi", false);
    if (opts) {
       bson_concat (&opts_dup, opts);
    }
-   retval = mongoc_bulk_operation_update_with_opts (bulk, selector, document, &opts_dup, error);
+   retval = mongoc_bulk_operation_update_many_with_opts (bulk, selector, document, &opts_dup, error);
    bson_destroy (&opts_dup);
 
    return retval;
 }
 
 bool
-mongoc_bulk_operation_update_with_opts (mongoc_bulk_operation_t       *bulk,
-                                        const bson_t                  *selector,
-                                        const bson_t                  *document,
-                                        const bson_t                  *opts,
-                                        bson_error_t                  *error) /* OUT */
+mongoc_bulk_operation_update_many_with_opts (mongoc_bulk_operation_t       *bulk,
+                                             const bson_t                  *selector,
+                                             const bson_t                  *document,
+                                             const bson_t                  *opts,
+                                             bson_error_t                  *error) /* OUT */
 {
    mongoc_write_command_t command = { 0 };
    bson_iter_t iter;
diff --git a/src/mongoc/mongoc-bulk-operation.h b/src/mongoc/mongoc-bulk-operation.h
@@ -53,7 +53,7 @@ BSON_API
 void mongoc_bulk_operation_remove                (mongoc_bulk_operation_t       *bulk,
                                                   const bson_t                  *selector);
 BSON_API
-bool mongoc_bulk_operation_remove_with_opts      (mongoc_bulk_operation_t       *bulk,
+bool mongoc_bulk_operation_remove_many_with_opts (mongoc_bulk_operation_t       *bulk,
                                                   const bson_t                  *selector,
                                                   const bson_t                  *opts,
                                                   bson_error_t                  *error); /* OUT */
@@ -82,7 +82,7 @@ void mongoc_bulk_operation_update                (mongoc_bulk_operation_t
                                                   const bson_t                  *document,
                                                   bool                           upsert);
 BSON_API
-bool mongoc_bulk_operation_update_with_opts      (mongoc_bulk_operation_t       *bulk,
+bool mongoc_bulk_operation_update_many_with_opts (mongoc_bulk_operation_t       *bulk,
                                                   const bson_t                  *selector,
                                                   const bson_t                  *document,
                                                   const bson_t                  *opts,
diff --git a/tests/test-bulk.c b/tests/test-bulk.c
@@ -410,7 +410,7 @@ test_bulk_error_unordered (void)
 
    bulk = mongoc_collection_create_bulk_operation (collection, false, NULL);
    for (i=0; i<=2048; i++) {
-      mongoc_bulk_operation_update_with_opts (bulk, tmp_bson ("{'hello': 'earth'}"), tmp_bson ("{'$set': {'hello': 'world'}}"), NULL, &error);
+      mongoc_bulk_operation_update_many_with_opts (bulk, tmp_bson ("{'hello': 'earth'}"), tmp_bson ("{'$set': {'hello': 'world'}}"), NULL, &error);
    }
 
    future = future_bulk_operation_execute (bulk, &reply, &error);
@@ -3170,7 +3170,7 @@ _test_bulk_collation (int w, int wire_version, bulkop op)
    bulk = mongoc_collection_create_bulk_operation (collection, true, wc);
    switch (op) {
       case BULK_REMOVE:
-         mongoc_bulk_operation_remove_with_opts (bulk, tmp_bson ("{'_id': 1}"), opts, &error);
+         mongoc_bulk_operation_remove_many_with_opts (bulk, tmp_bson ("{'_id': 1}"), opts, &error);
          expect = "{'delete': 'test',"
             " 'writeConcern': {'w': %d, 'wtimeout': 100},"
             " 'ordered': true,"
@@ -3200,7 +3200,7 @@ _test_bulk_collation (int w, int wire_version, bulkop op)
          "}";
          break;
       case BULK_UPDATE:
-         mongoc_bulk_operation_update_with_opts (bulk, tmp_bson ("{'_id': 5}"), tmp_bson ("{'$set': {'_id': 6}}"), opts, &error);
+         mongoc_bulk_operation_update_many_with_opts (bulk, tmp_bson ("{'_id': 5}"), tmp_bson ("{'$set': {'_id': 6}}"), opts, &error);
          expect = "{'update': 'test',"
             " 'writeConcern': {'w': %d, 'wtimeout': 100},"
             " 'ordered': true,"
@@ -3293,8 +3293,8 @@ _test_bulk_collation_multi (int w, int wire_version)
    mongoc_write_concern_set_wtimeout (wc, 100);
 
    bulk = mongoc_collection_create_bulk_operation (collection, true, wc);
-   mongoc_bulk_operation_remove_with_opts (bulk, tmp_bson ("{'_id': 1}"), NULL, &error);
-   mongoc_bulk_operation_remove_with_opts (bulk, tmp_bson ("{'_id': 2}"), opts, &error);
+   mongoc_bulk_operation_remove_many_with_opts (bulk, tmp_bson ("{'_id': 1}"), NULL, &error);
+   mongoc_bulk_operation_remove_many_with_opts (bulk, tmp_bson ("{'_id': 2}"), opts, &error);
    future = future_bulk_operation_execute (bulk, &reply, &error);
 
    if (wire_version >= WIRE_VERSION_COLLATION && w) {
