mongo 2.23.0 → 2.24.1

data/lib/mongo/database/view.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# rubocop:todo all
 
 # Copyright (C) 2014-2020 MongoDB Inc.
 #
@@ -19,7 +18,6 @@ require 'mongo/cursor/nontailable'
 
 module Mongo
   class Database
-
     # A class representing a view of a database.
     #
     # @since 2.0.0
@@ -82,19 +80,13 @@ module Mongo
           session: session,
           operation_timeouts: operation_timeouts(options)
         )
+
         cursor = read_with_retry_cursor(session, ServerSelector.primary, self, context: context) do |server|
           send_initial_query(server, session, context, options.merge(name_only: true))
         end
-        cursor.map do |info|
-          if cursor.initial_result.connection_description.features.list_collections_enabled?
-            info['name']
-          else
-            (info['name'] &&
-              info['name'].sub("#{@database.name}.", ''))
-          end
-        end.reject do |name|
-          name.start_with?('system.') || name.include?('$')
-        end
+
+        cursor.map { |info| info['name'] }
+              .reject { |name| name.start_with?('system.') || name.include?('$') }
       end
 
       # Get info on all the collections in the database.
@@ -154,7 +146,7 @@ module Mongo
 
         validate_timeout_mode!(options)
 
-        @batch_size =  nil
+        @batch_size = nil
         @limit = nil
         @collection = @database[Database::COMMAND]
       end
@@ -209,7 +201,8 @@ module Mongo
 
       private
 
-      def collections_info(session, server_selector, options = {}, &block)
+      def collections_info(session, server_selector, options = {})
+        @batch_size = options[:batch_size] if options[:batch_size]
         description = nil
         context = Operation::Context.new(
           client: client,
@@ -219,27 +212,15 @@ module Mongo
         op = initial_query_op(session, options)
         tracer.trace_operation(op, context, op_name: 'listCollections') do
           cursor = read_with_retry_cursor(session, server_selector, self, context: context) do |server|
-            # TODO take description from the connection used to send the query
+            # TODO: take description from the connection used to send the query
             # once https://jira.mongodb.org/browse/RUBY-1601 is fixed.
             description = server.description
             send_initial_query(server, session, context, options)
           end
-          # On 3.0+ servers, we get just the collection names.
-          # On 2.6 server, we get collection names prefixed with the database
-          # name. We need to filter system collections out here because
-          # in the caller we don't know which server version executed the
-          # command and thus what the proper filtering logic should be
-          # (it is valid for collection names to have dots, thus filtering out
-          # collections named system.* here for 2.6 servers would actually
-          # filter out collections in the system database).
-          if description.server_version_gte?('3.0')
-            cursor.reject do |doc|
-              doc['name'].start_with?('system.') || doc['name'].include?('$')
-            end
-          else
-            cursor.reject do |doc|
-              doc['name'].start_with?("#{database.name}.system") || doc['name'].include?('$')
-            end
+
+          # Filter out the system collections
+          cursor.reject do |doc|
+            doc['name'].start_with?('system.') || doc['name'].include?('$')
           end
         end
       end
@@ -247,10 +228,10 @@ module Mongo
       def collections_info_spec(session, options = {})
         { selector: {
             listCollections: 1,
-            cursor: batch_size ? { batchSize: batch_size } : {} },
+            cursor: batch_size ? { batchSize: batch_size } : {}
+          },
           db_name: @database.name,
-          session: session
-        }.tap do |spec|
+          session: session }.tap do |spec|
           spec[:selector][:nameOnly] = true if options[:name_only]
           spec[:selector][:filter] = options[:filter] if options[:filter]
           spec[:selector][:authorizedCollections] = true if options[:authorized_collections]
@@ -290,9 +271,7 @@ module Mongo
       def send_initial_query(server, session, context, options = {})
         opts = options.dup
         execution_opts = {}
