mongo 2.14.0.rc1 → 2.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 493d0cb29d48d80c7fe4c87691500c078b6667bd214dcc021e0074938229be83
-  data.tar.gz: 44507b68e42abadad6987f50c3b3ae1b8ae70f046812607755ffbe292013ccc4
+  metadata.gz: 7bfb22d052a842e256744a88c7e3cbd3b958643cc3e0f4425bf97be8f913f167
+  data.tar.gz: b63f3605ad8223e99a5f6a62aabff94a8c8600095b84265b6b4deb38e7223013
 SHA512:
-  metadata.gz: ea39c71265e24349b018a8e5f5699b556d1ed43107135da46790ad8496c4bcd8a3917ca6fd0c7b405c5e6cff968d6e18cedf35ac33fe660f19f2869f663cdf64
-  data.tar.gz: 30ca549b30bec1889f622f7002658c918b6686e417bd9a636777bbc7f321d06094278b5a7ff4b04a9395f61bf90e28f99f26ff9ec404b0e3687dbc1b4a77ec1f
+  metadata.gz: 85566c0080b9bcfa67438a365114dd062425df557040e05c0db0448aedd37a0f52dae5b8612b08af196a9e35c1e5b41553a89607d780d187d4e2e28602471c76
+  data.tar.gz: 5172ab2d71a8d7e048fcb2d87e7219024a2028c3909f2cce48081d1b3014071df13b02426019508bda6542e4870992ca869cd3393caf3aaf6483ad4c74f1abf3

data.tar.gz.sig

@@ -1 +1 @@
-lb~�{������z�x�%����~��n��3G���k�j*R)ڗ0
+��0���H#{�F������ƛ!z�����}��6l��kM��h.[��hAi�<y/&BM~|2��֘�s�s����o@�]k�d�w�xǴp+��ȿ�

data/Rakefile

@@ -13,7 +13,31 @@ end
 default_groups = [:default, :testing]
 Bundler.require(*default_groups)
 
+ROOT = File.expand_path(File.join(File.dirname(__FILE__)))
+
+$: << File.join(ROOT, 'spec/shared/lib')
+
 require 'rspec/core/rake_task'
+require 'mrss/spec_organizer'
+
+CLASSIFIERS = [
+  [%r,^mongo,, :unit],
+  [%r,^kerberos,, :unit],
+  [%r,^integration/sdam_error_handling,, :sdam_integration],
+  [%r,^integration/cursor_reaping,, :cursor_reaping],
+  [%r,^integration/query_cache,, :query_cache],
+  [%r,^integration/transactions_examples,, :tx_examples],
+  [%r,^(atlas|integration),, :integration],
+  [%r,^spec_tests/sdam_integration,, :spec_sdam_integration],
+  [%r,^spec_tests,, :spec],
+]
+
+RUN_PRIORITY = %i(
+  tx_examples
+  unit
+  integration sdam_integration cursor_reaping query_cache
+  spec spec_sdam_integration
+)
 
 tasks = Rake.application.instance_variable_get('@tasks')
 tasks['release:do'] = tasks.delete('release')
@@ -71,12 +95,23 @@ namespace :spec do
     SpecConfig.instance.print_summary
   end
 
-  task :ci => ['spec:prepare'] do
-    $: << File.join(File.dirname(__FILE__), 'spec')
+  def spec_organizer
+    Mrss::SpecOrganizer.new(
+      root: ROOT,
+      classifiers: CLASSIFIERS,
+      priority_order: RUN_PRIORITY,
+    )
+  end
 
-    require 'support/spec_organizer'
+  task :ci => ['spec:prepare'] do
+    spec_organizer.run
+  end
 
-    SpecOrganizer.new.run
+  desc 'Show test buckets'
+  task :buckets do
+    spec_organizer.ordered_buckets.each do |category, paths|
+      puts "#{category || 'remaining'}: #{paths&.join(' ') || '<none>'}"
+    end
   end
 end
 

data/lib/mongo/address.rb

@@ -286,7 +286,7 @@ module Mongo
       rescue IOError, SystemCallError => e
         raise Error::SocketError, "#{e.class}: #{e} (for #{self})"
       rescue OpenSSL::SSL::SSLError => e
-        raise Error::SocketError, "#{e.class}: #{e} (for #{self}) (#{SSL_ERROR})"
+        raise Error::SocketError, "#{e.class}: #{e} (for #{self})"
       end
     end
   end

data/lib/mongo/collection.rb

@@ -564,6 +564,11 @@ module Mongo
         else
           write_concern_with_session(session)
         end
