mongo 2.5.3 → 2.6.0

data/lib/mongo/operation/create_index/op_msg.rb

@@ -26,6 +26,15 @@ module Mongo
         include Executable
         include SessionsSupported
 
+        def execute(server)
+          result = Result.new(dispatch_message(server))
+          process_result(result, server)
+          result.validate!
+        rescue Mongo::Error::SocketError => e
+          e.send(:add_label, Mongo::Error::TRANSIENT_TRANSACTION_ERROR_LABEL) if session.in_transaction?
+          raise e
+        end
+
         private
 
         def selector(server)

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

@@ -30,7 +30,7 @@ module Mongo
         private
 
         def selector(server)
-          { :createUser => user.name, :digestPassword => false }.merge(user.spec)
+          { :createUser => user.name }.merge(user.spec)
         end
 
         def message(server)

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

@@ -26,10 +26,19 @@ module Mongo
         include Executable
         include SessionsSupported
 
+        def execute(server)
+          result = Result.new(dispatch_message(server))
+          process_result(result, server)
+          result.validate!
+        rescue Mongo::Error::SocketError => e
+          e.send(:add_label, Mongo::Error::TRANSIENT_TRANSACTION_ERROR_LABEL) if session.in_transaction?
+          raise e
+        end
+
         private
 
         def selector(server)
-          { :createUser => user.name, :digestPassword => false }.merge(user.spec)
+          { :createUser => user.name }.merge(user.spec)
         end
 
         def message(server)

data/lib/mongo/operation/delete/op_msg.rb

@@ -40,6 +40,9 @@ module Mongo
         def execute(server)
           result = Result.new(dispatch_message(server))
           process_result(result, server)
+        rescue Mongo::Error::SocketError => e
+          e.send(:add_label, Mongo::Error::TRANSIENT_TRANSACTION_ERROR_LABEL) if session.in_transaction?
+          raise e
         end
 
         private

data/lib/mongo/operation/distinct/op_msg.rb

@@ -27,6 +27,15 @@ module Mongo
         include SessionsSupported
         include CausalConsistencySupported
 
+        def execute(server)
+          result = Result.new(dispatch_message(server))
+          process_result(result, server)
+          result.validate!
+        rescue Mongo::Error::SocketError => e
+          e.send(:add_label, Mongo::Error::TRANSIENT_TRANSACTION_ERROR_LABEL) if session.in_transaction?
+          raise e
+        end
+
         private
 
         def message(server)

data/lib/mongo/operation/drop/op_msg.rb

@@ -26,6 +26,15 @@ module Mongo
         include Executable
         include SessionsSupported
 
+        def execute(server)
+          result = Result.new(dispatch_message(server))
+          process_result(result, server)
+          result.validate!
+        rescue Mongo::Error::SocketError => e
+          e.send(:add_label, Mongo::Error::TRANSIENT_TRANSACTION_ERROR_LABEL) if session.in_transaction?
+          raise e
+        end
+
         private
 
         def message(server)

data/lib/mongo/operation/drop_database/op_msg.rb

@@ -26,6 +26,15 @@ module Mongo
         include Executable
         include SessionsSupported
 
+        def execute(server)
+          result = Result.new(dispatch_message(server))
+          process_result(result, server)
+          result.validate!
+        rescue Mongo::Error::SocketError => e
+          e.send(:add_label, Mongo::Error::TRANSIENT_TRANSACTION_ERROR_LABEL) if session.in_transaction?
+          raise e
+        end
+
         private
 
         def message(server)

data/lib/mongo/operation/drop_index/op_msg.rb

@@ -26,6 +26,15 @@ module Mongo
         include Executable
         include SessionsSupported
 
+        def execute(server)
+          result = Result.new(dispatch_message(server))
+          process_result(result, server)
+          result.validate!
+        rescue Mongo::Error::SocketError => e
+          e.send(:add_label, Mongo::Error::TRANSIENT_TRANSACTION_ERROR_LABEL) if session.in_transaction?
+          raise e
+        end
+
         private
 
         def selector(server)

data/lib/mongo/operation/explain/op_msg.rb

@@ -41,6 +41,9 @@ module Mongo
           result = Result.new(dispatch_message(server))
           process_result(result, server)
           result.validate!
+        rescue Mongo::Error::SocketError => e
+          e.send(:add_label, Mongo::Error::TRANSIENT_TRANSACTION_ERROR_LABEL) if session.in_transaction?
+          raise e
         end
 
         private

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

@@ -46,6 +46,9 @@ module Mongo
           result = Result.new(dispatch_message(server))
           process_result(result, server)
           result.validate!
+         rescue Mongo::Error::SocketError => e
+          e.send(:add_label, Mongo::Error::TRANSIENT_TRANSACTION_ERROR_LABEL) if session.in_transaction?
+          raise e
         end
 
         private

data/lib/mongo/operation/get_more.rb

@@ -20,7 +20,7 @@ require 'mongo/operation/get_more/result'
 module Mongo
   module Operation
 
