PYTHON-1413 - Restrict when we add readConcern

Author: behackett

pymongo/collection.py

@@ -43,7 +43,6 @@
  _raise_last_error)
 from pymongo.message import _UNICODE_REPLACE_CODEC_OPTIONS
 from pymongo.operations import IndexModel
-from pymongo.read_concern import DEFAULT_READ_CONCERN
 from pymongo.read_preferences import ReadPreference
 from pymongo.results import (BulkWriteResult,
  DeleteResult,
@@ -196,7 +195,7 @@ def _socket_for_writes(self):
  def _command(self, sock_info, command, slave_ok=False,
  read_preference=None,
  codec_options=None, check=True, allowable_errors=None,
- read_concern=DEFAULT_READ_CONCERN,
+ read_concern=None,
  write_concern=None,
  parse_write_concern_error=False,
  collation=None,
@@ -2073,7 +2072,7 @@ def _aggregate(self, pipeline, cursor_class, first_batch_size, session,
  and not dollar_out):
  read_concern = self.read_concern
  else:
- read_concern = DEFAULT_READ_CONCERN
+ read_concern = None
 
  # Avoid auto-injecting a session: aggregate() passes a session,
  # aggregate_raw_batches() passes none.

pymongo/network.py

@@ -42,7 +42,6 @@
  OperationFailure,
  ProtocolError)
 from pymongo.message import _OpReply
-from pymongo.read_concern import DEFAULT_READ_CONCERN
 
 
 _UNPACK_HEADER = struct.Struct("<iiii").unpack
@@ -52,7 +51,7 @@ def command(sock, dbname, spec, slave_ok, is_mongos,
  read_preference, codec_options, session, client, check=True,
  allowable_errors=None, address=None,
  check_keys=False, listeners=None, max_bson_size=None,
- read_concern=DEFAULT_READ_CONCERN,
+ read_concern=None,
  parse_write_concern_error=False,
  collation=None, retryable_write=False):
  """Execute a command over the socket, or raise socket.error.
@@ -96,12 +95,13 @@ def command(sock, dbname, spec, slave_ok, is_mongos,
  orig = spec
  if is_mongos:
  spec = message._maybe_add_read_preference(spec, read_preference)
- if read_concern.level:
- spec['readConcern'] = read_concern.document
- if (session and session.options.causal_consistency
- and session.operation_time is not None):
- spec.setdefault(
- 'readConcern', {})['afterClusterTime'] = session.operation_time
+ if read_concern:
+ if read_concern.level:
+ spec['readConcern'] = read_concern.document
+ if (session and session.options.causal_consistency
+ and session.operation_time is not None):
+ spec.setdefault(
+ 'readConcern', {})['afterClusterTime'] = session.operation_time
  if collation is not None:
  spec['collation'] = collation
 

pymongo/pool.py

@@ -47,7 +47,6 @@ class SSLError(socket.error):
 from pymongo.network import (command,
  receive_message,
  SocketChecker)
-from pymongo.read_concern import DEFAULT_READ_CONCERN
 from pymongo.read_preferences import ReadPreference
 from pymongo.server_type import SERVER_TYPE
 # Always use our backport so we always have support for IP address matching
@@ -435,7 +434,7 @@ def command(self, dbname, spec, slave_ok=False,
  read_preference=ReadPreference.PRIMARY,
  codec_options=DEFAULT_CODEC_OPTIONS, check=True,
  allowable_errors=None, check_keys=False,
- read_concern=DEFAULT_READ_CONCERN,
+ read_concern=None,
  write_concern=None,
  parse_write_concern_error=False,
  collation=None,
@@ -463,7 +462,8 @@ def command(self, dbname, spec, slave_ok=False,
  - `retryable_write`: True if this command is a retryable write.
  """
  self.check_session_auth_matches(session)
- if self.max_wire_version < 4 and not read_concern.ok_for_legacy:
+ if (read_concern and self.max_wire_version < 4
+ and not read_concern.ok_for_legacy):
  raise ConfigurationError(
  'read concern level of %s is not valid '
  'with a max wire version of %d.'

test/test_session.py

@@ -688,15 +688,6 @@ def _test_reads(self, op):
 
  @client_context.require_no_standalone
  def test_reads(self):
- self._test_reads(
- lambda coll, session: list(
- coll.database.list_collections(session=session)))
- self._test_reads(
- lambda coll, session: coll.database.list_collection_names(
- session=session))
- self._test_reads(
- lambda coll, session: coll.database.command(
- 'ismaster', session=session))
  self._test_reads(
  lambda coll, session: list(coll.aggregate([], session=session)))
  self._test_reads(
@@ -705,17 +696,11 @@ def test_reads(self):
  lambda coll, session: coll.find_one({}, session=session))
  self._test_reads(
  lambda coll, session: coll.count(session=session))
- self._test_reads(
- lambda coll, session: list(coll.list_indexes(session=session)))
- self._test_reads(
- lambda coll, session: coll.index_information(session=session))
- self._test_reads(
- lambda coll, session: coll.options(session=session))
  self._test_reads(
  lambda coll, session: coll.distinct('foo', session=session))
  self._test_reads(
  lambda coll, session: coll.map_reduce(
- 'function() {}', 'function() {}', 'output', session=session))
+ 'function() {}', 'function() {}', 'inline', session=session))
  self._test_reads(
  lambda coll, session: coll.inline_map_reduce(
  'function() {}', 'function() {}', session=session))
