mongo 2.0.0.beta → 2.0.0.rc

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

@@ -21,8 +21,7 @@ module Mongo
         #
         # @since 2.0.0
         class Result < Operation::Result
-
-          attr_reader :indexes
+          include BulkMergable
 
           # The number of modified docs field in the result.
           #
@@ -87,65 +86,6 @@ module Mongo
             end
           end
 
-          # Set a list of indexes of the operations creating this result.
-          #
-          # @example Set the list of indexes.
-          #   result.set_indexes([1,2,3])
-          #
-          # @return [ self ] The result.
-          #
-          # @since 2.0.0
-          def set_indexes(indexes)
-            @indexes = indexes
-            self
-          end
-
-          # Aggregate the write errors returned from this result.
-          #
-          # @example Aggregate the write errors.
-          #   result.aggregate_write_errors
-          #
-          # @return [ Array ] The aggregate write errors.
-          #
-          # @since 2.0.0
-          def aggregate_write_errors
-            @replies.reduce(nil) do |errors, reply|
-              if write_errors = reply.documents.first['writeErrors']
-                errors ||= []
-                write_errors.each do |write_error|
-                  errors << write_error.merge('index' => indexes[write_error['index']])
-                end
-              end
-              errors
-            end
-          end
-
-          # Aggregate the write concern errors returned from this result.
-          #
-          # @example Aggregate the write concern errors.
-          #   result.aggregate_write_concern_errors
-          #
-          # @return [ Array ] The aggregate write concern errors.
-          #
-          # @since 2.0.0
-          def aggregate_write_concern_errors
-            @replies.each_with_index.reduce(nil) do |errors, (reply, i)|
-              if write_concern_errors = reply.documents.first['writeConcernError']
-                errors ||= []
-                write_concern_errors.each do |write_concern_error|
-                  errors << write_concern_error.merge('index' =>
-                                                      indexes[write_concern_error['index']])
-                end
-              elsif reply.documents.first['errmsg']
-                errors ||= []
-                errors << { 'errmsg' => reply.documents.first['errmsg'],
-                            'index' => indexes[i],
-                            'code' => reply.documents.first['code'] }
-              end
-              errors
-            end
-          end
-
           private
 
           def upsert?(reply)
@@ -158,8 +98,7 @@ module Mongo
         #
         # @since 2.0.0
         class LegacyResult < Operation::Result
-
-          attr_reader :indexes
+          include LegacyBulkMergable
 
           # The updated existing field in the result.
           #
@@ -204,87 +143,8 @@ module Mongo
             end
           end
 
-          # Gets the number of documents modified.
-          #
-          # @example Get the modified count.
-          #   result.n_modified
-          #
-          # @return [ nil ] nil for legacy.
-          #
-          # @since 2.0.0
-          def n_modified
-            nil
-          end
-
-          # Set a list of indexes of the operations creating this result.
-          #
-          # @example Set the list of indexes.
-          #   result.set_indexes([1,2,3])
-          #
-          # @return [ self ] The result.
-          #
-          # @since 2.0.0
-          def set_indexes(indexes)
-            @indexes = indexes
-            self
-          end
-
-          # Aggregate the write errors returned from this result.
-          #
-          # @example Aggregate the write errors.
-          #   result.aggregate_write_errors
-          #
-          # @return [ Array ] The aggregate write errors.
-          #
-          # @since 2.0.0
-          def aggregate_write_errors
-            @replies.each_with_index.reduce(nil) do |errors, (reply, i)|
-              if reply_write_errors?(reply)
-                errors ||= []
-                errors << { 'errmsg' => reply.documents.first[Error::ERROR],
-                            'index' => indexes[i],
-                            'code' => reply.documents.first[Error::CODE] }
-              end
-              errors
-            end
-          end
-
-          # Aggregate the write concern errors returned from this result.
-          #
-          # @example Aggregate the write concern errors.
-          #   result.aggregate_write_concern_errors
-          #
-          # @return [ Array ] The aggregate write concern errors.
-          #
-          # @since 2.0.0
-          def aggregate_write_concern_errors
-            @replies.each_with_index.reduce(nil) do |errors, (reply, i)|
-              # @todo: only raise if error is timeout
-              if error = reply_write_errors?(reply)
-                errors ||= []
-                note = reply.documents.first['wnote'] || reply.documents.first['jnote']
-                if note
-                  code = reply.documents.first['code'] || "bad value constant"
-                  error_string = "#{code}: #{note}"
-                else
-                  code = reply.documents.first['code'] || "unknown error constant"
-                  error_string = "#{code}: #{error}"
-                end
-                errors << { 'errmsg' => error_string,
-                            'index' => indexes[i],
-                            'code' => code }
-              end
-              errors
-            end
-          end
-
           private
 
-          def reply_write_errors?(reply)
-            reply.documents.first[Error::ERROR] ||
-              reply.documents.first[Error::ERRMSG]
-          end
-
           def upsert?(reply)
             !reply.documents.first[UPDATED_EXISTING]
           end

data/lib/mongo/operation/command.rb