+
+        if document.nil?
+          raise ArgumentError, "Document to be inserted cannot be nil"
+        end
+
         write_with_retry(session, write_concern) do |server, txn_num|
           Operation::Insert.new(
             :documents => [ document ],

data/lib/mongo/collection/view/readable.rb

@@ -226,6 +226,10 @@ module Mongo
         #
         # @since 2.6.0
         def estimated_document_count(opts = {})
+          unless view.filter.empty?
+            raise ArgumentError, "Cannot call estimated_document_count when querying with a filter"
+          end
+
           cmd = { count: collection.name }
           cmd[:maxTimeMS] = opts[:max_time_ms] if opts[:max_time_ms]
           if read_concern

data/lib/mongo/cursor.rb

@@ -69,12 +69,12 @@ module Mongo
       @view = view
       @server = server
       @initial_result = result
+      @namespace = result.namespace
       @remaining = limit if limited?
       @cursor_id = result.cursor_id
       if @cursor_id.nil?
         raise ArgumentError, 'Cursor id must be present in the result'
       end
-      @coll_name = nil
       @options = options
       @session = @options[:session]
       unless closed?
@@ -288,7 +288,20 @@ module Mongo
     #
     # @since 2.2.0
     def collection_name
-      @coll_name || collection.name
+      # In most cases, this will be equivalent to the name of the collection
+      # object in the driver. However, in some cases (e.g. when connected
+      # to an Atlas Data Lake), the namespace returned by the find command
+      # may be different, which is why we want to use the collection name based
+      # on the namespace in the command result.
+      if @namespace
+        # Often, the namespace will be in the format "database.collection".
+        # However, sometimes the collection name will contain periods, which
+        # is why this method joins all the namespace components after the first.
+        ns_components = @namespace.split('.')
+        ns_components[1...ns_components.length].join('.')
+      else
+        collection.name
+      end
     end
 
     # Get the cursor id.
@@ -382,7 +395,6 @@ module Mongo
 
     def process(result)
       @remaining -= result.returned_count if limited?
-      @coll_name ||= result.namespace.sub("#{database.name}.", '') if result.namespace
       # #process is called for the first batch of results. In this case
       # the @cursor_id may be zero (all results fit in the first batch).
       # Thus we need to check both @cursor_id and the cursor_id of the result

data/lib/mongo/database/view.rb

@@ -100,7 +100,7 @@ module Mongo
       #
       # @return [ Array<Hash> ] Info for each collection in the database.
       #
-      # @since 2.0.5 
+      # @since 2.0.5
       def list_collections(options = {})
         session = client.send(:get_session)
         collections_info(session, ServerSelector.primary, options)

data/lib/mongo/operation/collections_info/command.rb

@@ -27,6 +27,11 @@ module Mongo
 
         private
 
+        def get_result(connection, client, options = {})
+          # This is a Mongo::Operation::CollectionsInfo::Result
+          Result.new(*dispatch_message(connection, client), db_name)
+        end
+
         def selector(connection)
           {}
         end

data/lib/mongo/operation/collections_info/result.rb

@@ -23,6 +23,21 @@ module Mongo
       # @api semiprivate
       class Result < Operation::Result
 
+        # Initialize a new result.
+        #
+        # @param [ Array<Protocol::Message> | nil ] replies The wire protocol replies, if any.
+        # @param [ Server::Description ] connection_description
+        #   Server description of the server that performed the operation that
+        #   this result is for.
+        # @param [ String ] database_name The name of the database that the
+        #   query was sent to.
+        #
+        # @api private
+        def initialize(replies, connection_description, database_name)
+          super(replies, connection_description)
+          @database_name = database_name
+        end
+
         # Get the namespace for the cursor.
         #
         # @example Get the namespace.
@@ -33,7 +48,7 @@ module Mongo
         # @since 2.1.0
         # @api private
         def namespace
-          Database::NAMESPACES
+          "#{@database_name}.#{Database::NAMESPACES}"
         end
       end
     end

data/lib/mongo/operation/find/result.rb

@@ -48,6 +48,16 @@ module Mongo
           cursor_document[FIRST_BATCH]
         end
 
+        # The namespace in which this find command was performed.
+        #
+        # @return [ String ] The namespace, usually in the format
+        #   "database.collection".
+        #
+        # @api private
+        def namespace
+          cursor_document['ns']
+        end
+
         private
 
         def cursor_document

data/lib/mongo/server/description.rb

@@ -182,13 +182,20 @@ module Mongo
       # @since 2.5.0
       LOGICAL_SESSION_TIMEOUT_MINUTES = 'logicalSessionTimeoutMinutes'.freeze
 
+      # Constant for reading connectionId info from config.
+      #
+      # @api private
+      CONNECTION_ID = 'connectionId'.freeze
+
       # Fields to exclude when comparing two descriptions.
       #
       # @since 2.0.6
       EXCLUDE_FOR_COMPARISON = [ LOCAL_TIME,
                                  LAST_WRITE,
                                  OPERATION_TIME,
-                                 Operation::CLUSTER_TIME ].freeze
+                                 Operation::CLUSTER_TIME,
+                                 CONNECTION_ID,
+                               ].freeze
 
       # Instantiate the new server description from the result of the ismaster
       # command.