-        if opts.key?(:deserialize_as_bson)
-          execution_opts[:deserialize_as_bson] = opts.delete(:deserialize_as_bson)
-        end
+        execution_opts[:deserialize_as_bson] = opts.delete(:deserialize_as_bson) if opts.key?(:deserialize_as_bson)
         if server.load_balancer?
           connection = server.pool.check_out(context: context)
           initial_query_op(session, opts).execute_with_connection(

data/lib/mongo/database.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# rubocop:todo all
 
 # Copyright (C) 2014-2020 MongoDB Inc.
 #
@@ -18,7 +17,6 @@
 require 'mongo/database/view'
 
 module Mongo
-
   # Represents a database on the db server and operations that can execute on
   # it at this level.
   #
@@ -30,33 +28,33 @@ module Mongo
     # The admin database name.
     #
     # @since 2.0.0
-    ADMIN = 'admin'.freeze
+    ADMIN = 'admin'
 
     # The "collection" that database commands operate against.
     #
     # @since 2.0.0
-    COMMAND = '$cmd'.freeze
+    COMMAND = '$cmd'
 
     # The default database options.
     #
     # @since 2.0.0
-    DEFAULT_OPTIONS = Options::Redacted.new(:database => ADMIN).freeze
+    DEFAULT_OPTIONS = Options::Redacted.new(database: ADMIN).freeze
 
     # Database name field constant.
     #
     # @since 2.1.0
     # @deprecated
-    NAME = 'name'.freeze
+    NAME = 'name'
 
     # Databases constant.
     #
     # @since 2.1.0
-    DATABASES = 'databases'.freeze
+    DATABASES = 'databases'
 
     # The name of the collection that holds all the collection names.
     #
     # @since 2.0.0
-    NAMESPACES = 'system.namespaces'.freeze
+    NAMESPACES = 'system.namespaces'
 
     # @return [ Client ] client The database client.
     attr_reader :client
@@ -94,6 +92,7 @@ module Mongo
     # @since 2.0.0
     def ==(other)
       return false unless other.is_a?(Database)
+
       name == other.name
     end
 
@@ -110,11 +109,13 @@ module Mongo
     # @since 2.0.0
     def [](collection_name, options = {})
       if options[:server_api]
-        raise ArgumentError, 'The :server_api option cannot be specified for collection objects. It can only be specified on Client level'
+        raise ArgumentError,
+              'The :server_api option cannot be specified for collection objects. It can only be specified on Client level'
       end
+
       Collection.new(self, collection_name, options)
     end
-    alias_method :collection, :[]
+    alias collection []
 
     # Get all the names of the non-system collections in the database.
     #
@@ -223,7 +224,7 @@ module Mongo
     #   executes this command. This is an internal option and is subject to
     #   change.
     #   - :deserialize_as_bson [ Boolean ] Whether to deserialize the response
-    #     to this command using BSON types intead of native Ruby types wherever
+    #     to this command using BSON types instead of native Ruby types wherever
     #     possible.
     #
     # @return [ Mongo::Operation::Result ] The result of the command execution.
@@ -231,31 +232,30 @@ module Mongo
       opts = opts.dup
       execution_opts = opts.delete(:execution_options) || {}
 
-      txn_read_pref = if opts[:session] && opts[:session].in_transaction?
-        opts[:session].txn_read_preference
-      else
-        nil
-      end
+      txn_read_pref = (opts[:session].txn_read_preference if opts[:session] && opts[:session].in_transaction?)
       txn_read_pref ||= opts[:read] || ServerSelector::PRIMARY
       Lint.validate_underscore_read_preference(txn_read_pref)
       selector = ServerSelector.get(txn_read_pref)
 
       client.with_session(opts) do |session|
-        server = selector.select_server(cluster, nil, session)
+        context = Operation::Context.new(
+          client: client,
+          session: session,
+          operation_timeouts: operation_timeouts(opts)
+        )
         op = Operation::Command.new(
-          :selector => operation,
-          :db_name => name,
-          :read => selector,
-          :session => session
+          selector: operation,
+          db_name: name,
+          read: selector,
+          session: session
         )
 
-        op.execute(server,
-          context: Operation::Context.new(
-            client: client,
-            session: session,
-            operation_timeouts: operation_timeouts(opts)
-          ),
-          options: execution_opts)
+        retry_enabled = client.options[:retry_reads] != false &&
+                        client.options[:retry_writes] != false
+        with_overload_retry(context: context, retry_enabled: retry_enabled) do
+          server = selector.select_server(cluster, nil, session)
+          op.execute(server, context: context, options: execution_opts)
+        end
       end
     end
 
@@ -278,11 +278,7 @@ module Mongo
     # @return [ Hash ] The result of the command execution.
     # @api private
     def read_command(operation, opts = {})
-      txn_read_pref = if opts[:session] && opts[:session].in_transaction?
-        opts[:session].txn_read_preference
-      else
-        nil
-      end
+      txn_read_pref = (opts[:session].txn_read_preference if opts[:session] && opts[:session].in_transaction?)
       txn_read_pref ||= opts[:read] || ServerSelector::PRIMARY
       Lint.validate_underscore_read_preference(txn_read_pref)
       preference = ServerSelector.get(txn_read_pref)
@@ -298,7 +294,7 @@ module Mongo
           db_name: name,
           read: preference,
           session: session,
-          comment: opts[:comment],
+          comment: opts[:comment]
         )
         op_name = opts[:op_name] || 'command'
         tracer.trace_operation(operation, context, op_name: op_name) do