@@ -41,7 +41,7 @@ module Mongo
       # @example Execute the operation.
       #   operation.execute(context)
       #
-      # @params [ Mongo::Server::Context ] The context for this operation.
+      # @param [ Server::Context ] context The context for this operation.
       #
       # @return [ Result ] The operation result.
       #

data/lib/mongo/operation/executable.rb

@@ -25,7 +25,7 @@ module Mongo
       # The context gets a connection on which the operation
       # is sent in the block.
       #
-      # @params [ Mongo::Server::Context ] The context for this operation.
+      # @param [ Mongo::Server::Context ] context The context for this operation.
       #
       # @return [ Result ] The operation response, if there is one.
       #
@@ -39,7 +39,7 @@ module Mongo
       # Merge this operation with another operation, returning a new one.
       # Requires that the collection and database of the two ops are the same.
       #
-      # @params[ Object ] The other operation.
+      # @param[ Object ] The other operation.
       #
       # @return [ Object ] A new operation merging this one and another.
       #
@@ -67,7 +67,7 @@ module Mongo
       # If an operation including this module doesn't define #merge!, neither
       # #merge nor #merge! will be allowed.
       #
-      # @params[ Object ] The other operation.
+      # @param[ Object ] The other operation.
       #
       # @raise [ Exception ] Merging is not supported for this operation.
       #

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

@@ -91,8 +91,6 @@ module Mongo
           # @example Validate the result.
           #   result.validate!
           #
-          # @param [ Hash ] spec The spec used to run the command.
-          #
           # @return [ Result ] Self if successful.
           #
           # @since 2.0.0

data/lib/mongo/operation/map_reduce.rb

@@ -57,7 +57,7 @@ module Mongo
       # @example Execute the operation.
       #   operation.execute(context)
       #
-      # @params [ Mongo::Server::Context ] The context for this operation.
+      # @param [ Server::Context ] context The context for this operation.
       #
       # @return [ Result ] The operation response, if there is one.
       #

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

@@ -37,7 +37,7 @@ module Mongo
         # The context gets a connection on which the operation
         # is sent in the block.
         #
-        # @params [ Mongo::Server::Context ] The context for this operation.
+        # @param [ Mongo::Server::Context ] context The context for this operation.
         #
         # @return [ Result ] The operation response, if there is one.
         #

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

@@ -45,7 +45,7 @@ module Mongo
         # @example Execute the operation.
         #   operation.execute(context)
         #
-        # @params [ Mongo::Server::Context ] The context for this operation.
+        # @param [ Mongo::Server::Context ] context The context for this operation.
         #
         # @return [ Result ] The operation response, if there is one.
         #

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

@@ -38,7 +38,7 @@ module Mongo
         # The context gets a connection on which the operation
         # is sent in the block.
         #
-        # @params [ Mongo::Server::Context ] The context for this operation.
+        # @param [ Mongo::Server::Context ] context The context for this operation.
         #
         # @return [ Result ] The indexes operation response.
         #

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

@@ -43,7 +43,7 @@ module Mongo
         # @example Execute the operation.
         #   operation.execute(context)
         #
-        # @params [ Mongo::Server::Context ] The context for this operation.
+        # @param [ Mongo::Server::Context ] context The context for this operation.
         #
         # @return [ Result ] The operation result.
         #

data/lib/mongo/operation/read/list_indexes.rb

@@ -45,7 +45,7 @@ module Mongo
         # @example Execute the operation.
         #   operation.execute(context)
         #
-        # @params [ Mongo::Server::Context ] The context for this operation.
+        # @param [ Mongo::Server::Context ] context The context for this operation.
         #
         # @return [ Result ] The operation result.
         #

data/lib/mongo/operation/read/query.rb

@@ -45,7 +45,7 @@ module Mongo
         # The context gets a connection on which the operation
         # is sent in the block.
         #
-        # @params [ Mongo::Server::Context ] The context for this operation.
+        # @param [ Server::Context ] context The context for this operation.
         #
         # @return [ Result ] The operation response, if there is one.
         #

data/lib/mongo/operation/specifiable.rb

@@ -61,11 +61,16 @@ module Mongo
       # @since 2.0.0
       CURSOR_IDS = :cursor_ids.freeze
 
-      # The field for indexes.
+      # The field for an index.
       #
       # @since 2.0.0
       INDEX = :index.freeze
 
+      # The field for multiple indexes.
+      #
+      # @since 2.0.0
+      INDEXES = :indexes.freeze
+
       # The field for index names.
       #
       # @since 2.0.0
@@ -255,6 +260,18 @@ module Mongo
         spec[INDEX_NAME]
       end
 
+      # Get the indexes from the specification.
+      #
+      # @example Get the index specifications.
+      #   specifiable.indexes
+      #
+      # @return [ Hash ] The index specifications.
+      #
+      # @since 2.0.0
+      def indexes
+        spec[INDEXES]
+      end
+
       # Create the new specifiable operation.
       #
       # @example Create the new specifiable operation.

data/lib/mongo/operation/write.rb

