Reorder client.bulkWrite _id

Author: NoahStapp

pymongo/asynchronous/client_bulk.py

@@ -133,7 +133,10 @@ def add_insert(self, namespace: str, document: _DocumentOut) -> None:
         validate_is_document_type("document", document)
         # Generate ObjectId client side.
         if not (isinstance(document, RawBSONDocument) or "_id" in document):
-            document["_id"] = ObjectId()
+            new_document = {"_id": ObjectId()}
+            new_document.update(document)
+            document.clear()
+            document.update(new_document)
         cmd = {"insert": -1, "document": document}
         self.ops.append(("insert", cmd))
         self.namespaces.append(namespace)

pymongo/synchronous/client_bulk.py

@@ -133,7 +133,10 @@ def add_insert(self, namespace: str, document: _DocumentOut) -> None:
         validate_is_document_type("document", document)
         # Generate ObjectId client side.
         if not (isinstance(document, RawBSONDocument) or "_id" in document):
-            document["_id"] = ObjectId()
+            new_document = {"_id": ObjectId()}
+            new_document.update(document)
+            document.clear()
+            document.update(new_document)
         cmd = {"insert": -1, "document": document}
         self.ops.append(("insert", cmd))
         self.namespaces.append(namespace)

test/mockupdb/test_id_ordering.py

@@ -4,8 +4,10 @@
 
 import pytest
 
+from pymongo import InsertOne
+
 try:
-    from mockupdb import MockupDB, OpMsg, going
+    from mockupdb import MockupDB, OpMsg, go, going
 
     _HAVE_MOCKUPDB = True
 except ImportError:
@@ -25,7 +27,7 @@ def test_id_ordering(self):
             isWritablePrimary=True,
             msg="isdbgrid",
             minWireVersion=0,
-            maxWireVersion=20,
+            maxWireVersion=25,
             helloOk=True,
             serviceId=ObjectId(),
         )
@@ -35,6 +37,16 @@ def test_id_ordering(self):
         client = self.simple_client(server.uri, loadBalanced=True)
         collection = client.db.coll
         with going(collection.insert_one, {"x": 1}):
-            request = server.receives(OpMsg({"insert": "coll"}))
+            request = server.receives()
+            self.assertEqual("_id", next(iter(request["documents"][0])))
+            request.reply({"ok": 1})
+
+        with going(collection.bulk_write, [InsertOne({"x1": 1})]):
+            request = server.receives()
             self.assertEqual("_id", next(iter(request["documents"][0])))
             request.reply({"ok": 1})
+
+        with going(client.bulk_write, [InsertOne(namespace="db.coll", document={"x2": 1})]):
+            request = server.receives()
+            self.assertEqual("_id", next(iter(request["ops"][0]["document"])))
+            request.reply({"ok": 1})