-    # A MongoDB getmore operation.
+    # A MongoDB getMore operation.
     #
     # @api private
     #

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

@@ -16,7 +16,7 @@ module Mongo
   module Operation
     class GetMore
 
-      # A MongoDB getmore operation sent as a command message.
+      # A MongoDB getMore operation sent as a command message.
       #
       # @api private
       #

data/lib/mongo/operation/get_more/legacy.rb

@@ -16,7 +16,7 @@ module Mongo
   module Operation
     class GetMore
 
-      # A MongoDB getmore operation sent as a legacy wire protocol message.
+      # A MongoDB getMore operation sent as a legacy wire protocol message.
       #
       # @api private
       #

data/lib/mongo/operation/get_more/op_msg.rb

@@ -45,6 +45,9 @@ module Mongo
           result = Result.new(dispatch_message(server))
           process_result(result, server)
           result.validate!
+        rescue Mongo::Error::SocketError => e
+          e.send(:add_label, Mongo::Error::TRANSIENT_TRANSACTION_ERROR_LABEL) if session.in_transaction?
+          raise e
         end
 
         private

data/lib/mongo/operation/indexes/op_msg.rb

@@ -41,6 +41,9 @@ module Mongo
           result = Result.new(dispatch_message(server))
           process_result(result, server)
           result.validate!
+        rescue Mongo::Error::SocketError => e
+          e.send(:add_label, Mongo::Error::TRANSIENT_TRANSACTION_ERROR_LABEL) if session.in_transaction?
+          raise e
         end
 
         private

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

@@ -78,7 +78,7 @@ module Mongo
         #
         # @since 2.0.0
         def validate!
-          !successful? ? raise(Error::OperationFailure.new(parser.message, self)) : self
+          !successful? ? raise_operation_failure : self
         end
 
         private

data/lib/mongo/operation/insert/bulk_result.rb

@@ -32,13 +32,43 @@ module Mongo
         # @example Instantiate the result.
         #   Result.new(replies, inserted_ids)
         #
-        # @param [ Protocol::Message ] replies The wire protocol replies.
+        # @param [ Array<Protocol::Message> | nil ] replies The wire protocol replies, if any.
         # @param [ Array<Object> ] ids The ids of the inserted documents.
         #
         # @since 2.0.0
         def initialize(replies, ids)
           @replies = [*replies] if replies
-          @inserted_ids = ids
+          if replies && replies.first && (doc = replies.first.documents.first)
+            if errors = doc['writeErrors']
+              # some documents were potentially inserted
+              bad_indices = {}
+              errors.map do |error|
+                bad_indices[error['index']] = true
+              end
+              @inserted_ids = []
+              ids.each_with_index do |id, index|
+                if bad_indices[index].nil?
+                  @inserted_ids << id
+                end
+              end
+            # I don't know if acknowledged? check here is necessary,
+            # as best as I can tell it doesn't hurt
+            elsif acknowledged? && successful?
+              # We have a reply and the reply is successful and the
+              # reply has no writeErrors - everything got inserted
+              @inserted_ids = ids
+            else
+              # We have a reply and the reply is not successful and
+              # it has no writeErrors - nothing got inserted.
+              # If something got inserted the reply will be not successful
+              # but will have writeErrors
+              @inserted_ids = []
+            end
+          else
+            # I don't think we should ever get here but who knows,
+            # make this behave as old drivers did
+            @inserted_ids = ids
+          end
         end
 
         # Gets the number of documents inserted.

data/lib/mongo/operation/insert/op_msg.rb

@@ -41,6 +41,9 @@ module Mongo
         def execute(server)
           result = Result.new(dispatch_message(server), @ids)
           process_result(result, server)
+        rescue Mongo::Error::SocketError => e
+          e.send(:add_label, Mongo::Error::TRANSIENT_TRANSACTION_ERROR_LABEL) if session.in_transaction?
+          raise e
         end
 
         private

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

@@ -34,7 +34,7 @@ module Mongo
         # @example Instantiate the result.
         #   Result.new(replies, inserted_ids)
         #
-        # @param [ Protocol::Message ] replies The wire protocol replies.
+        # @param [ Array<Protocol::Message> | nil ] replies The wire protocol replies, if any.
         # @param [ Array<Object> ] ids The ids of the inserted documents.
         #
         # @since 2.0.0

data/lib/mongo/operation/kill_cursors/op_msg.rb

@@ -26,6 +26,15 @@ module Mongo
         include Executable
         include SessionsSupported
 
+        def execute(server)
+          result = Result.new(dispatch_message(server))
+          process_result(result, server)
+          result.validate!
+        rescue Mongo::Error::SocketError => e
+          e.send(:add_label, Mongo::Error::TRANSIENT_TRANSACTION_ERROR_LABEL) if session.in_transaction?
+          raise e
+        end
+
         private
 
         def message(server)

data/lib/mongo/operation/list_collections/op_msg.rb

