mongo 2.24.1 → 2.25.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9359ddba0c1cd025a706f5970893bbdce249c2ab5fbe9d4ce3293a308bb11ade
-  data.tar.gz: f88046bc63c0a6b2d23017a3df2ba2cfe72bf6cd7d9565c985e64084bc41147d
+  metadata.gz: 846c673e8e85d3e7007bec794833276ed4da9591347e361465b190c10829c504
+  data.tar.gz: ad93e6b640fbdb3c6f757df0c0ae433f4c79d50c209fb0bd3c0b8c84402148a9
 SHA512:
-  metadata.gz: 1ea813993a5e069434299e68eacfb1c79bcbb0161728d703dd20e3047f2699a11640c94067e22c1089e34b56398afb959843eb3d914f110878056c646402c7e8
-  data.tar.gz: 837e4866998fc01f8523768fbee6f062a3d0564932f318c27d701e826ed123a4c329df0d74449455afa1146e2de42d7fe54941aaf25e9e9061fc83dd82d87d06
+  metadata.gz: 29750ebefccf852b621847e68bffd039f3e28c63829334880416d7e8348fbd8cc5769d7f5b1cf872030d874610739ef4df90f493d9b325d8bebcfe2dd7d7b638
+  data.tar.gz: fbb6248041e00a490ccf23e62c364ce3c8ea8214f3fd4c6f07ff8df18e090702c53039e30a1b2b66f8a5e464ebf4e9162d993a0c67cd0818911449a91d168b3f

data/bin/mongo_console

@@ -4,8 +4,8 @@
 $LOAD_PATH[0, 0] = File.join(File.dirname(__FILE__), '..', 'lib')
 
 require 'mongo'
-# include the mongo namespace
-include Mongo
+# include the mongo namespace so its constants are available unqualified
+Object.include(Mongo)
 
 begin
   require 'pry'

data/lib/mongo/address/validator.rb

@@ -24,7 +24,7 @@ module Mongo
         case address_str
         when /\A\[[\d:]+\](?::(\d+))?\z/
           # ipv6 with optional port
-          if port_str = ::Regexp.last_match(1)
+          if (port_str = ::Regexp.last_match(1))
             validate_port_str!(port_str)
           end
         when %r{\A/}, /\.sock\z/

data/lib/mongo/address.rb

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

data/lib/mongo/auth/aws/conversation.rb

@@ -74,10 +74,6 @@ module Mongo
           client_first_data.to_bson.to_s
         end
 
-        def wrap_data(data)
-          BSON::Binary.new(data.to_bson.to_s)
-        end
-
         def client_nonce
           @client_nonce ||= SecureRandom.random_bytes(32)
         end

data/lib/mongo/auth/aws/credentials_retriever.rb

@@ -140,14 +140,9 @@ module Mongo
         # @raise Error::TimeoutError if credentials cannot be retrieved within
         #   the timeout defined on the operation context.
         def obtain_credentials_from_endpoints(timeout_holder = nil)
-          if (credentials = web_identity_credentials(timeout_holder)) && credentials_valid?(credentials,
-                                                                                            'Web identity token')
-            credentials
-          elsif (credentials = ecs_metadata_credentials(timeout_holder)) && credentials_valid?(credentials,
-                                                                                               'ECS task metadata')
-            credentials
-          elsif (credentials = ec2_metadata_credentials(timeout_holder)) && credentials_valid?(credentials,
-                                                                                               'EC2 instance metadata')
+          if ((credentials = web_identity_credentials(timeout_holder)) && credentials_valid?(credentials, 'Web identity token')) ||
+             ((credentials = ecs_metadata_credentials(timeout_holder)) && credentials_valid?(credentials, 'ECS task metadata')) ||
+             ((credentials = ec2_metadata_credentials(timeout_holder)) && credentials_valid?(credentials, 'EC2 instance metadata'))
             credentials
           end
         end

data/lib/mongo/auth/base.rb

@@ -102,7 +102,7 @@ module Mongo
         context = Operation::Context.new(options: {
                                            server_api: connection.options[:server_api],
                                          })
-        if server_api = context.server_api
+        if (server_api = context.server_api)
           msg = msg.maybe_add_server_api(server_api)
         end
         reply = connection.dispatch([ msg ], context)

