Skip to content

PYTHON-4915 - Add guidance on adding _id fields to documents to CRUD spec, reorder client.bulk_write generated _id fields #1976

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
Nov 12, 2024
Merged

PYTHON-4915 - Add guidance on adding _id fields to documents to CRUD spec, reorder client.bulk_write generated _id fields #1976

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
8906e84
PYTHON-4915 - Add guidance on adding _id fields to documents to CRUD …
NoahStapp Oct 28, 2024
425cd1b
Reorder client.bulkWrite _id
NoahStapp Oct 29, 2024
1b3df52
Use ChainMap
NoahStapp Oct 30, 2024
36187bb
Add license
NoahStapp Oct 30, 2024
0e07e18
Unwrap ChainMaps during logging
NoahStapp Oct 30, 2024
13568b1
Move re-order logic for client bulkWrite into _client_batched_op_msg_…
NoahStapp Oct 31, 2024
da83afc
Isolate ChainMap + add RawBSONDocument not inflated test
NoahStapp Oct 31, 2024
8894f23
typing fixes
NoahStapp Oct 31, 2024
b2dede3
Cleanup
NoahStapp Nov 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion pymongo/_client_bulk_shared.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"""Constants, types, and classes shared across Client Bulk Write API implementations."""
from __future__ import annotations

from typing import TYPE_CHECKING, Any, Mapping, MutableMapping, NoReturn
from typing import TYPE_CHECKING, Any, ChainMap, Mapping, MutableMapping, NoReturn
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should be from collections import ChainMap


