mongo 2.11.0.rc0 → 2.11.0

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

@@ -129,7 +129,9 @@ module Mongo
           cmd[:new] = !!(opts[:return_document] && opts[:return_document] == :after)
           cmd[:upsert] = opts[:upsert] if opts[:upsert]
           cmd[:maxTimeMS] = max_time_ms if max_time_ms
-          cmd[:bypassDocumentValidation] = !!opts[:bypass_document_validation]
+          if opts[:bypass_document_validation]
+            cmd[:bypassDocumentValidation] = true
+          end
 
           value = with_session(opts) do |session|
             applied_write_concern = applied_write_concern(opts[:session])

data/lib/mongo/cursor/builder/get_more_command.rb

@@ -57,7 +57,10 @@ module Mongo
         private
 
         def get_more_command
-          command = { :getMore => cursor.id, :collection => collection_name }
+          command = {
+            :getMore => BSON::Int64.new(cursor.id),
+            :collection => collection_name,
+          }
           command[:batchSize] = batch_size.abs if batch_size && batch_size != 0
           # If the max_await_time_ms option is set, then we set maxTimeMS on
           # the get more command.

data/lib/mongo/cursor/builder/kill_cursors_command.rb

@@ -54,7 +54,10 @@ module Mongo
         private
 
         def kill_cursors_command
-          { :killCursors => collection_name, :cursors => [ cursor.id ] }
+          {
+            killCursors: collection_name,
+            cursors: [ BSON::Int64.new(cursor.id) ],
+          }
         end
 
         class << self
@@ -65,11 +68,19 @@ module Mongo
           #   KillCursorsCommand.update_cursors(spec, ids)
           #
           # @return [ Hash ] The specification.
-          # @return [ Array ] The ids to update with.
+          # @return [ Array<Integer> ] The ids to update with.
           #
           # @since 2.3.0
           def update_cursors(spec, ids)
-            spec[:selector].merge!(cursors: spec[:selector][:cursors] & ids)
+            # Ruby 2.5+ can & BSON::Int64 instances.
+            # Ruby 2.4 and earlier cannot.
+            # Convert stored ids to Ruby integers for compatibility with
+            # older Rubies.
+            ids = get_cursors_list(spec) & ids
+            ids = ids.map do |cursor_id|
+              BSON::Int64.new(cursor_id)
+            end
+            spec[:selector].merge!(cursors: ids)
           end
 
           # Get the list of cursor ids from a spec generated by this Builder.
@@ -77,11 +88,11 @@ module Mongo
           # @example Get the list of cursor ids.
           #   KillCursorsCommand.cursors(spec)
           #
-          # @return [ Hash ] The specification.
+          # @return [ Array<Integer> ] The cursor ids.
           #
           # @since 2.3.0
           def get_cursors_list(spec)
-            spec[:selector][:cursors]
+            spec[:selector][:cursors].map(&:value)
           end
         end
       end

data/lib/mongo/cursor/builder/op_get_more.rb

@@ -50,9 +50,9 @@ module Mongo
         def specification
           {
             :to_return => to_return,
-            :cursor_id => cursor.id,
+            :cursor_id => BSON::Int64.new(cursor.id),
             :db_name   => database.name,
-            :coll_name => collection_name
+            :coll_name => collection_name,
           }
         end
       end

data/lib/mongo/cursor/builder/op_kill_cursors.rb

@@ -48,7 +48,11 @@ module Mongo
         #
         # @since 2.2.0
         def specification
-          { :coll_name => collection_name, :db_name => database.name, :cursor_ids => [ cursor.id ] }
+          {
+            coll_name: collection_name,
+            db_name: database.name,
+            cursor_ids: [ BSON::Int64.new(cursor.id) ],
+          }
         end
 
         class << self
@@ -59,11 +63,19 @@ module Mongo
           #   OpKillCursors.update_cursors(spec, ids)
           #
           # @return [ Hash ] The specification.
-          # @return [ Array ] The ids to update with.
+          # @return [ Array<Integer> ] The ids to update with.
           #
           # @since 2.3.0
           def update_cursors(spec, ids)
-            spec.merge!(cursor_ids: spec[:cursor_ids] & ids)
+            # Ruby 2.5+ can & BSON::Int64 instances.
+            # Ruby 2.4 and earlier cannot.
+            # Convert stored ids to Ruby integers for compatibility with
+            # older Rubies.
+            ids = get_cursors_list(spec) & ids
+            ids = ids.map do |cursor_id|
+              BSON::Int64.new(cursor_id)
+            end
+            spec.merge!(cursor_ids: ids)
           end
 
           # Get the list of cursor ids from a spec generated by this Builder.
