mongo 2.5.1 → 2.5.2

data/lib/mongo/cursor.rb

@@ -206,10 +206,11 @@ module Mongo
 
     def get_more_operation
       if @server.features.find_command_enabled?
-        Operation::Commands::GetMore.new(Builder::GetMoreCommand.new(self, @session).specification)
+        spec = Builder::GetMoreCommand.new(self, @session).specification
       else
-        Operation::Read::GetMore.new(Builder::OpGetMore.new(self).specification)
+        spec = Builder::OpGetMore.new(self).specification
       end
+      Operation::GetMore.new(spec)
     end
 
     def kill_cursors
@@ -227,11 +228,7 @@ module Mongo
     end
 
     def kill_cursors_operation
-      if @server.features.find_command_enabled?
-        Operation::Commands::Command.new(kill_cursors_op_spec)
-      else
-        Operation::KillCursors.new(kill_cursors_op_spec)
-      end
+      Operation::KillCursors.new(kill_cursors_op_spec)
     end
 
     def kill_cursors_op_spec

data/lib/mongo/database.rb

@@ -156,7 +156,7 @@ module Mongo
       preference = ServerSelector.get(opts[:read] || ServerSelector::PRIMARY)
       server = preference.select_server(cluster)
       client.send(:with_session, opts) do |session|