@@ -327,26 +323,26 @@ module Mongo
     #
     # @since 2.0.0
     def drop(options = {})
-      operation = { :dropDatabase => 1 }
+      operation = { dropDatabase: 1 }
       client.with_session(options) do |session|
         write_concern = if options[:write_concern]
-          WriteConcern.get(options[:write_concern])
-        else
-          self.write_concern
-        end
+                          WriteConcern.get(options[:write_concern])
+                        else
+                          self.write_concern
+                        end
         Operation::DropDatabase.new({
-          selector: operation,
-          db_name: name,
-          write_concern: write_concern,
-          session: session
-        }).execute(
-          next_primary(nil, session),
-          context: Operation::Context.new(
-            client: client,
-            session: session,
-            operation_timeouts: operation_timeouts(options)
-          )
-        )
+                                      selector: operation,
+                                      db_name: name,
+                                      write_concern: write_concern,
+                                      session: session
+                                    }).execute(
+                                      next_primary(nil, session),
+                                      context: Operation::Context.new(
+                                        client: client,
+                                        session: session,
+                                        operation_timeouts: operation_timeouts(options)
+                                      )
+                                    )
       end
     end
 
@@ -371,6 +367,7 @@ module Mongo
       if Lint.enabled? && !(name.is_a?(String) || name.is_a?(Symbol))
         raise "Database name must be a string or a symbol: #{name}"
       end
+
       @client = client
       @name = name.to_s.freeze
       @options = options.freeze
@@ -458,9 +455,8 @@ module Mongo
       View.new(self, options).aggregate(pipeline, options)
     end
 
-    # As of version 3.6 of the MongoDB server, a ``$changeStream`` pipeline stage is supported
-    # in the aggregation framework. As of version 4.0, this stage allows users to request that
-    # notifications are sent for all changes that occur in the client's database.
+    # Allows users to request that notifications are sent for all changes that
+    # occur in the client's database.
     #
     # @example Get change notifications for a given database..
     #  database.watch([{ '$match' => { operationType: { '$in' => ['insert', 'replace'] } } }])
@@ -507,7 +503,6 @@ module Mongo
     # @option options [ BSON::Timestamp ] :start_at_operation_time Only return
     #   changes that occurred after the specified timestamp. Any command run
     #   against the server will return a cluster time that can be used here.
-    #   Only recognized by server versions 4.0+.
     # @option options [ Object ] :comment A user-provided
     #   comment to attach to this command.
     # @option options [ Boolean ] :show_expanded_events Enables the server to
@@ -531,7 +526,8 @@ module Mongo
         Mongo::Collection::View.new(collection("#{COMMAND}.aggregate"), {}, view_options),
         pipeline,
         Mongo::Collection::View::ChangeStream::DATABASE,
-        options)
+        options
+      )
     end
 
     # Create a database for the provided client, for use when we don't want the