@@ -71,11 +83,11 @@ module Mongo
           # @example Get the list of cursor ids.
           #   OpKillCursors.cursors(spec)
           #
-          # @return [ Hash ] The specification.
+          # @return [ Array<Integer> ] The cursor ids.
           #
           # @since 2.3.0
           def get_cursors_list(spec)
-            spec[:cursor_ids]
+            spec[:cursor_ids].map(&:value)
           end
         end
       end

data/lib/mongo/error/operation_failure.rb

@@ -80,15 +80,15 @@ module Mongo
       # @since 2.6.0
       attr_reader :code_name
 
-      # Whether the error is a retryable error according to the legacy read retry
-      # logic.
+      # Whether the error is a retryable error according to the legacy
+      # read retry logic.
       #
       # @return [ true, false ]
       #
       # @since 2.1.1
       # @deprecated
       def retryable?
-        RETRY_MESSAGES.any?{ |m| message.include?(m) }
+        write_retryable? || RETRY_MESSAGES.any?{ |m| message.include?(m) }
       end
 
       # Whether the error is a retryable error according to the modern retryable

data/lib/mongo/monitoring/command_log_subscriber.rb

@@ -54,7 +54,8 @@ module Mongo
       # @since 2.1.0
       def started(event)
         if logger.debug?
-          log_debug("#{prefix(event)} | STARTED | #{format_command(event.command)}")
+          log_debug("#{prefix(event, connection_id: event.connection_id)} | " +
+            "STARTED | #{format_command(event.command)}")
         end
       end
 
@@ -96,8 +97,9 @@ module Mongo
         end
       end
 
-      def prefix(event)
-        "#{event.address.to_s} | #{event.database_name}.#{event.command_name}"
+      def prefix(event, connection_id: nil)
+        "[#{event.request_id}] #{event.address.to_s}#{connection_id && " ##{connection_id}"} | " +
+          "#{event.database_name}.#{event.command_name}"
       end
 
       def truncate(command)

data/lib/mongo/monitoring/event/command_started.rb

@@ -45,6 +45,12 @@ module Mongo
         # @api private
         attr_reader :socket_object_id
 
+        # @return [ Integer ] The ID for the connection over which the command
+        #   is sent.
+        #
+        # @api private
+        attr_reader :connection_id
+
         # Create the new event.
         #
         # @example Create the event.
@@ -59,7 +65,7 @@ module Mongo
         # @since 2.1.0
         # @api private
         def initialize(command_name, database_name, address, request_id,
-          operation_id, command, socket_object_id = nil
+          operation_id, command, socket_object_id: nil, connection_id: nil
         )
           @command_name = command_name.to_s
           @database_name = database_name
@@ -68,6 +74,7 @@ module Mongo
           @operation_id = operation_id
           @command = redacted(command_name, command)
           @socket_object_id = socket_object_id
+          @connection_id = connection_id
         end
 
         # Create the event from a wire protocol message payload.
@@ -83,7 +90,9 @@ module Mongo
         #
         # @since 2.1.0
         # @api private
-        def self.generate(address, operation_id, payload, socket_object_id = nil)
+        def self.generate(address, operation_id, payload,
+          socket_object_id: nil, connection_id: nil
+        )
           new(
             payload[:command_name],
             payload[:database_name],
@@ -91,7 +100,8 @@ module Mongo
             payload[:request_id],
             operation_id,
             payload[:command],
-            socket_object_id,
+            socket_object_id: socket_object_id,
+            connection_id: connection_id,
           )
         end
 

data/lib/mongo/monitoring/publishable.rb

@@ -44,11 +44,13 @@ module Mongo
 
       private
 
-      def command_started(address, operation_id, payload, socket_object_id = nil)
+      def command_started(address, operation_id, payload,
+        socket_object_id: nil, connection_id: nil
+      )
         monitoring.started(
           Monitoring::COMMAND,
           Event::CommandStarted.generate(address, operation_id, payload,
-            socket_object_id)
+            socket_object_id: socket_object_id, connection_id: connection_id)
         )
       end
 

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

@@ -26,6 +26,7 @@ module Mongo
         include Executable
         include Limited
         include ReadPreferenceSupported
+        include WriteConcernSupported
 
         private
 

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