data/lib/mongo/auth/sasl_conversation_base.rb

@@ -71,7 +71,7 @@ module Mongo
           mechanism: auth_mechanism_name,
           payload: BSON::Binary.new(payload)
         )
-        if options = client_first_message_options
+        if (options = client_first_message_options)
           # Short SCRAM conversation,
           # https://jira.mongodb.org/browse/DRIVERS-707
           doc[:options] = options

data/lib/mongo/auth/scram_conversation_base.rb

@@ -200,7 +200,7 @@ module Mongo
       # This method can be called from different conversation steps
       # depending on whether the short SCRAM conversation is used.
       def check_server_signature(payload_data)
-        return unless verifier = payload_data['v']
+        return unless (verifier = payload_data['v'])
         raise Error::InvalidSignature.new(verifier, server_signature) unless compare_digest(verifier, server_signature)
 
         @server_verified = true
@@ -281,13 +281,6 @@ module Mongo
       # @since 2.0.0
       attr_reader :iterations
 
-      # Get the data from the returned payload.
-      #
-      # @api private
-      #
-      # @since 2.0.0
-      attr_reader :payload_data
-
       # Get the server nonce from the payload.
       #
       # @api private

data/lib/mongo/auth/stringprep.rb

@@ -97,12 +97,7 @@ module Mongo
       end
 
       def normalize!(out)
-        if String.method_defined?(:unicode_normalize!)
-          out.unicode_normalize!(:nfkc)
-        else
-          require 'mongo/auth/stringprep/unicode_normalize/normalize'
-          out.replace(UnicodeNormalize.normalize(out, :nfkc))
-        end
+        out.unicode_normalize!(:nfkc)
       end
 
       def table_contains?(table, c)

data/lib/mongo/auth/user/view.rb

@@ -152,7 +152,7 @@ module Mongo
         end
 
         def execute_operation(options)
-          client.send(:with_session, options) do |session|
+          client.with_session(options) do |session|
             op = yield session
             op.execute(next_primary(nil, session), context: Operation::Context.new(client: client, session: session))
           end

data/lib/mongo/bulk_write/result_combiner.rb

@@ -92,7 +92,7 @@ module Mongo
 
       def combine_counts!(result)
         Result::FIELDS.each do |field|
-          if result.respond_to?(field) && value = result.send(field)
+          if result.respond_to?(field) && (value = result.public_send(field))
             results.merge!(field => (results[field] || 0) + value)
           end
         end
@@ -115,7 +115,7 @@ module Mongo
       end
 
       def combine_write_errors!(result)
-        if write_errors = result.aggregate_write_errors(count)
+        if (write_errors = result.aggregate_write_errors(count))
           results.merge!(
             'writeErrors' => ((results['writeErrors'] || []) << write_errors).flatten
           )
@@ -125,7 +125,7 @@ module Mongo
       end
 
       def combine_write_concern_errors!(result)
-        return unless write_concern_errors = result.aggregate_write_concern_errors(count)
+        return unless (write_concern_errors = result.aggregate_write_concern_errors(count))
 
         results['writeConcernErrors'] = (results['writeConcernErrors'] || []) +
                                         write_concern_errors

data/lib/mongo/bulk_write.rb

@@ -360,7 +360,7 @@ module Mongo
       requests_empty = true
       @requests.each do |req|
         requests_empty = false
-        if op = req.keys.first
+        if (op = req.keys.first)
           if %i[update_one update_many].include?(op)
             if (doc = maybe_first(req.dig(op, :update))) && (key = doc.keys&.first) && !key.to_s.start_with?('$')
               raise Error::InvalidUpdateDocument.new(key: key) if Mongo.validate_update_replace

data/lib/mongo/client.rb

@@ -172,7 +172,6 @@ module Mongo
         @monitoring
       end
     end
-    private :monitoring
 
     # Determine if this client is equivalent to another object.
     #
@@ -265,6 +264,11 @@ module Mongo
     # @option options [ Float ] :connect_timeout The timeout, in seconds, to
     #   attempt a connection.
     # @option options [ String ] :database The database to connect to.