data/lib/mongo/dbref.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# rubocop:todo all
 
 # Copyright (C) 2015-2020 MongoDB Inc.
 #

data/lib/mongo/distinguishing_semaphore.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# rubocop:todo all
 
 # Copyright (C) 2020 MongoDB Inc.
 #

data/lib/mongo/error/auth_error.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# rubocop:todo all
 
 # Copyright (C) 2018-2020 MongoDB Inc.
 #
@@ -17,7 +16,6 @@
 
 module Mongo
   class Error
-
     # Raised when authentication fails.
     #
     # Note: This class is derived from RuntimeError for

data/lib/mongo/error/bad_load_balancer_target.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# rubocop:todo all
 
 # Copyright (C) 2021 MongoDB Inc.
 #
@@ -17,7 +16,6 @@
 
 module Mongo
   class Error
-
     # Raised when the driver is in load-balancing mode but a connection
     # is established to something other than a mongos.
     class BadLoadBalancerTarget < Error

data/lib/mongo/error/bulk_write_error.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# rubocop:todo all
 
 # Copyright (C) 2014-2020 MongoDB Inc.
 #
@@ -17,7 +16,6 @@
 
 module Mongo
   class Error
-
     # Exception raised if there are write errors upon executing a bulk
     # operation.
     #
@@ -33,10 +31,14 @@ module Mongo
     #
     # @since 2.0.0
     class BulkWriteError < Error
-
       # @return [ BSON::Document ] result The error result.
       attr_reader :result
 
+      # @return [ Array<String> ] Deduplicated list of "host:port" addresses of
+      #   the servers that produced this bulk write error. Empty when no
+      #   addresses were supplied.
+      attr_reader :server_addresses
+
       # Instantiate the new exception.
       #
       # @example Instantiate the exception.
@@ -44,13 +46,19 @@ module Mongo
       #
       # @param [ Hash ] result A processed response from the server
       #   reporting results of the operation.
+      # @param [ Array<String | Mongo::Address | Mongo::Server::Description> ]
+      #   server_addresses Addresses of the servers that produced this error.
+      #   Entries are normalized to "host:port" strings.
       #
       # @since 2.0.0
-      def initialize(result)
+      def initialize(result, server_addresses: nil)
         @result = result
+        @server_addresses = normalize_server_addresses(server_addresses)
+
         # Exception constructor behaves differently for a nil argument and
         # for no argument. Avoid passing nil explicitly.
-        super(*[build_message])
+        message = build_message
+        message ? super(message) : super()
       end
 
       private
@@ -77,27 +85,44 @@ module Mongo
         errors = @result['writeErrors']
         return nil unless errors
 
-        fragment = ""
+        fragment = ''
         cut_short = false
         errors.first(10).each_with_index do |error, i|
-          fragment += "; " if fragment.length > 0
+          fragment += '; ' if fragment.length > 0
           fragment += "[#{error['code']}]: #{error['errmsg']}"
           fragment += " -- #{error['errInfo'].to_json}" if error['errInfo']
 
           if fragment.length > 3000
-            cut_short = i < [9, errors.length].min
+            cut_short = i < [ 9, errors.length ].min
             break
           end
         end
 
         fragment += '...' if errors.length > 10 || cut_short
 
-        if errors.length > 1
-          fragment = "Multiple errors: #{fragment}"
+        fragment = "Multiple errors: #{fragment}" if errors.length > 1
+
+        if Mongo.include_server_address_in_errors && @server_addresses.any?
+          fragment = "#{fragment} (on #{@server_addresses.join(', ')})"
         end
 
         fragment
       end
+
+      def normalize_server_addresses(value)
+        return [] if value.nil?
+
+        Array(value).filter_map do |entry|
+          case entry
+          when String then entry
+          when Mongo::Address then entry.seed
+          when Mongo::Server::Description then entry.address&.seed
+          else
+            raise ArgumentError,
+                  "server_addresses entries must be String, Mongo::Address, or Mongo::Server::Description; got #{entry.class}"
+          end
+        end.uniq
+      end
     end
   end
 end

data/lib/mongo/error/change_stream_resumable.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# rubocop:todo all
 
 # Copyright (C) 2018-2020 MongoDB Inc.
 #
