PYTHON-4925 Stop sending multi:False and upsert:False

Author: ShaneHarvey

pymongo/asynchronous/bulk.py

@@ -140,18 +140,22 @@ def add_update(
         self,
         selector: Mapping[str, Any],
         update: Union[Mapping[str, Any], _Pipeline],
-        multi: bool = False,
-        upsert: bool = False,
+        multi: bool,
+        upsert: Optional[bool],
         collation: Optional[Mapping[str, Any]] = None,
         array_filters: Optional[list[Mapping[str, Any]]] = None,
         hint: Union[str, dict[str, Any], None] = None,
         sort: Optional[Mapping[str, Any]] = None,
     ) -> None:
         """Create an update document and add it to the list of ops."""
         validate_ok_for_update(update)
-        cmd: dict[str, Any] = dict(  # noqa: C406
-            [("q", selector), ("u", update), ("multi", multi), ("upsert", upsert)]
-        )
+        cmd: dict[str, Any] = {"q": selector, "u": update}
+        if multi:
+            cmd["multi"] = multi
+            # A bulk_write containing an update_many is not retryable.
+            self.is_retryable = False
+        if upsert is not None:
+            cmd["upsert"] = upsert
         if collation is not None:
             self.uses_collation = True
             cmd["collation"] = collation
