Prohibit bypass_document_validation with w=0

Author: aherlihy

pymongo/bulk.py

@@ -314,6 +314,10 @@ def execute_command(self, sock_info, generator, write_concern):
  def execute_no_results(self, sock_info, generator):
  """Execute all operations, returning no results (w=0).
  """
+ # Cannot have both unacknowledged write and bypass document validation.
+ if self.bypass_doc_val and sock_info.max_wire_version >= 4:
+ raise OperationFailure("Cannot set bypass_document_validation with"
+ " unacknowledged write concern")
  coll = self.collection
  # If ordered is True we have to send GLE or use write
  # commands so we can abort on the first error.

pymongo/collection.py

@@ -433,9 +433,14 @@ def bulk_write(self, requests, ordered=True,
  return BulkWriteResult(bulk_api_result, True)
  return BulkWriteResult({}, False)
 
- def _legacy_write(
- self, sock_info, name, cmd, acknowledged, op_id, func, *args):
+ def _legacy_write(self, sock_info, name, cmd, acknowledged, op_id,
+  bypass_doc_val, func, *args):
  """Internal legacy write helper."""
+ # Cannot have both unacknowledged write and bypass document validation.
+ if (bypass_doc_val and not acknowledged and
+ sock_info.max_wire_version >= 4):
+ raise OperationFailure("Cannot set bypass_document_validation with"
+ " unacknowledged write concern")
  listeners = self.database.client._event_listeners
  publish = listeners.enabled_for_commands
 
@@ -509,8 +514,8 @@ def _insert_one(
  # Legacy OP_INSERT.
  self._legacy_write(
  sock_info, 'insert', command, acknowledged, op_id,
- message.insert, self.__full_name, [doc], check_keys,
- acknowledged, concern, False, self.codec_options)
+ bypass_doc_val, message.insert, self.__full_name, [doc],
+ check_keys, acknowledged, concern, False, self.codec_options)
  return doc.get('_id')
 
  def _insert(self, sock_info, docs, ordered=True, check_keys=True,
@@ -713,8 +718,9 @@ def _update(self, sock_info, criteria, document, upsert=False,
  # Legacy OP_UPDATE.
  return self._legacy_write(
  sock_info, 'update', command, acknowledged, op_id,
- message.update, self.__full_name, upsert, multi, criteria,
- document, acknowledged, concern, check_keys, self.codec_options)
+ bypass_doc_val, message.update, self.__full_name, upsert,
+ multi, criteria, document, acknowledged, concern, check_keys,
+ self.codec_options)
 
  def replace_one(self, filter, replacement, upsert=False,
  bypass_document_validation=False):
@@ -909,8 +915,8 @@ def _delete(
  # Legacy OP_DELETE.
  return self._legacy_write(
  sock_info, 'delete', command, acknowledged, op_id,
- message.delete, self.__full_name, criteria, acknowledged,
- concern, self.codec_options, int(not multi))
+ False, message.delete, self.__full_name, criteria,
+ acknowledged, concern, self.codec_options, int(not multi))
 
  def delete_one(self, filter):
  """Delete a single document matching the filter.

test/test_collection.py

@@ -757,6 +757,8 @@ def test_insert_bypass_document_validation(self):
  db = self.db
  db.test.drop()
  db.create_collection("test", validator={"a": {"$exists": True}})
+ db_w0 = self.db.client.get_database(
+ self.db.name, write_concern=WriteConcern(w=0))
 
  # Test insert_one
  self.assertRaises(OperationFailure, db.test.insert_one,
@@ -769,6 +771,9 @@ def test_insert_bypass_document_validation(self):
  self.assertTrue(isinstance(result, InsertOneResult))
  self.assertEqual(2, result.inserted_id)
 
+ self.assertRaises(OperationFailure, db_w0.test.insert_one,
+ {"x": 1}, bypass_document_validation=True)
+
  # Test insert_many
  docs = [{"_id": i, "x": 100 - i} for i in range(3, 100)]
  self.assertRaises(OperationFailure, db.test.insert_many, docs)
@@ -792,12 +797,18 @@ def test_insert_bypass_document_validation(self):
  self.assertEqual(1, db.test.count({"a": doc["a"]}))
  self.assertTrue(result.acknowledged)
 
+ self.assertRaises(OperationFailure, db_w0.test.insert_many,
+ [{"x": 1}, {"x": 2}],
+ bypass_document_validation=True)
+
  @client_context.require_version_min(3, 1, 9, -1)
  @client_context.require_no_auth
  def test_replace_bypass_document_validation(self):
  db = self.db
  db.test.drop()
  db.create_collection("test", validator={"a": {"$exists": True}})
+ db_w0 = self.db.client.get_database(
+ self.db.name, write_concern=WriteConcern(w=0))
 
  # Test replace_one
  db.test.insert_one({"a": 101})
@@ -828,6 +839,9 @@ def test_replace_bypass_document_validation(self):
  self.assertEqual(0, db.test.count({"x": 101}))
  self.assertEqual(1, db.test.count({"a": 103}))
 
+ self.assertRaises(OperationFailure, db_w0.test.replace_one, {"y": 1},
+ {"x": 1}, bypass_document_validation=True)
+
  @client_context.require_version_min(3, 1, 9, -1)
  @client_context.require_no_auth
  def test_update_bypass_document_validation(self):
@@ -836,6 +850,8 @@ def test_update_bypass_document_validation(self):
  db.test.insert_one({"z": 5})
  db.command(SON([("collMod", "test"),
  ("validator", {"z": {"$gte": 0}})]))
+ db_w0 = self.db.client.get_database(
+ self.db.name, write_concern=WriteConcern(w=0))
 
  # Test update_one
  self.assertRaises(OperationFailure, db.test.update_one,
@@ -866,6 +882,9 @@ def test_update_bypass_document_validation(self):
  self.assertEqual(0, db.test.count({"z": -9}))
  self.assertEqual(1, db.test.count({"z": 0}))
 
+ self.assertRaises(OperationFailure, db_w0.test.update_one, {"y": 1},
+ {"$inc": {"x": 1}}, bypass_document_validation=True)
+
  # Test update_many
  db.test.insert_many([{"z": i} for i in range(3, 101)])
  db.test.insert_one({"y": 0},
@@ -899,12 +918,18 @@ def test_update_bypass_document_validation(self):
  self.assertEqual(150, db.test.count({"z": {"$gte": 0}}))
  self.assertEqual(0, db.test.count({"z": {"$lt": 0}}))
 
+ self.assertRaises(OperationFailure, db_w0.test.update_many, {"y": 1},
+ {"$inc": {"x": 1}}, bypass_document_validation=True)
+
  @client_context.require_version_min(3, 1, 9, -1)
  @client_context.require_no_auth
  def test_bypass_document_validation_bulk_write(self):
  db = self.db
  db.test.drop()
  db.create_collection("test", validator={"a": {"$gte": 0}})
+ db_w0 = self.db.client.get_database(
+ self.db.name, write_concern=WriteConcern(w=0))
+
  ops = [InsertOne({"a": -10}),
  InsertOne({"a": -11}),
  InsertOne({"a": -12}),
@@ -922,6 +947,9 @@ def test_bypass_document_validation_bulk_write(self):
  for op in ops:
  self.assertRaises(BulkWriteError, db.test.bulk_write, [op])
 
+ self.assertRaises(OperationFailure, db_w0.test.bulk_write, ops,
+ bypass_document_validation=True)
+
  def test_find_by_default_dct(self):
  db = self.db
  db.test.insert_one({'foo': 'bar'})