-        Operation::Commands::Command.new({
+        Operation::Command.new({
           :selector => operation.dup,
           :db_name => name,
           :read => preference,
@@ -180,7 +180,7 @@ module Mongo
     def drop(options = {})
       operation = { :dropDatabase => 1 }
       client.send(:with_session, options) do |session|
-        Operation::Commands::DropDatabase.new({
+        Operation::DropDatabase.new({
           selector: operation,
           db_name: name,
           write_concern: write_concern,

data/lib/mongo/database/view.rb

@@ -111,7 +111,7 @@ module Mongo
       end
 
       def initial_query_op(session)
-        Operation::Commands::CollectionsInfo.new(collections_info_spec(session))
+        Operation::CollectionsInfo.new(collections_info_spec(session))
       end
 
       def send_initial_query(server, session)

data/lib/mongo/grid/stream/write.rb

@@ -143,7 +143,7 @@ module Mongo
           # @since 2.1.0
           def abort
             fs.chunks_collection.find({ :files_id => file_id }, @options).delete_many
-            @open = false || true
+            (@open = false) || true
           end
 
           private

data/lib/mongo/index/view.rb

@@ -157,7 +157,7 @@ module Mongo
                   session: session
                  }
           spec[:write_concern] = write_concern if server.features.collation_enabled?
-          Operation::Write::Command::CreateIndex.new(spec).execute(server)
+          Operation::CreateIndex.new(spec).execute(server)
         end
       end
 
@@ -232,7 +232,7 @@ module Mongo
                  }
           server = next_primary
           spec[:write_concern] = write_concern if server.features.collation_enabled?
-          Operation::Write::Command::DropIndex.new(spec).execute(server)
+          Operation::DropIndex.new(spec).execute(server)
         end
       end
 
@@ -251,7 +251,7 @@ module Mongo
       end
 
       def initial_query_op(session)
-        Operation::Commands::Indexes.new(indexes_spec(session))
+        Operation::Indexes.new(indexes_spec(session))
       end
 
       def limit; -1; end

data/lib/mongo/operation.rb

@@ -1,30 +1,44 @@
-# Copyright (C) 2014-2017 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 'forwardable'
+require 'mongo/operation/result'
+
+require 'mongo/operation/shared/executable'
+require 'mongo/operation/shared/read_preference_supported'
+require 'mongo/operation/shared/bypass_document_validation'
+require 'mongo/operation/shared/write_concern_supported'
+require 'mongo/operation/shared/limited'
+require 'mongo/operation/shared/sessions_supported'
+require 'mongo/operation/shared/causal_consistency_supported'
+require 'mongo/operation/shared/write'
+require 'mongo/operation/shared/idable'
+require 'mongo/operation/shared/specifiable'
+require 'mongo/operation/shared/object_id_generator'
 
+require 'mongo/operation/command'
+require 'mongo/operation/aggregate'
 require 'mongo/operation/result'
-require 'mongo/operation/executable'
-require 'mongo/operation/specifiable'
-require 'mongo/operation/limited'
-require 'mongo/operation/object_id_generator'
-require 'mongo/operation/uses_command_op_msg'
-require 'mongo/operation/causally_consistent'
-require 'mongo/operation/read_preference'
-require 'mongo/operation/takes_write_concern'
-require 'mongo/operation/read'
-require 'mongo/operation/write'
-require 'mongo/operation/commands'
+require 'mongo/operation/collections_info'
+require 'mongo/operation/list_collections'
+require 'mongo/operation/update'
+require 'mongo/operation/insert'
+require 'mongo/operation/delete'
+require 'mongo/operation/count'
+require 'mongo/operation/distinct'
+require 'mongo/operation/create'
+require 'mongo/operation/drop'
+require 'mongo/operation/drop_database'
+require 'mongo/operation/get_more'
+require 'mongo/operation/find'
+require 'mongo/operation/explain'
 require 'mongo/operation/kill_cursors'
+require 'mongo/operation/indexes'
+require 'mongo/operation/map_reduce'
+require 'mongo/operation/users_info'
+require 'mongo/operation/parallel_scan'
+require 'mongo/operation/create_user'
+require 'mongo/operation/update_user'
+require 'mongo/operation/remove_user'
+require 'mongo/operation/create_index'
+require 'mongo/operation/drop_index'
 
 module Mongo
   module Operation

data/lib/mongo/operation/aggregate.rb

@@ -0,0 +1,53 @@
+# Copyright (C) 2015-2018 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/aggregate/command'
+require 'mongo/operation/aggregate/op_msg'
+require 'mongo/operation/aggregate/result'
+
+module Mongo
+  module Operation
+    
+    # A MongoDB aggregate operation.
+    #
+    # @note An aggregate operation can behave like a read and return a
+    #   result set, or can behave like a write operation and
+    #   output results to a user-specified collection.
+    #
+    # @api private
+    #
+    # @since 2.0.0
+    class Aggregate
+      include Specifiable
+
+      # Execute the operation.
+      # 
+      # @example
+      #   operation.execute(server)
+      # 
+      # @param [ Mongo::Server ] server The server to send the operation to.
+      # 
+      # @return [ Mongo::Operation::Aggregate::Result ] The operation result.
+      # 
+      # @since 2.0.0
+      def execute(server)
+        if server.features.op_msg_enabled?
+          OpMsg.new(spec).execute(server)
+        else
+          Command.new(spec).execute(server)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,59 @@
+# Copyright (C) 2018 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
+    class Aggregate
+
+      # A MongoDB aggregate operation sent as a command message.
+      #
+      # @api private
+      #
+      # @since 2.5.2
+      class Command
+        include Specifiable
+        include Executable
+        include ReadPreferenceSupported
+        include WriteConcernSupported
+        include Limited
+
+        # Execute the operation.
+        #
+        # @example
+        #   operation.execute(server)
+        #
+        # @param [ Mongo::Server ] server The server to send the operation to.
+        #
+        # @return [ Mongo::Operation::Aggregate::Result ] The operation result.
+        #
+        # @since 2.5.2
+        def execute(server)
+          result = Result.new(dispatch_message(server))
+          process_result(result, server)
+          result.validate!
+        end
+
+        private
+
+        def write_concern_supported?(server)
+          server.features.collation_enabled?
+        end
+
+        def message(server)
+          Protocol::Query.new(db_name, Database::COMMAND, command(server), options(server))
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,54 @@
+# Copyright (C) 2018 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
+    class Aggregate
+
+      # A MongoDB aggregate operation sent as an op message.
+      #
+      # @api private
+      #
+      # @since 2.5.2
+      class OpMsg
+        include Specifiable
+        include Executable
+        include SessionsSupported
+        include CausalConsistencySupported
+
+        # Execute the operation.
+        #
+        # @example
+        #   operation.execute(server)
+        #
+        # @param [ Mongo::Server ] server The server to send the operation to.
+        #
+        # @return [ Mongo::Operation::Aggregate::Result ] The operation result.
+        #
+        # @since 2.5.2
+        def execute(server)
+          result = Result.new(dispatch_message(server))
+          process_result(result, server)
+          result.validate!
+        end
+
+        private
+
+        def message(server)
+          Protocol::Msg.new(flags, options, command(server))
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,87 @@
+# Copyright (C) 2014-2018 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
+
+    # Aggregate result wrapper.
+    #
+    # @since 2.0.0
+    class Aggregate
+
+      # Defines custom behaviour of results in an aggregation context.
+      #
+      # @since 2.0.0
+      class Result < Operation::Result
+
+        # The field name for the aggregation explain information.
+        #
+        # @since 2.0.5
+        EXPLAIN = 'stages'.freeze
+
+        # The legacy field name for the aggregation explain information.
+        #
+        # @since 2.0.5
+        EXPLAIN_LEGACY = 'serverPipeline'.freeze
+
+        # Get the cursor id for the result.
+        #
+        # @example Get the cursor id.
+        #   result.cursor_id
+        #
+        # @note Even though the wire protocol has a cursor_id field for all
+        #   messages of type reply, it is always zero when using the
+        #   aggregation framework and must be retrieved from the cursor
+        #   document itself. Wahnsinn!
+        #
+        # @return [ Integer ] The cursor id.
+        #
+        # @since 2.0.0
+        def cursor_id
+          cursor_document ? cursor_document[CURSOR_ID] : 0
+        end
+
+        # Get the documents for the aggregation result. This is either the
+        # first document's 'result' field, or if a cursor option was selected
+        # it is the 'firstBatch' field in the 'cursor' field of the first
+        # document returned.
+        #
+        # @example Get the documents.
+        #   result.documents
+        #
+        # @return [ Array<BSON::Document> ] The documents.
+        #
+        # @since 2.0.0
+        def documents
+          reply.documents[0][RESULT] || explain_document ||
+              cursor_document[FIRST_BATCH]
+        end
+
+        private
+
+        def explain_document
+          first_document[EXPLAIN] || first_document[EXPLAIN_LEGACY]
+        end
+
+        def cursor_document
+          @cursor_document ||= reply.documents[0][CURSOR]
+        end
+
+        def first_document
+          @first_document ||= reply.documents[0]
+        end
+      end
+    end
+  end
+end

data/lib/mongo/operation/collections_info.rb

@@ -0,0 +1,62 @@
+# Copyright (C) 2015-2018 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/collections_info/result'
+
+module Mongo
+  module Operation
+
+    # A MongoDB operation to get info on all collections in a given database.
+    #
+    # @api private
+    #
+    # @since 2.0.0
+    class CollectionsInfo
+      include Specifiable
+      include Executable
+      include ReadPreferenceSupported
+
+      # Execute the operation.
+      #
+      # @example
+      #   operation.execute(server)
+      #
+      # @param [ Mongo::Server ] server The server to send the operation to.
+      #
+      # @return [ Mongo::Operation::CollectionsInfo::Result,
+      #           Mongo::Operation::ListCollections::Result ] The operation result.
+      #
+      # @since 2.0.0
+      def execute(server)
+        if server.features.list_collections_enabled?
+          return Operation::ListCollections.new(spec).execute(server)
+        end
+
+        result = Result.new(dispatch_message(server))
+        process_result(result, server)
+        result.validate!
+      end
+
+      private
+
+      def selector(server)
+        { :name => { '$not' => /system\.|\$/ } }
+      end
+
+      def message(server)
+        Protocol::Query.new(db_name, Database::NAMESPACES, command(server), options(server))
+      end
+    end
+  end
+end