@@ -793,6 +778,87 @@ def test_writes(self):
  self._test_writes(
  lambda coll, session: coll.reindex(session=session))
 
+ def _test_no_read_concern(self, op):
+ coll = self.client.pymongo_test.test
+ with self.client.start_session() as sess:
+ coll.find_one({}, session=sess)
+ operation_time = sess.operation_time
+ self.assertIsNotNone(operation_time)
+ self.listener.results.clear()
+ op(coll, sess)
+ rc = self.listener.results['started'][0].command.get(
+ 'readConcern')
+ self.assertIsNone(rc)
+
+ @client_context.require_no_standalone
+ def test_writes_do_not_include_read_concern(self):
+ self._test_no_read_concern(
+ lambda coll, session: coll.bulk_write(
+ [InsertOne({})], session=session))
+ self._test_no_read_concern(
+ lambda coll, session: coll.insert_one({}, session=session))
+ self._test_no_read_concern(
+ lambda coll, session: coll.insert_many([{}], session=session))
+ self._test_no_read_concern(
+ lambda coll, session: coll.replace_one(
+ {'_id': 1}, {'x': 1}, session=session))
+ self._test_no_read_concern(
+ lambda coll, session: coll.update_one(
+ {}, {'$set': {'X': 1}}, session=session))
+ self._test_no_read_concern(
+ lambda coll, session: coll.update_many(
+ {}, {'$set': {'x': 1}}, session=session))
+ self._test_no_read_concern(
+ lambda coll, session: coll.delete_one({}, session=session))
+ self._test_no_read_concern(
+ lambda coll, session: coll.delete_many({}, session=session))
+ self._test_no_read_concern(
+ lambda coll, session: coll.find_one_and_replace(
+ {'x': 1}, {'y': 1}, session=session))
+ self._test_no_read_concern(
+ lambda coll, session: coll.find_one_and_update(
+ {'y': 1}, {'$set': {'x': 1}}, session=session))
+ self._test_no_read_concern(
+ lambda coll, session: coll.find_one_and_delete(
+ {'x': 1}, session=session))
+ self._test_no_read_concern(
+ lambda coll, session: coll.create_index("foo", session=session))
+ self._test_no_read_concern(
+ lambda coll, session: coll.create_indexes(
+ [IndexModel([("bar", ASCENDING)])], session=session))
+ self._test_no_read_concern(
+ lambda coll, session: coll.drop_index("foo_1", session=session))
+ self._test_no_read_concern(
+ lambda coll, session: coll.drop_indexes(session=session))
+ self._test_no_read_concern(
+ lambda coll, session: coll.reindex(session=session))
+ self._test_no_read_concern(
+ lambda coll, session: list(
+ coll.aggregate([{"$out": "aggout"}], session=session)))
+ self._test_no_read_concern(
+ lambda coll, session: coll.map_reduce(
+ 'function() {}', 'function() {}', 'mrout', session=session))
+
+ # It's not a write, but currentOp also doesn't support readConcern
+ self._test_no_read_concern(
+ lambda coll, session: coll.database.current_op(session=session))
+
+ @client_context.require_no_standalone
+ def test_get_more_does_not_include_read_concern(self):
+ coll = self.client.pymongo_test.test
+ with self.client.start_session() as sess:
+ coll.find_one({}, session=sess)
+ operation_time = sess.operation_time
+ self.assertIsNotNone(operation_time)
+ coll.insert_many([{}, {}])
+ cursor = coll.find({}).batch_size(1)
+ next(cursor)
+ self.listener.results.clear()
+ list(cursor)
+ started = self.listener.results['started'][0]
+ self.assertEqual(started.command_name, 'getMore')
+ self.assertIsNone(started.command.get('readConcern'))
+
  def test_session_not_causal(self):
  with self.client.start_session(causal_consistency=False) as s:
  self.client.pymongo_test.test.insert_one({}, session=s)