@@ -26,6 +26,7 @@ module Mongo
         include Executable
         include Limited
         include ReadPreferenceSupported
+        include WriteConcernSupported
 
         private
 

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

@@ -25,6 +25,7 @@ module Mongo
         include Specifiable
         include Executable
         include Limited
+        include WriteConcernSupported
 
         private
 

data/lib/mongo/protocol/get_more.rb

@@ -110,6 +110,7 @@ module Mongo
         # The get more constant.
         #
         # @since 2.2.0
+        # @deprecated
         GET_MORE = 'getMore'.freeze
 
         # @return [ String ] collection The name of the collection.
@@ -148,7 +149,7 @@ module Mongo
         # @since 2.1.0
         def command
           document = BSON::Document.new
-          document.store(GET_MORE, cursor_id)
+          document.store('getMore', BSON::Int64.new(cursor_id))
           document.store(Message::BATCH_SIZE, number_to_return)
           document.store(Message::COLLECTION, collection)
           document

data/lib/mongo/protocol/kill_cursors.rb

@@ -52,7 +52,7 @@ module Mongo
           command_name: 'killCursors',
           database_name: @database,
           command: upconverter.command,
-          request_id: request_id
+          request_id: request_id,
         )
       end
 
@@ -85,16 +85,6 @@ module Mongo
       # @since 2.1.0
       class Upconverter
 
-        # The kill cursors constant.
-        #
-        # @since 2.2.0
-        KILL_CURSORS = 'killCursors'.freeze
-
-        # The cursors constant.
-        #
-        # @since 2.2.0
-        CURSORS = 'cursors'.freeze
-
         # @return [ String ] collection The name of the collection.
         attr_reader :collection
 
@@ -125,8 +115,11 @@ module Mongo
         # @since 2.1.0
         def command
           document = BSON::Document.new
-          document.store(KILL_CURSORS, collection)
-          document.store(CURSORS, cursor_ids)
+          document.store('killCursors', collection)
+          store_ids = cursor_ids.map do |cursor_id|
+            BSON::Int64.new(cursor_id)
+          end
+          document.store('cursors', store_ids)
           document
         end
       end

data/lib/mongo/protocol/serializers.rb

@@ -102,13 +102,16 @@ module Mongo
       # Serializes and de-serializes one 32-bit integer.
       module Int32
 
-        # Serializes a fixnum to a 4-byte 32-bit integer
+        # Serializes a number to a 32-bit integer
         #
         # @param buffer [ String ] Buffer to receive the serialized Int32.
-        # @param value [ Fixnum ] 32-bit integer to be serialized.
+        # @param value [ Integer | BSON::Int32 ] 32-bit integer to be serialized.
         #
         # @return [String] Buffer with serialized value.
         def self.serialize(buffer, value, validating_keys = BSON::Config.validating_keys?)
+          if value.is_a?(BSON::Int32)
+            value = value.value
+          end
           buffer.put_int32(value)
         end
 
@@ -127,13 +130,16 @@ module Mongo
       # Serializes and de-serializes one 64-bit integer.
       module Int64
 
-        # Serializes a fixnum to an 8-byte 64-bit integer
+        # Serializes a number to a 64-bit integer
         #
         # @param buffer [ String ] Buffer to receive the serialized Int64.
-        # @param value [ Fixnum ] 64-bit integer to be serialized.
+        # @param value [ Integer | BSON::Int64 ] 64-bit integer to be serialized.
         #
         # @return [ String ] Buffer with serialized value.
         def self.serialize(buffer, value, validating_keys = BSON::Config.validating_keys?)
+          if value.is_a?(BSON::Int64)
+            value = value.value
+          end
           buffer.put_int64(value)
         end
 

data/lib/mongo/retryable.rb

@@ -333,7 +333,7 @@ module Mongo
         retry
       rescue Error::OperationFailure => e
         e.add_note("attempt #{attempt + 1}")
-        if cluster.sharded? && e.retryable? && !(session && session.in_transaction?)
+        if e.retryable? && !(session && session.in_transaction?)
           if attempt > client.max_read_retries
             raise e
           end

data/lib/mongo/server/connection.rb

@@ -186,7 +186,7 @@ module Mongo
 
         begin
           handshake!(socket)
-          pending_connection = PendingConnection.new(socket, @server, monitoring, options)
+          pending_connection = PendingConnection.new(socket, @server, monitoring, options.merge(id: id))
           authenticate!(pending_connection)
         rescue Exception
           socket.close
