mongo 2.1.0.beta → 2.1.0.rc0

data/lib/mongo/operation/kill_cursors.rb

@@ -27,13 +27,13 @@ module Mongo
     #
     # @since 2.0.0
     class KillCursors
-      include Executable
       include Specifiable
+      include Executable
 
       private
 
-      def message
-        Protocol::KillCursors.new(cursor_ids)
+      def message(context)
+        Protocol::KillCursors.new(coll_name, db_name, cursor_ids)
       end
     end
   end

data/lib/mongo/operation/read.rb

@@ -14,7 +14,3 @@
 
 require 'mongo/operation/read/query'
 require 'mongo/operation/read/get_more'
-require 'mongo/operation/read/indexes'
-require 'mongo/operation/read/list_indexes'
-require 'mongo/operation/read/list_collections'
-require 'mongo/operation/read/collections_info'

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

@@ -38,32 +38,12 @@ module Mongo
       #
       # @since 2.0.0
       class GetMore
-        include Executable
         include Specifiable
-
-        # Execute the get more operation.
-        #
-        # @example Execute the operation.
-        #   operation.execute(context)
-        #
-        # @param [ Mongo::Server::Context ] context The context for this operation.
-        #
-        # @return [ Result ] The operation response, if there is one.
-        #
-        # @since 2.0.0
-        def execute(context)
-          execute_message(context)
-        end
+        include Executable
 
         private
 
-        def execute_message(context)
-          context.with_connection do |connection|
-            Result.new(connection.dispatch([ message ]))
-          end
-        end
-
-        def message
+        def message(context)
           Protocol::GetMore.new(db_name, coll_name, to_return, cursor_id)
         end
       end

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

@@ -38,31 +38,12 @@ module Mongo
       #
       # @since 2.0.0
       class Query
-        include Executable
         include Specifiable
-        include ReadPreferrable
-
-        # Execute the operation.
-        # The context gets a connection on which the operation
-        # is sent in the block.
-        #
-        # @param [ Server::Context ] context The context for this operation.
-        #
-        # @return [ Result ] The operation response, if there is one.
-        #
-        # @since 2.0.0
-        def execute(context)
-          execute_message(context)
-        end
+        include Executable
+        include ReadPreference
 
         private
 
-        def execute_message(context)
-          context.with_connection do |connection|
-            Result.new(connection.dispatch([ message(context) ])).validate!
-          end
-        end
-
         def query_coll
           coll_name
         end

data/lib/mongo/operation/{read_preferrable.rb → read_preference.rb}

@@ -15,10 +15,11 @@
 module Mongo
   module Operation
 
-    # Adds behaviour for queries that need to take read preference into account.
+    # Adds behaviour for updating the options and the selector for operations
+    # that need to take read preference into account.
     #
     # @since 2.0.0
-    module ReadPreferrable
+    module ReadPreference
 
       # The constant for slave ok flags.
       #

data/lib/mongo/operation/specifiable.rb

@@ -410,6 +410,30 @@ module Mongo
       def read
         @spec[READ] || ServerSelector.get
       end
+
+      # Whether the operation is ordered.
+      #
+      # @example Get the ordered value, true is the default.
+      #   specifiable.ordered?
+      #
+      # @return [ true, false ] Whether the operation is ordered.
+      #
+      # @since 2.1.0
+      def ordered?
+        !!(@spec.fetch(:ordered, true))
+      end
+
+      # The namespace, consisting of the db name and collection name.
+      #
+      # @example Get the namespace.
+      #   specifiable.namespace
+      #
+      # @return [ String ] The namespace.
+      #
+      # @since 2.1.0
+      def namespace
+        "#{db_name}.#{coll_name}"
+      end
     end
   end
 end

data/lib/mongo/operation/write.rb

@@ -12,7 +12,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+require 'mongo/operation/write/write_command_enabled'
 require 'mongo/operation/write/idable'
+require 'mongo/operation/write/gle'
 require 'mongo/operation/write/bulk'
 require 'mongo/operation/write/delete'
 require 'mongo/operation/write/insert'

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