+    # @option options [ true | false ] :enable_overload_retargeting Whether
+    #   the driver deprioritizes a server that returns an overload error,
+    #   reducing the likelihood of retrying on the same overloaded server.
+    #   This option works with MongoDB Atlas Server Version 9.0 and above.
+    #   Default: false.
     # @option options [ Float ] :heartbeat_frequency The interval, in seconds,
     #   for the server monitor to refresh its description via hello.
     # @option options [ Object ] :id_generator A custom object to generate ids
@@ -277,6 +281,9 @@ module Mongo
     # @option options [ String ] :log_prefix A custom log prefix to use when
     #   logging. This option is experimental and subject to change in a future
     #   version of the driver.
+    # @option options [ Integer ] :max_adaptive_retries The maximum number of
+    #   retries to attempt when the driver encounters overload errors. This
+    #   option works with MongoDB Atlas Server Version 9.0 and above. Default: 2.
     # @option options [ Integer ] :max_connecting The maximum number of
     #  connections that can be connecting simultaneously. The default is 2.
     #  This option should be increased if there are many threads that share
@@ -288,9 +295,13 @@ module Mongo
     # @option options [ Integer ] :max_pool_size The maximum size of the
     #   connection pool. Setting this option to zero creates an unlimited connection pool.
     # @option options [ Integer ] :max_read_retries The maximum number of read
-    #   retries when legacy read retries are in use.
+    #   retries when legacy read retries are in use. Deprecated: this option
+    #   only affects the legacy retry implementation, which is deprecated and
+    #   will be removed in a future version.
     # @option options [ Integer ] :max_write_retries The maximum number of write
-    #   retries when legacy write retries are in use.
+    #   retries when legacy write retries are in use. Deprecated: this option
+    #   only affects the legacy retry implementation, which is deprecated and
+    #   will be removed in a future version.
     # @option options [ Integer ] :min_pool_size The minimum size of the
     #   connection pool.
     # @option options [ true, false ] :monitoring If false is given, the
@@ -325,7 +336,9 @@ module Mongo
     #   - *:local_threshold*.
     # @option options [ Hash ] :read_concern The read concern option.
     # @option options [ Float ] :read_retry_interval The interval, in seconds,
-    #   in which reads on a mongos are retried.
+    #   in which reads on a mongos are retried. Deprecated: this option only
+    #   affects the legacy retry implementation, which is deprecated and will
+    #   be removed in a future version.
     # @option options [ Symbol ] :replica_set The name of the replica set to
     #   connect to. Servers not in this replica set will be ignored.
     # @option options [ true | false ] :retry_reads If true, modern retryable
@@ -782,10 +795,10 @@ module Mongo
     def with(new_options = nil)
       clone.tap do |client|
         opts = client.update_options(new_options || Options::Redacted.new)
-        Database.create(client)
+        client.reset_database!
         # We can't use the same cluster if some options that would affect it
         # have changed.
-        Cluster.create(client, monitoring: opts[:monitoring]) if cluster_modifying?(opts)
+        client.reset_cluster!(monitoring: opts[:monitoring]) if cluster_modifying?(opts)
       end
     end
 
@@ -841,6 +854,31 @@ module Mongo
       end
     end
 
+    # Replaces this client's database with a fresh instance built from the
+    # client's current options. Used by #with so a reconfigured client does
+    # not share its database with the client it was cloned from.
+    #
+    # @api private
+    def reset_database!
+      @database = Database.new(self, options[:database], options)
+    end
+
+    # Replaces this client's cluster with a fresh instance built from the
+    # client's current options. Used by #with so a reconfigured client does
+    # not share its cluster with the client it was cloned from.
+    #
+    # @param [ Monitoring | nil ] monitoring The monitoring instance to use
+    #   with the new cluster. If nil, a new instance of Monitoring is created.
+    #
+    # @api private
+    def reset_cluster!(monitoring: nil)
+      @cluster = Cluster.new(
+        cluster.addresses.map(&:to_s),
+        monitoring || Monitoring.new,
+        cluster_options
+      )
+    end
+
     # Get the read concern for this client.
     #
     # @example Get the client read concern.
@@ -1159,7 +1197,7 @@ module Mongo
     #
     # @api private
     def with_session(options = {})
-      # TODO: Add this back in RUBY-3174.
+      # RUBY-3174 will re-enable this guard; see #assert_not_closed.
       # assert_not_closed
 
       session = get_session(options)