@@ -362,7 +362,11 @@ module Mongo
 
       def authenticate!(pending_connection)
         if options[:user] || options[:auth_mech]
-          user = Auth::User.new(Options::Redacted.new(:auth_mech => default_mechanism).merge(options))
+          user_options = Options::Redacted.new(:auth_mech => default_mechanism).merge(options)
+          if user_options[:auth_mech] == :mongodb_x509
+            user_options[:auth_source] = '$external'
+          end
+          user = Auth::User.new(user_options)
           @server.handle_auth_failure! do
             begin
               Auth.get(user).login(pending_connection)

data/lib/mongo/server/connection_base.rb

@@ -96,7 +96,8 @@ module Mongo
         buffer = serialize(message)
         ensure_connected do |socket|
           operation_id = Monitoring.next_operation_id
-          command_started(address, operation_id, message.payload, socket.object_id)
+          command_started(address, operation_id, message.payload,
+            socket_object_id: socket.object_id, connection_id: id)
           start = Time.now
           result = nil
           begin

data/lib/mongo/server/monitor.rb

@@ -204,7 +204,7 @@ module Mongo
             connection.ismaster
           end
           if exc
-            log_debug("Error running ismaster on #{server.address}: #{exc.message}")
+            log_debug("Error running ismaster on #{server.address}: #{exc.class}: #{exc.message}")
             if monitoring.monitoring?
               monitoring.failed(
                 Monitoring::SERVER_HEARTBEAT,

data/lib/mongo/server/pending_connection.rb

@@ -26,8 +26,14 @@ module Mongo
         @options = options
         @server = server
         @monitoring = monitoring
+        @id = options[:id]
       end
 
+      # @return [ Integer ] The ID for the connection. This is the same ID
+      #   as that of the regular Connection object for which this
+      #   PendingConnection instance was created.
+      attr_reader :id
+
       def ensure_connected
         yield @socket
       end

data/lib/mongo/socket/ssl.rb

@@ -112,7 +112,7 @@ module Mongo
 
       def verify_hostname?
         @verify_hostname ||=
-         # If ssl_verify_hostname is not present, disable only if ssl_verify is
+          # If ssl_verify_hostname is not present, disable only if ssl_verify is
           # explicitly set to false.
           if options[:ssl_verify_hostname].nil?
             options[:ssl_verify] != false

data/lib/mongo/uri.rb

@@ -241,7 +241,10 @@ module Mongo
     #
     # @since 2.0.0
     def client_options
-      opts = default_client_options.merge(uri_options)
+      opts = uri_options.tap do |opts|
+        opts[:database] = @database if @database
+      end
+
       @user ? opts.merge(credentials) : opts
     end
 
@@ -442,35 +445,6 @@ module Mongo
       decode(string) if string.length > 0
     end
 
-    def default_client_options
-      opts = Options::Redacted.new(database: database)
-
-      if @uri_options[:auth_mech] || @user
-        opts[:auth_source] = default_auth_source
-      end
-
-      if @uri_options[:auth_mech] == :gssapi
-        opts[:auth_mech_properties] = default_auth_mech_properties
-      end
-
-      opts
-    end
-
-    def default_auth_mech_properties
-      { service_name: 'mongodb' }
-    end
-
-    def default_auth_source
-      case @uri_options[:auth_mech]
-      when :gssapi, :mongodb_x509
-        :external
-      when :plain
-        @database || :external
-      else 
-        @database || Database::ADMIN
-      end
-    end
-
     def raise_invalid_error!(details)
       raise Error::InvalidURI.new(@string, details, FORMAT)
     end
@@ -544,7 +518,7 @@ module Mongo
     uri_option 'connect', :connect, type: :symbol
 
     # Auth Options
-    uri_option 'authsource', :auth_source, :type => :auth_source
+    uri_option 'authsource', :auth_source
     uri_option 'authmechanism', :auth_mech, :type => :auth_mech
     uri_option 'authmechanismproperties', :auth_mech_properties, :type => :auth_mech_props
 
@@ -632,16 +606,6 @@ module Mongo
       merge_uri_option(target, value, strategy[:name])
     end
 
-    # Auth source transformation, either db string or :external.
-    #
-    # @param value [String] Authentication source.
-    #
-    # @return [String] If auth source is database name.
-    # @return [:external] If auth source is external authentication.
-    def auth_source(value)
-      value == '$external' ? :external : value
-    end
-
     # Authentication mechanism transformation.
     #
     # @param value [String] The authentication mechanism.