@@ -12,6 +12,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'mongo/operation/write/bulk/bulk_delete'
-require 'mongo/operation/write/bulk/bulk_insert'
-require 'mongo/operation/write/bulk/bulk_update'
+require 'mongo/operation/write/bulk/mergable'
+require 'mongo/operation/write/bulk/legacy_mergable'
+require 'mongo/operation/write/bulk/bulkable'
+require 'mongo/operation/write/bulk/delete'
+require 'mongo/operation/write/bulk/insert'
+require 'mongo/operation/write/bulk/update'

data/lib/mongo/operation/write/bulk/bulkable.rb

@@ -0,0 +1,82 @@
+# Copyright (C) 2014-2015 MongoDB, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+module Mongo
+  module Operation
+    module Write
+      module Bulk
+
+        # Provides common behavior for bulk write operations.
+        # Note that #validate! is not called on operation results because they are merged
+        # at a higher level.
+        #
+        # @since 2.1.0
+        module Bulkable
+
+          # Execute the bulk operation.
+          #
+          # @example Execute the operation.
+          #   operation.execute(context)
+          #
+          # @param [ Mongo::Server::Context ] context The context for this operation.
+          #
+          # @return [ Result ] The operation result.
+          #
+          # @since 2.0.0
+          def execute(context)
+            if context.features.write_command_enabled?
+              execute_write_command(context)
+            else
+              execute_message(context)
+            end
+          end
+
+          private
+
+          def execute_message(context)
+            replies = messages.map do |m|
+              context.with_connection do |connection|
+                result = self.class::LegacyResult.new(connection.dispatch([ m, gle ].compact, operation_id))
+                if stop_sending?(result)
+                  return result
+                else
+                  result.reply
+                end
+              end
+            end
+            self.class::LegacyResult.new(replies.compact.empty? ? nil : replies)
+          end
+
+          def stop_sending?(result)
+            ordered? && !result.successful?
+          end
+
+          def gle
+            gle_message = ( ordered? && write_concern.get_last_error.nil? ) ?
+                Mongo::WriteConcern.get(:w => 1).get_last_error :
+                write_concern.get_last_error
+            if gle_message
+              Protocol::Query.new(
+                  db_name,
+                  Database::COMMAND,
+                  gle_message,
+                  options.merge(limit: -1)
+              )
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/mongo/operation/write/bulk/delete.rb

@@ -0,0 +1,71 @@
+# Copyright (C) 2014-2015 MongoDB, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+require 'mongo/operation/write/bulk/delete/result'
+
+module Mongo
+  module Operation
+    module Write
+      module Bulk
+
+        # A MongoDB bulk delete operation.
+        #
+        # @note If a server with version >= 2.5.5 is selected, a write command
+        #   operation will be created and sent instead.
+        #
+        # @example Create the delete operation.
+        #   Write::Bulk::Delete.new({
+        #     :deletes => [{ :q => { :foo => 1 }, :limit => 1 }],
+        #     :db_name => 'test',
+        #     :coll_name => 'test_coll',
+        #     :write_concern => write_concern
+        #   })
+        #
+        # Initialization:
+        #   param [ Hash ] spec The specifications for the delete.
+        #
+        #   option spec :deletes [ Array ] The delete documents.
+        #   option spec :db_name [ String ] The name of the database on which
+        #     the delete should be executed.
+        #   option spec :coll_name [ String ] The name of the collection on which
+        #     the delete should be executed.
+        #   option spec :write_concern [ Mongo::WriteConcern ] The write concern
+        #     for this operation.
+        #   option spec :ordered [ true, false ] Whether the operations should be
+        #     executed in order.
+        #   option spec :options [Hash] Options for the command, if it ends up being a
+        #     write command.
+        #
+        # @since 2.0.0
+        class Delete
+          include Bulkable
+          include Specifiable
+
+          private
+
+          def execute_write_command(context)
+            Result.new(Command::Delete.new(spec).execute(context))
+          end
+
+          def messages
+            deletes.collect do |del|
+              opts = ( del[:limit] || 0 ) <= 0 ? {} : { :flags => [ :single_remove ] }
+              Protocol::Delete.new(db_name, coll_name, del[:q], opts)
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/mongo/operation/write/bulk/delete/result.rb