@@ -1397,7 +1435,7 @@ module Mongo
         log_warn("Read concern has invalid keys: #{invalid_keys.join(',')}.") unless invalid_keys.empty?
       end
 
-      if server_api = opts[:server_api]
+      if (server_api = opts[:server_api])
         raise ArgumentError, ":server_api value must be a hash: #{server_api}" unless server_api.is_a?(Hash)
 
         extra_keys = server_api.keys - %w[version strict deprecation_errors]
@@ -1444,7 +1482,28 @@ module Mongo
     # Validates all options after they are set on the client.
     # This method is intended to catch combinations of options which are
     # not allowed.
+    # Issues a deprecation warning for each legacy retry tuning option that is
+    # explicitly set. These options only affect the legacy retry
+    # implementation, which is deprecated and will be removed in a future
+    # version. Modern retryable reads and writes (enabled by default) ignore
+    # them.
+    def deprecate_legacy_retry_options!
+      %i[max_read_retries read_retry_interval max_write_retries].each do |key|
+        next unless options.key?(key)
+
+        Mongo::Deprecations.warn(
+          "legacy_retry_option_#{key}",
+          "The :#{key} option is deprecated. It only affects the legacy retry " \
+          'implementation, which is deprecated and will be removed in a future ' \
+          'version. Modern retryable reads and writes are enabled by default ' \
+          'and do not use this option.'
+        )
+      end
+    end
+
     def validate_options!(addresses = nil, is_srv: nil)
+      deprecate_legacy_retry_options!
+
       if options[:write] && options[:write_concern] && options[:write] != options[:write_concern]
         raise ArgumentError, "If :write and :write_concern are both given, they must be identical: #{options.inspect}"
       end
@@ -1502,12 +1561,12 @@ module Mongo
       end
 
       %i[connect_timeout socket_timeout].each do |key|
-        next unless value = options[key]
+        next unless (value = options[key])
         raise ArgumentError, "#{key} must be a non-negative number: #{value}" unless value.is_a?(Numeric)
         raise ArgumentError, "#{key} must be a non-negative number: #{value}" if value < 0
       end
 
-      if value = options[:bg_error_backtrace]
+      if (value = options[:bg_error_backtrace])
         case value
         when Integer
           if value <= 0
@@ -1522,7 +1581,7 @@ module Mongo
         end
       end
 
-      if libraries = options[:wrapping_libraries]
+      if (libraries = options[:wrapping_libraries])
         unless libraries.is_a?(Array)
           raise ArgumentError, ":wrapping_libraries must be an array of hashes: #{libraries}"
         end
@@ -1684,7 +1743,7 @@ module Mongo
                                              "the read preference must be specified as a hash: { mode: #{read.inspect} }")
         end
 
-        if mode = read[:mode]
+        if (mode = read[:mode])
           mode = mode.to_sym
           unless Mongo::ServerSelector::PREFERENCES.include?(mode)
             raise Error::InvalidReadOption.new(read, "mode #{mode} is not one of recognized modes")
@@ -1694,6 +1753,17 @@ module Mongo
       true
     end
 
+    # Raises Error::ClientClosed if this client has been closed.
+    #
+    # This is the guard for RUBY-3174 (disallow closed clients from
+    # performing operations). The implementation is complete but not yet
+    # wired in: the intended call site in #with_session is currently
+    # commented out, pending that ticket. Do not delete this method or
+    # Error::ClientClosed as "unused" -- both are here deliberately.
+    #
+    # @raise [ Error::ClientClosed ] if the client has been closed.
+    #
+    # @api private
     def assert_not_closed
       return unless closed?
 

data/lib/mongo/cluster/reapers/cursor_reaper.rb

@@ -101,7 +101,7 @@ module Mongo
       #
       # @api private
       def read_scheduled_kill_specs
-        while kill_spec = @kill_spec_queue.pop(true)
+        while (kill_spec = @kill_spec_queue.pop(true))
           if @active_cursor_ids.include?(kill_spec.cursor_id)
             @to_kill[kill_spec.server_address] ||= Set.new
             @to_kill[kill_spec.server_address] << kill_spec
@@ -188,14 +188,21 @@ module Mongo
             server_api: server.options[:server_api],
             connection_global_id: kill_spec.connection_global_id,
           }