data/lib/mongo/session.rb

@@ -379,6 +379,7 @@ module Mongo
           rv = yield self
         rescue Exception => e
           if within_states?(STARTING_TRANSACTION_STATE, TRANSACTION_IN_PROGRESS_STATE)
+            log_warn("Aborting transaction due to #{e.class}: #{e}")
             abort_transaction
             transaction_in_progress = false
           end
@@ -443,7 +444,7 @@ module Mongo
       true
     ensure
       if transaction_in_progress
-        log_warn('with_transaction callback altered with_transaction loop, aborting transaction')
+        log_warn('with_transaction callback broke out of with_transaction loop, aborting transaction')
         begin
           abort_transaction
         rescue Error::OperationFailure, Error::InvalidTransactionOperation

data/lib/mongo/version.rb

@@ -17,5 +17,5 @@ module Mongo
   # The current version of the driver.
   #
   # @since 2.0.0
-  VERSION = '2.14.0.rc1'.freeze
+  VERSION = '2.14.0'.freeze
 end

data/spec/README.md

@@ -2,6 +2,13 @@
 
 ## Quick Start
 
+The test suite requires shared tooling that is stored in a separate repository
+and is referenced as a submodule. After checking out the desired driver
+branch, check out the matching submodules:
+
+    git submodule init
+    git submodule update
+
 To run the test suite against a local MongoDB deployment listening on port
 27017, run:
 

data/spec/integration/bson_symbol_spec.rb

@@ -25,8 +25,10 @@ describe 'Symbol encoding to BSON' do
   end
 
   it 'round-trips symbol values using the same byte buffer' do
-    if BSON::Environment.jruby?
-      pending 'https://jira.mongodb.org/browse/RUBY-2128'
+    if BSON::Environment.jruby? && (BSON::VERSION.split('.').map(&:to_i) <=> [4, 11, 0]) < 0
+      skip 'This test is only relevant to bson versions that increment ByteBuffer '\
+       'read and write positions separately in JRuby, as implemented in ' \
+       'bson version 4.11.0. For more information, see https://jira.mongodb.org/browse/RUBY-2128'
     end
 
     Hash.from_bson(hash.to_bson).should == hash

data/spec/integration/change_stream_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe 'Change stream integration', retry: 4 do
-  only_mri
+  require_mri
   max_example_run_time 7
   min_server_fcv '3.6'
   require_topology :replica_set

data/spec/integration/connection_pool_populator_spec.rb

@@ -271,7 +271,7 @@ describe 'Connection pool populator integration' do
   end
 
   describe 'when forking is enabled' do
-    only_mri
+    require_mri
 
     context 'when min size is provided' do
       min_server_version '2.8'

data/spec/integration/cursor_reaping_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe 'Cursor reaping' do
   # JRuby does reap cursors but GC.start does not force GC to run like it does
   # in MRI, I don't currently know how to force GC to run in JRuby
-  only_mri
+  require_mri
 
   around(:all) do |example|
     saved_level = Mongo::Logger.logger.level

data/spec/integration/fork_reconnect_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe 'fork reconnect' do
   require_fork
-  only_mri
+  require_mri
 
   # On multi-shard sharded clusters a succeeding write request does not
   # guarantee that the next operation will succeed (since it could be sent to
@@ -139,5 +139,60 @@ describe 'fork reconnect' do
       # performed by the child is recovered from.
       client['foo'].find(test: 1)
     end