@@ -164,23 +168,22 @@ def add_update(
         if sort is not None:
             self.uses_sort = True
             cmd["sort"] = sort
-        if multi:
-            # A bulk_write containing an update_many is not retryable.
-            self.is_retryable = False
         self.ops.append((_UPDATE, cmd))
 
     def add_replace(
         self,
         selector: Mapping[str, Any],
         replacement: Mapping[str, Any],
-        upsert: bool = False,
+        upsert: Optional[bool],
         collation: Optional[Mapping[str, Any]] = None,
         hint: Union[str, dict[str, Any], None] = None,
         sort: Optional[Mapping[str, Any]] = None,
     ) -> None:
         """Create a replace document and add it to the list of ops."""
         validate_ok_for_replace(replacement)
-        cmd = {"q": selector, "u": replacement, "multi": False, "upsert": upsert}
+        cmd = {"q": selector, "u": replacement}
+        if upsert is not None:
+            cmd["upsert"] = upsert
         if collation is not None:
             self.uses_collation = True
             cmd["collation"] = collation

pymongo/asynchronous/client_bulk.py

@@ -106,20 +106,13 @@ def __init__(
         self.bypass_doc_val = bypass_document_validation
         self.comment = comment
         self.verbose_results = verbose_results
-
         self.ops: list[tuple[str, Mapping[str, Any]]] = []
         self.namespaces: list[str] = []
         self.idx_offset: int = 0
         self.total_ops: int = 0
-
         self.executed = False
-        self.uses_upsert = False
         self.uses_collation = False
         self.uses_array_filters = False
-        self.uses_hint_update = False
-        self.uses_hint_delete = False
-        self.uses_sort = False
-
         self.is_retryable = self.client.options.retry_writes
         self.retrying = False
         self.started_retryable_write = False
@@ -144,7 +137,7 @@ def add_update(
         namespace: str,
         selector: Mapping[str, Any],
         update: Union[Mapping[str, Any], _Pipeline],
-        multi: bool = False,
+        multi: bool,
         upsert: Optional[bool] = None,
         collation: Optional[Mapping[str, Any]] = None,
         array_filters: Optional[list[Mapping[str, Any]]] = None,
@@ -157,26 +150,23 @@ def add_update(
             "update": -1,
             "filter": selector,
             "updateMods": update,
-            "multi": multi,
         }
+        if multi:
+            # A bulk_write containing an update_many is not retryable.
+            self.is_retryable = False
+            cmd["multi"] = multi
         if upsert is not None:
-            self.uses_upsert = True
             cmd["upsert"] = upsert
         if array_filters is not None:
             self.uses_array_filters = True
             cmd["arrayFilters"] = array_filters
         if hint is not None:
-            self.uses_hint_update = True
             cmd["hint"] = hint
         if collation is not None:
             self.uses_collation = True
             cmd["collation"] = collation
         if sort is not None:
-            self.uses_sort = True
             cmd["sort"] = sort
-        if multi:
-            # A bulk_write containing an update_many is not retryable.
-            self.is_retryable = False
         self.ops.append(("update", cmd))
         self.namespaces.append(namespace)
         self.total_ops += 1
@@ -200,16 +190,13 @@ def add_replace(
             "multi": False,
         }
         if upsert is not None:
-            self.uses_upsert = True
             cmd["upsert"] = upsert
         if hint is not None:
-            self.uses_hint_update = True
             cmd["hint"] = hint
         if collation is not None:
             self.uses_collation = True
             cmd["collation"] = collation
         if sort is not None:
-            self.uses_sort = True
             cmd["sort"] = sort
         self.ops.append(("replace", cmd))
         self.namespaces.append(namespace)
@@ -224,16 +211,16 @@ def add_delete(
         hint: Union[str, dict[str, Any], None] = None,
     ) -> None:
         """Create a delete document and add it to the list of ops."""
-        cmd = {"delete": -1, "filter": selector, "multi": multi}
+        cmd = {"delete": -1, "filter": selector}
+        if multi:
+            cmd["multi"] = multi
+            # A bulk_write containing an update_many is not retryable.
+            self.is_retryable = False
         if hint is not None:
-            self.uses_hint_delete = True
             cmd["hint"] = hint
         if collation is not None:
             self.uses_collation = True
             cmd["collation"] = collation
-        if multi:
-            # A bulk_write containing an update_many is not retryable.
-            self.is_retryable = False
         self.ops.append(("delete", cmd))
         self.namespaces.append(namespace)
         self.total_ops += 1

pymongo/synchronous/bulk.py

@@ -140,18 +140,22 @@ def add_update(
         self,
         selector: Mapping[str, Any],
         update: Union[Mapping[str, Any], _Pipeline],
-        multi: bool = False,
-        upsert: bool = False,
+        multi: bool,
+        upsert: Optional[bool],
         collation: Optional[Mapping[str, Any]] = None,
         array_filters: Optional[list[Mapping[str, Any]]] = None,
         hint: Union[str, dict[str, Any], None] = None,
         sort: Optional[Mapping[str, Any]] = None,
     ) -> None:
         """Create an update document and add it to the list of ops."""
         validate_ok_for_update(update)
-        cmd: dict[str, Any] = dict(  # noqa: C406
-            [("q", selector), ("u", update), ("multi", multi), ("upsert", upsert)]
-        )
+        cmd: dict[str, Any] = {"q": selector, "u": update}
+        if multi:
+            cmd["multi"] = multi
+            # A bulk_write containing an update_many is not retryable.
+            self.is_retryable = False
+        if upsert is not None:
+            cmd["upsert"] = upsert
         if collation is not None:
             self.uses_collation = True
             cmd["collation"] = collation
@@ -164,23 +168,22 @@ def add_update(
         if sort is not None:
             self.uses_sort = True
             cmd["sort"] = sort
-        if multi:
-            # A bulk_write containing an update_many is not retryable.
-            self.is_retryable = False
         self.ops.append((_UPDATE, cmd))
 
     def add_replace(
         self,
         selector: Mapping[str, Any],
         replacement: Mapping[str, Any],
-        upsert: bool = False,
+        upsert: Optional[bool],
         collation: Optional[Mapping[str, Any]] = None,
         hint: Union[str, dict[str, Any], None] = None,
         sort: Optional[Mapping[str, Any]] = None,
     ) -> None:
         """Create a replace document and add it to the list of ops."""
         validate_ok_for_replace(replacement)
-        cmd = {"q": selector, "u": replacement, "multi": False, "upsert": upsert}
+        cmd = {"q": selector, "u": replacement}
+        if upsert is not None:
+            cmd["upsert"] = upsert
         if collation is not None:
             self.uses_collation = True
             cmd["collation"] = collation

pymongo/synchronous/client_bulk.py

@@ -106,20 +106,13 @@ def __init__(
         self.bypass_doc_val = bypass_document_validation
         self.comment = comment
         self.verbose_results = verbose_results
-
         self.ops: list[tuple[str, Mapping[str, Any]]] = []
         self.namespaces: list[str] = []
         self.idx_offset: int = 0
         self.total_ops: int = 0
-
         self.executed = False
-        self.uses_upsert = False
         self.uses_collation = False
         self.uses_array_filters = False
-        self.uses_hint_update = False
-        self.uses_hint_delete = False
-        self.uses_sort = False
-
         self.is_retryable = self.client.options.retry_writes
         self.retrying = False
         self.started_retryable_write = False
@@ -144,7 +137,7 @@ def add_update(
         namespace: str,
         selector: Mapping[str, Any],
         update: Union[Mapping[str, Any], _Pipeline],
-        multi: bool = False,
+        multi: bool,
         upsert: Optional[bool] = None,
         collation: Optional[Mapping[str, Any]] = None,
         array_filters: Optional[list[Mapping[str, Any]]] = None,
@@ -157,26 +150,23 @@ def add_update(
             "update": -1,
             "filter": selector,
             "updateMods": update,
-            "multi": multi,
         }
+        if multi:
+            # A bulk_write containing an update_many is not retryable.
+            self.is_retryable = False
+            cmd["multi"] = multi
         if upsert is not None:
-            self.uses_upsert = True
             cmd["upsert"] = upsert
         if array_filters is not None:
             self.uses_array_filters = True
             cmd["arrayFilters"] = array_filters
         if hint is not None:
-            self.uses_hint_update = True
             cmd["hint"] = hint
         if collation is not None:
             self.uses_collation = True
             cmd["collation"] = collation
         if sort is not None:
-            self.uses_sort = True
             cmd["sort"] = sort
-        if multi:
-            # A bulk_write containing an update_many is not retryable.
-            self.is_retryable = False
         self.ops.append(("update", cmd))
         self.namespaces.append(namespace)
         self.total_ops += 1
@@ -200,16 +190,13 @@ def add_replace(
             "multi": False,
         }
         if upsert is not None:
-            self.uses_upsert = True
             cmd["upsert"] = upsert
         if hint is not None:
-            self.uses_hint_update = True
             cmd["hint"] = hint
         if collation is not None:
             self.uses_collation = True
             cmd["collation"] = collation
         if sort is not None:
-            self.uses_sort = True
             cmd["sort"] = sort
         self.ops.append(("replace", cmd))
         self.namespaces.append(namespace)
@@ -224,16 +211,16 @@ def add_delete(
         hint: Union[str, dict[str, Any], None] = None,
     ) -> None:
         """Create a delete document and add it to the list of ops."""
-        cmd = {"delete": -1, "filter": selector, "multi": multi}
+        cmd = {"delete": -1, "filter": selector}
+        if multi:
+            cmd["multi"] = multi
+            # A bulk_write containing an update_many is not retryable.
+            self.is_retryable = False
         if hint is not None:
-            self.uses_hint_delete = True
             cmd["hint"] = hint
         if collation is not None:
             self.uses_collation = True
             cmd["collation"] = collation
-        if multi:
-            # A bulk_write containing an update_many is not retryable.
-            self.is_retryable = False
         self.ops.append(("delete", cmd))
         self.namespaces.append(namespace)
         self.total_ops += 1