-          if connection = kill_spec.connection
-            op.execute_with_connection(connection, context: Operation::Context.new(options: options))
-            connection.connection_pool.check_in(connection)
+          if (connection = kill_spec.connection)
+            begin
+              op.execute_with_connection(connection, context: Operation::Context.new(options: options))
+            rescue Error::SocketError, Error::SocketTimeoutError, Error::ConnectionPerished
+              # Connection is dead. do_check_in will detect connection.error?
+              # and disconnect it; the pool slot becomes free for a new connection.
+            ensure
+              connection.unpin(:cursor)
+              connection.connection_pool.check_in(connection) unless connection.pinned?
+            end
           else
             op.execute(server, context: Operation::Context.new(options: options))
           end
 
-          next unless session = kill_spec.session
+          next unless (session = kill_spec.session)
 
           session.end_session if session.implicit?
         end

data/lib/mongo/cluster/sdam_flow.rb

@@ -385,8 +385,8 @@ class Mongo::Cluster
     def add_servers_from_desc(updated_desc)
       added_servers = []
       %w[hosts passives arbiters].each do |m|
-        updated_desc.send(m).each do |address_str|
-          if server = cluster.add(address_str, monitor: false)
+        updated_desc.public_send(m).each do |address_str|
+          if (server = cluster.add(address_str, monitor: false))
             added_servers << server
           end
         end
@@ -402,7 +402,7 @@ class Mongo::Cluster
     # good primary).
     def remove_servers_not_in_desc(updated_desc)
       updated_desc_address_strs = %w[hosts passives arbiters].map do |m|
-        updated_desc.send(m)
+        updated_desc.public_send(m)
       end.flatten
       servers_list.each do |server|
         next if updated_desc_address_strs.include?(address_str = server.address.to_s)
@@ -541,7 +541,7 @@ class Mongo::Cluster
     end
 
     def disconnect_servers
-      while server = @servers_to_disconnect.shift
+      while (server = @servers_to_disconnect.shift)
         if server.connected?
           # Do not publish server closed event, as this was already done
           server.disconnect!

data/lib/mongo/cluster/topology/base.rb

@@ -85,7 +85,7 @@ module Mongo
             # LST is only read from data-bearing servers
             if desc.data_bearing?
               @have_data_bearing_servers = true
-              break unless timeout = desc.logical_session_timeout
+              break unless (timeout = desc.logical_session_timeout)
 
               [ timeout, min || timeout ].min
             else

data/lib/mongo/cluster.rb

@@ -269,30 +269,6 @@ module Mongo
       start_stop_srv_monitor
     end
 
-    # Create a cluster for the provided client, for use when we don't want the
-    # client's original cluster instance to be the same.
-    #
-    # @example Create a cluster for the client.
-    #   Cluster.create(client)
-    #
-    # @param [ Client ] client The client to create on.
-    # @param [ Monitoring | nil ] monitoring. The monitoring instance to use
-    #   with the new cluster. If nil, a new instance of Monitoring will be
-    #   created.
-    #
-    # @return [ Cluster ] The cluster.
-    #
-    # @since 2.0.0
-    # @api private
-    def self.create(client, monitoring: nil)
-      cluster = Cluster.new(
-        client.cluster.addresses.map(&:to_s),
-        monitoring || Monitoring.new,
-        client.cluster_options
-      )
-      client.instance_variable_set(:@cluster, cluster)
-    end
-
     # @return [ Hash ] The options hash.
     attr_reader :options
 
@@ -324,9 +300,7 @@ module Mongo
     # @api private
     attr_reader :seeds
 
-    # @private
-    #
-    # @since 2.5.1
+    # @api private
     attr_reader :session_pool
 
     def_delegators :topology, :replica_set?, :replica_set_name, :sharded?,
@@ -802,7 +776,7 @@ module Mongo
     #
     # @since 2.5.0
     def update_cluster_time(result)
-      return unless cluster_time_doc = result.cluster_time
+      return unless (cluster_time_doc = result.cluster_time)
 
       @cluster_time_lock.synchronize do
         advance_cluster_time(cluster_time_doc)
@@ -983,6 +957,16 @@ module Mongo
       end
     end
 
+    # Forces the cluster's periodic executor to run immediately. If the cluster
+    # has no periodic executor, this method does nothing.
+    #
+    # @api private
+    def trigger_periodic_executor!
+      return unless @periodic_executor
+
+      @periodic_executor.execute
+    end
+
     private
 
     # @api private