@@ -40,6 +40,9 @@ module Mongo
           result = Result.new(dispatch_message(server))
           process_result(result, server)
           result.validate!
+        rescue Mongo::Error::SocketError => e
+          e.send(:add_label, Mongo::Error::TRANSIENT_TRANSACTION_ERROR_LABEL) if session.in_transaction?
+          raise e
         end
 
         private

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

@@ -74,7 +74,11 @@ module Mongo
         #
         # @since 2.0.0
         def validate!
-          !successful? ? raise(Error::OperationFailure.new(parser.message, self)) : self
+          if successful?
+            self
+          else
+            raise(Error::OperationFailure.new(parser.message, self))
+          end
         end
 
         private

data/lib/mongo/operation/map_reduce/op_msg.rb

@@ -41,6 +41,9 @@ module Mongo
           result = Result.new(dispatch_message(server))
           process_result(result, server)
           result.validate!
+        rescue Mongo::Error::SocketError => e
+          e.send(:add_label, Mongo::Error::TRANSIENT_TRANSACTION_ERROR_LABEL) if session.in_transaction?
+          raise e
         end
 
         private

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

@@ -103,7 +103,7 @@ module Mongo
         #
         # @since 2.0.0
         def validate!
-          documents.nil? ? raise(Error::OperationFailure.new(parser.message, self)) : self
+          documents.nil? ? raise_operation_failure : self
         end
 
         # Get the cursor id.

data/lib/mongo/operation/parallel_scan/op_msg.rb

@@ -41,6 +41,9 @@ module Mongo
           result = Result.new(dispatch_message(server))
           process_result(result, server)
           result.validate!
+        rescue Mongo::Error::SocketError => e
+          e.send(:add_label, Mongo::Error::TRANSIENT_TRANSACTION_ERROR_LABEL) if session.in_transaction?
+          raise e
         end
 
         private

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

@@ -26,6 +26,15 @@ module Mongo
         include Executable
         include SessionsSupported
 
+        def execute(server)
+          result = Result.new(dispatch_message(server))
+          process_result(result, server)
+          result.validate!
+        rescue Mongo::Error::SocketError => e
+          e.send(:add_label, Mongo::Error::TRANSIENT_TRANSACTION_ERROR_LABEL) if session.in_transaction?
+          raise e
+        end
+
         private
 
         def selector(server)

data/lib/mongo/operation/result.rb

@@ -64,6 +64,18 @@ module Mongo
       # @since 2.2.0
       RESULT = 'result'.freeze
 
+      # Initialize a new result.
+      #
+      # @example Instantiate the result.
+      #   Result.new(replies)
+      #
+      # @param [ Protocol::Reply ] replies The wire protocol replies.
+      #
+      # @since 2.0.0
+      def initialize(replies)
+        @replies = [ *replies ] if replies
+      end
+
       # @return [ Array<Protocol::Reply> ] replies The wrapped wire protocol replies.
       attr_reader :replies
 
@@ -151,18 +163,6 @@ module Mongo
         documents.each(&block)
       end
 
-      # Initialize a new result.
-      #
-      # @example Instantiate the result.
-      #   Result.new(replies)
-      #
-      # @param [ Protocol::Reply ] replies The wire protocol replies.
-      #
-      # @since 2.0.0
-      def initialize(replies)
-        @replies = [ *replies ] if replies
-      end
-
       # Get the pretty formatted inspection of the result.
       #
       # @example Inspect the result.
@@ -172,7 +172,7 @@ module Mongo
       #
       # @since 2.0.0
       def inspect
-        "#<Mongo::Operation::Result:#{object_id} documents=#{documents}>"
+        "#<#{self.class.name}:0x#{object_id} documents=#{documents}>"
       end
 
       # Get the first reply from the result.
@@ -237,6 +237,11 @@ module Mongo
       #
       # @since 2.1.0
       def ok?
+        # first_document[OK] is a float, and the server can return
+        # ok as a BSON int32, BSON int64 or a BSON double.
+        # The number 1 is exactly representable in a float, hence
+        # 1.0 == 1 is going to perform correctly all of the time
+        # (until the server returns something other than 1 for success, that is)
         first_document[OK] == 1
       end
 
@@ -255,8 +260,16 @@ module Mongo
       #
       # @since 2.0.0
       def validate!
-        !successful? ? raise(Error::OperationFailure.new(parser.message, self)) : self
+        !successful? ? raise_operation_failure : self
+      end
+
+      def raise_operation_failure
+        raise Error::OperationFailure.new(
+          parser.message,
+          self,
+          :code => parser.code, :code_name => parser.code_name)
       end
+      private :raise_operation_failure
 
       # Get the number of documents written by the server.
       #

data/lib/mongo/operation/shared/executable.rb

@@ -28,6 +28,7 @@ module Mongo
 
       private
 
+      # Returns a Protocol::Message or nil
       def dispatch_message(server)
         server.with_connection do |connection|
           connection.dispatch([ message(server) ], operation_id)