+
+    # Test from Driver Sessions Spec
+    #   * Create ClientSession
+    #   * Record its lsid
+    #   * Delete it (so the lsid is pushed into the pool)
+    #   * Fork
+    #   * In the parent, create a ClientSession and assert its lsid is the same.
+    #   * In the child, create a ClientSession and assert its lsid is different.
+    describe 'session pool' do
+      it 'is cleared after fork' do
+        session = client.get_session
+        parent_lsid = session.session_id
+        session.end_session
+        if pid = fork
+          pid, status = Process.wait2(pid)
+          status.exitstatus.should == 0
+        else
+          Utils.wrap_forked_child do
+            client.reconnect
+            child_session = client.get_session
+            child_lsid = child_session.session_id
+            expect(child_lsid).not_to eq(parent_lsid)
+          end
+        end
+
+        expect(client.get_session.session_id).to eq(parent_lsid)
+      end
+
+      # Test from Driver Sessions Spec
+      #   * Create ClientSession
+      #   * Record its lsid
+      #   * Fork
+      #   * In the parent, return the ClientSession to the pool, create a new ClientSession, and assert its lsid is the same.
+      #   * In the child, return the ClientSession to the pool, create a new ClientSession, and assert its lsid is different.
+      it 'does not return parent process sessions to child process pool' do
+        session = client.get_session
+        parent_lsid = session.session_id
+
+        if pid = fork
+          pid, status = Process.wait2(pid)
+          status.exitstatus.should == 0
+        else
+          Utils.wrap_forked_child do
+            client.reconnect
+            session.end_session
+            child_session = client.get_session
+            child_lsid = child_session.session_id
+            expect(child_lsid).not_to eq(parent_lsid)
+          end
+        end
+
+        session.end_session
+        expect(client.get_session.session_id).to eq(parent_lsid)
+      end
+    end
   end
 end

data/spec/integration/query_cache_transactions_spec.rb

@@ -1,16 +1,21 @@
 require 'spec_helper'
 
 describe 'QueryCache with transactions' do
+  # Work around https://jira.mongodb.org/browse/HELP-10518
+  before(:all) do
+    client = ClientRegistry.instance.global_client('authorized')
+    Utils.create_collection(client, 'test')
+
+    Utils.mongos_each_direct_client do |client|
+      client['test'].distinct('foo').to_a
+    end
+  end
+
   around do |spec|
     Mongo::QueryCache.clear
     Mongo::QueryCache.cache { spec.run }
   end
 
-  before do
-    authorized_collection.delete_many
-    subscriber.clear_events!
-  end
-
   # These tests do not currently use the session registry because transactions
   # leak sessions independently of the query cache. This will be resolved by
   # RUBY-2391.
@@ -23,28 +28,34 @@ describe 'QueryCache with transactions' do
     end
   end
 
-  let(:authorized_collection) { client['collection_spec'] }
+  before do
+    collection.delete_many
+
+    # Work around https://jira.mongodb.org/browse/HELP-10518
+    client.start_session do |session|
+      session.with_transaction do
+        collection.find({}, session: session).to_a
+      end
+    end
+    subscriber.clear_events!
+  end
 
   describe 'in transactions' do
     require_transaction_support
     require_wired_tiger
 
-    let(:collection) { authorized_client['test'] }
+    let(:collection) { client['test'] }
 
     let(:events) do
       subscriber.command_started_events('find')
     end
 
-    before do
-      Utils.create_collection(authorized_client, 'test')
-    end
-
     context 'with convenient API' do
       context 'when same query is performed inside and outside of transaction' do
         it 'performs one query' do
           collection.find.to_a
 
-          session = authorized_client.start_session
+          session = client.start_session
           session.with_transaction do
             collection.find({}, session: session).to_a
           end
@@ -57,7 +68,7 @@ describe 'QueryCache with transactions' do
         it 'performs two queries' do
           collection.find.to_a
 
-          session = authorized_client.start_session
+          session = client.start_session
           session.with_transaction(
            read_concern: { level: :snapshot }
           ) do
@@ -72,7 +83,7 @@ describe 'QueryCache with transactions' do
         it 'performs two queries' do
           collection.find.to_a
 
-          session = authorized_client.start_session
+          session = client.start_session
           session.with_transaction(
            read: { mode: :primary }
           ) do
@@ -85,7 +96,7 @@ describe 'QueryCache with transactions' do
 
       context 'when transaction is committed' do
         it 'clears the cache' do
-          session = authorized_client.start_session
+          session = client.start_session
           session.with_transaction do
             collection.insert_one({ test: 1 }, session: session)
             collection.insert_one({ test: 2 }, session: session)
@@ -107,7 +118,7 @@ describe 'QueryCache with transactions' do
 
       context 'when transaction is aborted' do
         it 'clears the cache' do
-          session = authorized_client.start_session
+          session = client.start_session
           session.with_transaction do
             collection.insert_one({ test: 1 }, session: session)
             collection.insert_one({ test: 2 }, session: session)
@@ -131,7 +142,7 @@ describe 'QueryCache with transactions' do
     context 'with low-level API' do
       context 'when transaction is committed' do
         it 'clears the cache' do
-          session = authorized_client.start_session
+          session = client.start_session
           session.start_transaction
 
           collection.insert_one({ test: 1 }, session: session)
@@ -154,7 +165,7 @@ describe 'QueryCache with transactions' do
 
       context 'when transaction is aborted' do
         it 'clears the cache' do
-          session = authorized_client.start_session
+          session = client.start_session
           session.start_transaction
 
           collection.insert_one({ test: 1 }, session: session)