data/lib/mongo/collection/view/aggregation/behavior.rb

@@ -85,7 +85,7 @@ module Mongo
           end
 
           def server_selector
-            @view.send(:server_selector)
+            @view.server_selector
           end
 
           def aggregate_spec(session, read_preference = nil)

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

@@ -104,10 +104,8 @@ module Mongo
 
           primary_read_preference = { mode: :primary }
           description = connection.description
-          if description.primary?
-            log_warn('Routing the Aggregation operation to the primary server')
-            primary_read_preference
-          elsif description.mongos? && !description.features.merge_out_on_secondary_enabled?
+          if description.primary? ||
+             (description.mongos? && !description.features.merge_out_on_secondary_enabled?)
             log_warn('Routing the Aggregation operation to the primary server')
             primary_read_preference
           else

data/lib/mongo/collection/view/builder/aggregation.rb

@@ -105,7 +105,7 @@ module Mongo
               raise ArgumentError, "Unknown view class: #{view}"
             end
             command[:pipeline] = pipeline
-            if read_concern = view.read_concern
+            if (read_concern = view.read_concern) && !read_concern.empty?
               command[:readConcern] = Options::Mapper.transform_values_to_strings(
                 read_concern
               )
@@ -117,12 +117,10 @@ module Mongo
 
           def batch_size_doc
             value = options[:batch_size] || view.batch_size
-            if value == 0 && write?
+            if value.nil? || (value == 0 && write?)
               {}
-            elsif value
-              { batchSize: value }
             else
-              {}
+              { batchSize: value }
             end
           end
         end

data/lib/mongo/collection/view/builder/map_reduce.rb

@@ -92,7 +92,7 @@ module Mongo
           private
 
           def write?(spec)
-            return unless out = spec[:selector][:out]
+            return unless (out = spec[:selector][:out])
 
             out.is_a?(String) ||
               (out.respond_to?(:keys) && out.keys.first.to_s.downcase != View::MapReduce::INLINE)

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

@@ -351,19 +351,24 @@ module Mongo
               # In load balanced topology, manually check out a connection
               # so it remains checked out and pinned to the cursor.
               connection = server.pool.check_out(context: context)
-              result = send_initial_query(connection, context)
-
-              start_at_operation_time = if doc = result.replies.first && result.replies.first.documents.first
-                                          doc['operationTime']
-                                        else
-                                          nil
-                                        end
-              result
+              begin
+                result = send_initial_query(connection, context)
+
+                start_at_operation_time = if (doc = result.replies.first && result.replies.first.documents.first)
+                                            doc['operationTime']
+                                          else
+                                            nil
+                                          end
+                result
+              rescue StandardError
+                server.pool.check_in(connection)
+                raise
+              end
             else
               server.with_connection do |connection|
                 result = send_initial_query(connection, context)
 
-                start_at_operation_time = if doc = result.replies.first && result.replies.first.documents.first
+                start_at_operation_time = if (doc = result.replies.first && result.replies.first.documents.first)
                                             doc['operationTime']
                                           else
                                             # The above may set @start_at_operation_time to nil

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

@@ -227,7 +227,7 @@ module Mongo
         #
         # @since 2.5.0
         def execute
-          view.send(:with_session, @options) do |session|
+          view.with_session(@options) do |session|
             write_concern = view.write_concern_with_session(session)
             context = Operation::Context.new(client: client, session: session)
             nro_write_with_retry(write_concern, context: context) do |connection, _txn_num, context|
@@ -241,7 +241,7 @@ module Mongo
         OUT_ACTIONS = %i[replace merge reduce].freeze
 
         def server_selector
-          @view.send(:server_selector)
+          @view.server_selector
         end
 
         def inline?
@@ -299,15 +299,6 @@ module Mongo
           end
         end
 
-        def fetch_query_spec
-          Builder::MapReduce.new(map_function, reduce_function, view, options).query_specification
-        end
-
-        def find_command_spec(session)
-          Builder::MapReduce.new(map_function, reduce_function, view,
-                                 options.merge(session: session)).command_specification
-        end
-
         def fetch_query_op(session)
           spec = {
             coll_name: out_collection_name,