@@ -0,0 +1,74 @@
+# Copyright (C) 2014-2015 MongoDB, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+module Mongo
+  module Operation
+    module Write
+      module Bulk
+        class Delete
+
+          # Defines custom behaviour of results when deleting.
+          #
+          # @since 2.0.0
+          class Result < Operation::Result
+            include Mergable
+
+            # The aggregate number of deleted docs reported in the replies.
+            #
+            # @since 2.0.0
+            REMOVED = 'nRemoved'.freeze
+
+            # Gets the number of documents deleted.
+            #
+            # @example Get the deleted count.
+            #   result.n_removed
+            #
+            # @return [ Integer ] The number of documents deleted.
+            #
+            # @since 2.0.0
+            def n_removed
+              return 0 unless acknowledged?
+              @replies.reduce(0) do |n, reply|
+                n += reply.documents.first[N]
+              end
+            end
+          end
+
+          # Defines custom behaviour of results when deleting.
+          # For server versions < 2.5.5 (that don't use write commands).
+          #
+          # @since 2.0.0
+          class LegacyResult < Operation::Result
+            include LegacyMergable
+
+            # Gets the number of documents deleted.
+            #
+            # @example Get the deleted count.
+            #   result.n_removed
+            #
+            # @return [ Integer ] The number of documents deleted.
+            #
+            # @since 2.0.0
+            def n_removed
+              return 0 unless acknowledged?
+              @replies.reduce(0) do |n, reply|
+                n += reply.documents.first[N]
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/mongo/operation/write/bulk/insert.rb

@@ -0,0 +1,96 @@
+# Copyright (C) 2014-2015 MongoDB, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+require 'mongo/operation/write/bulk/insert/result'
+
+module Mongo
+  module Operation
+    module Write
+      module Bulk
+
+        # A MongoDB bulk insert operation.
+        # This class should only be used by the Bulk API.
+        #
+        # @note If a server with version >= 2.5.5 is being used, a write command
+        #   operation will be created and sent instead.
+        #
+        # @example Create the new insert operation.
+        #   Write::BulkInsert.new({
+        #     :documents => [{ :foo => 1 }],
+        #     :db_name => 'test',
+        #     :coll_name => 'test_coll',
+        #     :write_concern => write_concern,
+        #     :ordered => false
+        #   })
+        #
+        # Initialization:
+        #   param [ Hash ] spec The specifications for the insert.
+        #
+        #   option spec :documents [ Array ] The documents to insert.
+        #   option spec :db_name [ String ] The name of the database.
+        #   option spec :coll_name [ String ] The name of the collection.
+        #   option spec :write_concern [ Mongo::WriteConcern ] The write concern.
+        #   option spec :ordered [ true, false ] Whether the operations should be
+        #     executed in order.
+        #   option spec :options [ Hash ] Options for the command, if it ends up being a
+        #     write command.
+        #
+        # @since 2.0.0
+        class Insert
+          include Bulkable
+          include Specifiable
+          include Idable
+
+          private
+
+          def execute_write_command(context)
+            command_spec = spec.merge(:documents => ensure_ids(documents))
+            Result.new(Command::Insert.new(command_spec).execute(context), @ids)
+          end
+
+          def execute_message(context)
+            replies = []
+            messages.map do |m|
+              context.with_connection do |connection|
+                result = LegacyResult.new(connection.dispatch([ m, gle ].compact, operation_id), @ids)
+                replies << result.reply
+                if stop_sending?(result)
+                  return LegacyResult.new(replies, @ids)
+                end
+              end
+            end
+            LegacyResult.new(replies.compact.empty? ? nil : replies, @ids)
+          end
+
+          def messages
+            if ordered? || gle
+              documents.collect do |doc|
+                Protocol::Insert.new(db_name, coll_name, ensure_ids([ doc ]), spec)
+              end
+            else
+              [
+                Protocol::Insert.new(
+                  db_name,
+                  coll_name,
+                  ensure_ids(documents),
+                  spec.merge({ :flags => [:continue_on_error] })
+                )
+              ]
+            end
+          end
+        end
+      end
+    end
+  end
+end