@@ -17,7 +16,6 @@
 
 module Mongo
   class Error
-
     # A module signifying the error will always cause change stream to
     # resume once.
     #

data/lib/mongo/error/client_closed.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# rubocop:todo all
 
 # Copyright (C) 2022 MongoDB Inc.
 #
@@ -17,7 +16,6 @@
 
 module Mongo
   class Error
-
     class ClientClosed < Error
     end
   end

data/lib/mongo/error/closed_stream.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# rubocop:todo all
 
 # Copyright (C) 2014-2020 MongoDB Inc.
 #
@@ -17,12 +16,10 @@
 
 module Mongo
   class Error
-
     # Raised if the Grid::FSBucket::Stream object is closed and an operation is attempted.
     #
     # @since 2.1.0
     class ClosedStream < Error
-
       # Create the new exception.
       #
       # @example Create the new exception.
@@ -30,7 +27,7 @@ module Mongo
       #
       # @since 2.1.0
       def initialize
-        super("The stream is closed and cannot be written to or read from.")
+        super('The stream is closed and cannot be written to or read from.')
       end
     end
   end

data/lib/mongo/error/connection_check_out_timeout.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# rubocop:todo all
 
 # Copyright (C) 2019-2020 MongoDB Inc.
 #
@@ -17,7 +16,6 @@
 
 module Mongo
   class Error
-
     # Exception raised when trying to check out a connection from a connection
     # pool, the pool is at its max size and no connections become available
     # within the configured wait timeout.
@@ -27,7 +25,6 @@ module Mongo
     #
     # @since 2.9.0
     class ConnectionCheckOutTimeout < ::Timeout::Error
-
       # @return [ Mongo::Address ] address The address of the server the
       #   pool's connections connect to.
       #
@@ -42,9 +39,9 @@ module Mongo
       def initialize(msg, options)
         super(msg)
         @address = options[:address]
-        unless @address
-          raise ArgumentError, 'Address argument is required'
-        end
+        return if @address
+
+        raise ArgumentError, 'Address argument is required'
       end
     end
   end

data/lib/mongo/error/connection_perished.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# rubocop:todo all
 
 # Copyright (C) 2020 MongoDB Inc.
 #
@@ -17,7 +16,6 @@
 
 module Mongo
   class Error
-
     # Exception raised when trying to perform operations on a connection that
     # experienced a network error.
     class ConnectionPerished < Error

data/lib/mongo/error/connection_unavailable.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# rubocop:todo all
 
 # Copyright (C) 2022 MongoDB Inc.
 #
@@ -17,7 +16,6 @@
 
 module Mongo
   class Error
-
     # Exception raised when trying to check out a connection with a specific
     # global id, and the connection for that global id no longer exists in the
     # pool.

data/lib/mongo/error/credential_check_error.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# rubocop:todo all
 
 # Copyright (C) 2020 MongoDB Inc.
 #
@@ -17,7 +16,6 @@
 
 module Mongo
   class Error
-
     # Credential check for MONGODB-AWS authentication mechanism failed.
     #
     # This exception is raised when the driver attempts to verify the

data/lib/mongo/error/crypt_error.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# rubocop:todo all
 
 # Copyright (C) 2020 MongoDB Inc.
 #
@@ -17,7 +16,6 @@
 
 module Mongo
   class Error
-
     # An error related to client-side encryption.
     class CryptError < Mongo::Error
       # Create a new CryptError

data/lib/mongo/error/extra_file_chunk.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# rubocop:todo all
 
 # Copyright (C) 2014-2020 MongoDB Inc.
 #
@@ -17,12 +16,10 @@
 
 module Mongo
   class Error
-
     # Raised if an extra chunk is found.
     #
     # @since 2.1.0
     class ExtraFileChunk < Error
-
       # Create the new exception.
       #
       # @example Create the new exception.
@@ -30,7 +27,7 @@ module Mongo
       #
       # @since 2.1.0
       def initialize
-        super("Extra file chunk found.")
+        super('Extra file chunk found.')
       end
     end
   end