@@ -12,6 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+require 'mongo/operation/write/bulk_mergable'
+require 'mongo/operation/write/legacy_bulk_mergable'
 require 'mongo/operation/write/delete'
 require 'mongo/operation/write/bulk_delete'
 require 'mongo/operation/write/insert'

data/lib/mongo/operation/write/bulk_delete.rb

@@ -49,14 +49,13 @@ module Mongo
       class BulkDelete
         include Executable
         include Specifiable
-        include Batchable
 
         # Execute the delete operation.
         #
         # @example Execute the operation.
         #   operation.execute(context)
         #
-        # @params [ Mongo::Server::Context ] The context for this operation.
+        # @param [ Mongo::Server::Context ] context The context for this operation.
         #
         # @return [ Result ] The result.
         #
@@ -74,7 +73,7 @@ module Mongo
         # @example Set a write concern.
         #   new_op = operation.write_concern(:w => 2)
         #
-        # @params [ Hash ] The write concern.
+        # @param [ Hash ] wc The write concern.
         #
         # @since 2.0.0
         def write_concern(wc = nil)
@@ -85,19 +84,10 @@ module Mongo
           end
         end
 
-        # The index of each delete as it was added onto the bulk object.
-        #
-        # @params [ Integer ] The index of each delete.
-        #
-        # @since 2.0.0
-        def indexes
-          @spec[:indexes] || []
-        end
-
         private
 
         def execute_write_command(context)
-          Result.new(Command::Delete.new(spec).execute(context)).set_indexes(indexes)
+          Result.new(Command::Delete.new(spec).execute(context))
         end
 
         def execute_message(context)
@@ -105,13 +95,13 @@ module Mongo
             context.with_connection do |connection|
               result = LegacyResult.new(connection.dispatch([ m, gle ].compact))
               if stop_sending?(result)
-                return result.set_indexes(indexes)
+                return result
               else
                 result.reply
               end
             end
           end
-          LegacyResult.new(replies.compact.empty? ? nil : replies).set_indexes(indexes)
+          LegacyResult.new(replies.compact.empty? ? nil : replies)
         end
 
         def stop_sending?(result)
@@ -137,10 +127,6 @@ module Mongo
           end
         end
 
-        def batch_key
-          DELETES
-        end
-
         def initialize_copy(original)
           @spec = original.spec.dup
           @spec[DELETES] = original.spec[DELETES].clone

data/lib/mongo/operation/write/bulk_insert.rb

@@ -46,16 +46,14 @@ module Mongo
       #
       # @since 2.0.0
       class BulkInsert
-        include Executable
         include Specifiable
-        include Batchable
 
         # Execute the bulk insert operation.
         #
         # @example Execute the operation.
         #   operation.execute(context)
         #
-        # @params [ Mongo::Server::Context ] The context for this operation.
+        # @param [ Mongo::Server::Context ] context The context for this operation.
         #
         # @return [ Result ] The operation result.
         #
@@ -68,35 +66,10 @@ module Mongo
           end
         end
 
-        # Set the write concern on this operation.
-        #
-        # @example Set a write concern.
-        #   new_op = operation.write_concern(:w => 2)
-        #
-        # @params [ Hash ] The write concern.
-        #
-        # @since 2.0.0
-        def write_concern(wc = nil)
-          if wc
-            self.class.new(spec.merge(write_concern: WriteConcern.get(wc)))
-          else
-            spec[WRITE_CONCERN]
-          end
-        end
-
-        # The index of each document as it was added onto the bulk object.
-        #
-        # @params [ Integer ] The index of each document.
-        #
-        # @since 2.0.0
-        def indexes
-          @spec[:indexes] || []
-        end
-
         private
 
         def execute_write_command(context)
-          Result.new(Command::Insert.new(spec).execute(context)).set_indexes(indexes)
+          Result.new(Command::Insert.new(spec).execute(context))
         end
 
         def execute_message(context)
@@ -106,11 +79,11 @@ module Mongo
               result = LegacyResult.new(connection.dispatch([ m, gle ].compact))
               replies << result.reply
               if stop_sending?(result)
-                return LegacyResult.new(replies).set_indexes(indexes)
+                return LegacyResult.new(replies)
               end
             end
           end
-          LegacyResult.new(replies.compact.empty? ? nil : replies).set_indexes(indexes)
+          LegacyResult.new(replies.compact.empty? ? nil : replies)
         end
 
         def stop_sending?(result)
@@ -122,6 +95,11 @@ module Mongo
           @spec.fetch(:ordered, true)
         end
 
+        def initialize_copy(original)
+          @spec = original.spec.dup
+          @spec[DOCUMENTS] = original.spec[DOCUMENTS].clone
+        end
+
         def gle
           gle_message = ( ordered? && write_concern.get_last_error.nil? ) ?
                            Mongo::WriteConcern.get(:w => 1).get_last_error :
@@ -136,15 +114,6 @@ module Mongo
           end
         end
 
-        def batch_key
-          DOCUMENTS
-        end
-
-        def initialize_copy(original)
-          @spec = original.spec.dup
-          @spec[DOCUMENTS] = original.spec[DOCUMENTS].dup
-        end
-
         def messages
           if ordered? || gle
             documents.collect do |doc|