from pymongo.errors import ClientBulkWriteException, OperationFailure
from pymongo.helpers_shared import _get_wce_doc
Expand Down Expand Up @@ -63,6 +63,10 @@ def _throw_client_bulk_write_exception(
"""Raise a ClientBulkWriteException from the full result."""
# retryWrites on MMAPv1 should raise an actionable error.
if full_result["writeErrors"]:
# Unpack ChainMaps into the original document only
for doc in full_result["writeErrors"]:
if "document" in doc["op"] and isinstance(doc["op"]["document"], ChainMap):
doc["op"]["document"] = doc["op"]["document"].maps[0]
full_result["writeErrors"].sort(key=lambda error: error["idx"])
err = full_result["writeErrors"][0]
code = err["code"]
Expand Down
14 changes: 10 additions & 4 deletions pymongo/asynchronous/client_bulk.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,10 +133,16 @@ def add_insert(self, namespace: str, document: _DocumentOut) -> None:
"""Add an insert document to the list of ops."""
validate_is_document_type("document", document)
# Generate ObjectId client side.
if not (isinstance(document, RawBSONDocument) or "_id" in document):
document = ChainMap(document, {"_id": ObjectId()})
elif not isinstance(document, RawBSONDocument) and "_id" in document:
document = ChainMap(document, {"_id": document["_id"]})
if not isinstance(document, RawBSONDocument):
# Since the data document itself is nested within the insert document
# it won't be automatically re-ordered by the BSON conversion.
# We use ChainMap here to make the _id field the first field instead.
if "_id" in document:
document = ChainMap(document, {"_id": document["_id"]})
else:
id = ObjectId()
document["_id"] = id
document = ChainMap(document, {"_id": id})
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I just realized this but what do you think about pushing this id-reordering logic down into _client_batched_op_msg_impl? That way we don't need to expose ChainMap anywhere and we don't need to unwrap it either.

        # Encode current operation doc and, if newly added, namespace doc.
        if real_op_type == "insert":
           op_doc = ... # ChainMap stuff
        op_doc_encoded = _dict_to_bson(op_doc, False, opts)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We'd still need to unwrap it, even with this change:

# Started events
[{'bulkWrite': 1, 'errorsOnly': True, 'ordered': False, 'lsid': {'id': Binary(b'\xa3\xc7\x80\xdd\x07\x98L\x13\x81\xb8\xbcY\xe8\xa0\x04\xf3', 4)}, '$db': 'admin', 'ops': [{'insert': 0, 'document': ChainMap({'foo': 'bar', '_id': 5}, {'_id': 5})}, {'insert': 1, 'document': ChainMap({'foo': 'bar', '_id': 6}, {'_id': 6})}, {'insert': 0, 'document': ChainMap({'foo': 'bar', '_id': 5}, {'_id': 5})}, {'insert': 1, 'document': ChainMap({'foo': 'bar', '_id': 7}, {'_id': 7})}, {'delete': 0, 'filter': {'foo': 'bar', '_id': 5}, 'multi': False}], 'nsInfo': [{'ns': 'db.test_five'}, {'ns': 'db.test_six'}]}]

# Bulk write error
batch op errors occurred, full error: {'anySuccessful': True, 'error': None, 'writeErrors': [{'ok': 0.0, 'idx': 1, 'code': 11000, 'errmsg': 'E11000 duplicate key error collection: db.test_six index: _id_ dup key: { _id: 6 }', 'keyPattern': {'_id': 1}, 'keyValue': {'_id': 6}, 'n': 0, 'op': {'insert': 1, 'document': ChainMap({'foo': 'bar', '_id': 6}, {'_id': 6})}}, {'ok': 0.0, 'idx': 2, 'code': 11000, 'errmsg': 'E11000 duplicate key error collection: db.test_five index: _id_ dup key: { _id: 5 }', 'keyPattern': {'_id': 1}, 'keyValue': {'_id': 5}, 'n': 0, 'op': {'insert': 0, 'document': ChainMap({'foo': 'bar', '_id': 5}, {'_id': 5})}}, {'ok': 0.0, 'idx': 3, 'code': 11000, 'errmsg': 'E11000 duplicate key error collection: db.test_six index: _id_ dup key: { _id: 7 }', 'keyPattern': {'_id': 1}, 'keyValue': {'_id': 7}, 'n': 0, 'op': {'insert': 1, 'document': ChainMap({'foo': 'bar', '_id': 7}, {'_id': 7})}}], 'writeConcernErrors': [], 'nInserted': 1, 'nUpserted': 0, 'nMatched': 0, 'nModified': 0, 'nDeleted': 1, 'insertResults': {}, 'updateResults': {}, 'deleteResults': {}}

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I still like moving the ChainMap logic into _client_batched_op_msg_impl to make how we add _id fields consistent across insert methods.

cmd = {"insert": -1, "document": document}
self.ops.append(("insert", cmd))
self.namespaces.append(namespace)
Expand Down
7 changes: 6 additions & 1 deletion pymongo/monitoring.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ def connection_checked_in(self, event):

import datetime
from collections import abc, namedtuple
from typing import TYPE_CHECKING, Any, Mapping, Optional, Sequence
from typing import TYPE_CHECKING, Any, ChainMap, Mapping, Optional, Sequence
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

from collections import ChainMap


from bson.objectid import ObjectId
from pymongo.hello import Hello, HelloCompat
Expand Down Expand Up @@ -625,6 +625,11 @@ def __init__(
raise ValueError(f"{command!r} is not a valid command")
# Command name must be first key.
command_name = next(iter(command))
# Unpack ChainMaps into the original document only
if command_name == "bulkWrite" and "ops" in command:
for doc in command["ops"]:
if "document" in doc and isinstance(doc["document"], ChainMap):
doc["document"] = doc["document"].maps[0]
super().__init__(
command_name,
request_id,
Expand Down
14 changes: 10 additions & 4 deletions pymongo/synchronous/client_bulk.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,10 +133,16 @@ def add_insert(self, namespace: str, document: _DocumentOut) -> None:
"""Add an insert document to the list of ops."""
validate_is_document_type("document", document)
# Generate ObjectId client side.
if not (isinstance(document, RawBSONDocument) or "_id" in document):
document = ChainMap(document, {"_id": ObjectId()})
elif not isinstance(document, RawBSONDocument) and "_id" in document:
document = ChainMap(document, {"_id": document["_id"]})
if not isinstance(document, RawBSONDocument):
# Since the data document itself is nested within the insert document
# it won't be automatically re-ordered by the BSON conversion.
# We use ChainMap here to make the _id field the first field instead.
if "_id" in document:
document = ChainMap(document, {"_id": document["_id"]})
else:
id = ObjectId()
document["_id"] = id
document = ChainMap(document, {"_id": id})
cmd = {"insert": -1, "document": document}
self.ops.append(("insert", cmd))
self.namespaces.append(namespace)
Expand Down
15 changes: 12 additions & 3 deletions test/mockupdb/test_id_ordering.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,22 +48,31 @@ def test_id_ordering(self):
server.run()
self.addCleanup(server.stop)

# We also verify that the original document contains an _id field after each insert
document = {"x": 1}

client = self.simple_client(server.uri, loadBalanced=True)
collection = client.db.coll
with going(collection.insert_one, {"x": 1}):
with going(collection.insert_one, document):
request = server.receives()
self.assertEqual("_id", next(iter(request["documents"][0])))
request.reply({"ok": 1})
self.assertIn("_id", document)

document = {"x1": 1}

with going(collection.bulk_write, [InsertOne({"x1": 1})]):
with going(collection.bulk_write, [InsertOne(document)]):
request = server.receives()
self.assertEqual("_id", next(iter(request["documents"][0])))
request.reply({"ok": 1})
self.assertIn("_id", document)

with going(client.bulk_write, [InsertOne(namespace="db.coll", document={"x2": 1})]):
document = {"x2": 1}
with going(client.bulk_write, [InsertOne(namespace="db.coll", document=document)]):
request = server.receives()
self.assertEqual("_id", next(iter(request["ops"][0]["document"])))
request.reply({"ok": 1})
self.assertIn("_id", document)

# Re-ordering user-supplied _id fields is not required by the spec, but PyMongo does it for performance reasons
with going(collection.insert_one, {"x": 1, "_id": 111}):
Expand Down
Loading