mongo 2.4.3 → 2.5.0.beta

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

@@ -19,7 +19,7 @@ module Mongo
       # A MongoDB listCollections command operation.
       #
       # @example Create the listCollections command operation.
-      #   Mongo::Operation::Read::ListCollections.new(db_name: 'test')
+      #   ListCollections.new(db_name: 'test')
       #
       # @note A command is actually a query on the virtual '$cmd' collection.
       #

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

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

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

@@ -19,7 +19,7 @@ module Mongo
       # A MongoDB listIndexes command operation.
       #
       # @example Create the listIndexes command operation.
-      #   Mongo::Operation::Read::ListIndexes.new({ db_name: 'test', coll_name: 'example' })
+      #   ListIndexes.new({ db_name: 'test', coll_name: 'example' })
       #
       # @note A command is actually a query on the virtual '$cmd' collection.
       #

data/lib/mongo/operation/commands/list_indexes/result.rb

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

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

@@ -47,10 +47,14 @@ module Mongo
         private
 
         def message(server)
-          sel = update_selector_for_read_pref(selector, server)
-          sel = update_selector_for_write_concern(sel, server)
-          opts = update_options_for_slave_ok(options, server)
-          Protocol::Query.new(db_name, query_coll, sel, opts)
+          sel = update_selector_for_write_concern(selector, server)
+          if server.features.op_msg_enabled?
+            command_op_msg(server, sel, options)
+          else
+            sel = update_selector_for_read_pref(sel, server)
+            opts = update_options_for_slave_ok(options, server)
+            Protocol::Query.new(db_name, query_coll, sel, opts)
+          end
         end
       end
     end

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

@@ -104,7 +104,19 @@ module Mongo
           #
           # @since 2.0.0
           def validate!
-            documents.nil? ? raise(Error::OperationFailure.new(parser.message)) : self
+            documents.nil? ? raise(Error::OperationFailure.new(parser.message, self)) : self
+          end
+
+          # Get the cursor id.
+          #
+          # @example Get the cursor id.
+          #   result.cursor_id
+          #
+          # @return [ Integer ] Always 0 because map reduce doesn't return a cursor.
+          #
+          # @since 2.5.0
+          def cursor_id
+            0
           end
 
           private

data/lib/mongo/operation/commands/user_query.rb

@@ -19,7 +19,7 @@ module Mongo
       # A MongoDB operation to get info of a particular user in a database.
       #
       # @example Create the user query operation.
-      #   Read::UserQuery.new(:name => 'emily', :db_name => 'test-db')
+      #   UserQuery.new(:name => 'emily', :db_name => 'test-db')
       #
       # Initialization:
       #   param [ Hash ] spec The specifications for the user query operation.

data/lib/mongo/operation/commands/users_info.rb

@@ -19,7 +19,7 @@ module Mongo
       # A MongoDB operation to get info of a particular user in a database.
       #
       # @example Create the users info operation.
-      #   Read::UsersInfo.new(:name => 'emily', :db_name => 'test-db')
+      #   UsersInfo.new(:name => 'emily', :db_name => 'test-db')
       #
       # Initialization:
       #   param [ Hash ] spec The specifications for the users info operation.
@@ -38,7 +38,11 @@ module Mongo
         end
 
         def message(server)
-          Protocol::Query.new(db_name, query_coll, selector, options)
+          if server.features.op_msg_enabled?
+            command_op_msg(server, selector, options)
+          else
+            Protocol::Query.new(db_name, query_coll, selector, options)
+          end
         end
       end
     end

data/lib/mongo/operation/executable.rb

@@ -34,7 +34,10 @@ module Mongo
       def execute(server)
         server.with_connection do |connection|
           result_class = self.class.const_defined?(:Result, false) ? self.class::Result : Result
-          result_class.new(connection.dispatch([ message(server) ], operation_id)).validate!
+          result = result_class.new(connection.dispatch([ message(server) ], operation_id))
+          server.update_cluster_time(result)
+          session.process(result) if session
+          result.validate!
         end
       end
     end

data/lib/mongo/operation/read_preference.rb

@@ -20,6 +20,7 @@ module Mongo
     #
     # @since 2.0.0
     module ReadPreference
+      include UsesCommandOpMsg
 
       # The constant for slave ok flags.
       #
@@ -29,7 +30,7 @@ module Mongo
       private
 
       def update_selector_for_read_pref(sel, server)
-        if server.mongos? && read_pref = read.to_mongos
+        if read && server.mongos? && read_pref = read.to_mongos
           sel = sel[:$query] ? sel : { :$query => sel }
           sel.merge(:$readPreference => read_pref)
         else
@@ -38,7 +39,7 @@ module Mongo
       end
 
       def slave_ok?(server)
-        (server.cluster.single? && !server.mongos?) || read.slave_ok?
+        (server.cluster.single? && !server.mongos?) || (read && read.slave_ok?)
       end
 
       def update_options_for_slave_ok(opts, server)
@@ -52,9 +53,13 @@ module Mongo
       end
 
       def message(server)
-        sel = update_selector_for_read_pref(selector, server)
-        opts = update_options_for_slave_ok(options, server)
-        Protocol::Query.new(db_name, query_coll, sel, opts)
+        if server.features.op_msg_enabled?
+          command_op_msg(server, selector, options)
+        else
+          sel = update_selector_for_read_pref(selector, server)
+          opts = update_options_for_slave_ok(options, server)
+          Protocol::Query.new(db_name, query_coll, sel, opts)
+        end
       end
     end
   end

data/lib/mongo/operation/result.rb

@@ -158,7 +158,7 @@ module Mongo
       #
       # @since 2.0.0
       def initialize(replies)
-        @replies = replies.is_a?(Protocol::Reply) ? [ replies ] : replies
+        @replies = [ *replies ] if replies
       end
 
       # Get the pretty formatted inspection of the result.
@@ -253,7 +253,7 @@ module Mongo
       #
       # @since 2.0.0
       def validate!
-        !successful? ? raise(Error::OperationFailure.new(parser.message)) : self
+        !successful? ? raise(Error::OperationFailure.new(parser.message, self)) : self
       end
 
       # Get the number of documents written by the server.
@@ -273,6 +273,30 @@ module Mongo
       end
       alias :n :written_count
 
+      # Get the operation time reported in the server response.
+      #
+      # @example Get the operation time.
+      #   result.operation_time
+      #
+      # @return [ Object ] The operation time value.
+      #
+      # @since 2.5.0
+      def operation_time
+        first_document && first_document[OPERATION_TIME]
+      end
+
+      # Get the cluster time reported in the server response.
+      #
+      # @example Get the cluster time.
+      #   result.cluster_time
+      #
+      # @return [ BSON::Document ] The cluster time document.
+      #
+      # @since 2.5.0
+      def cluster_time
+        first_document && first_document[CLUSTER_TIME]
+      end
+
       private
 
       def aggregate_returned_count

data/lib/mongo/operation/specifiable.rb

@@ -476,7 +476,7 @@ module Mongo
       #
       # @since 2.0.0
       def read
-        @read ||= ServerSelector.get(@spec[READ] || ServerSelector::PRIMARY)
+        @read ||= ServerSelector.get(spec[READ]) if spec[READ]
       end
 
       # Whether the operation is ordered.
@@ -502,6 +502,18 @@ module Mongo
       def namespace
         "#{db_name}.#{coll_name}"
       end
+
+      # The session to use for the operation.
+      #
+      # @example Get the session.
+      #   specifiable.session
+      #
+      # @return [ Session ] The session.
+      #
+      # @since 2.5.0
+      def session
+        @spec[:session]
+      end
     end
   end
 end

data/lib/mongo/operation/uses_command_op_msg.rb

@@ -0,0 +1,47 @@
+# Copyright (C) 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.
+
+module Mongo
+  module Operation
+
+    # A command that uses OP_MSG, with the document as payload type 0.
+    #
+    # @since 2.5.0
+    module UsesCommandOpMsg
+
+      private
+
+      READ_PREFERENCE = '$readPreference'.freeze
+
+      def add_cluster_time!(selector, server)
+        if cluster_time = server.mongos? && server.cluster_time
+          selector[CLUSTER_TIME] = cluster_time
+        end
+      end
+
+      def unacknowledged_write?
+        write_concern && write_concern.get_last_error.nil?
+      end
+
+      def command_op_msg(server, selector, options)
+        add_cluster_time!(selector, server)
+        selector[Protocol::Msg::DATABASE_IDENTIFIER] = db_name
+        selector[READ_PREFERENCE] = read.to_doc if read
+        session.add_id!(selector) if session
+        flags = unacknowledged_write? ? [:more_to_come] : [:none]
+        Protocol::Msg.new(flags, options, selector)
+      end
+    end
+  end
+end

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

@@ -36,7 +36,10 @@ module Mongo
           # @since 2.0.0
           def execute(server)
             if server.features.write_command_enabled?
-              execute_write_command(server)
+              result = execute_write_command(server)
+              server.update_cluster_time(result)
+              session.process(result) if session
+              result
             else
               execute_message(server)
             end

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

@@ -34,12 +34,12 @@ module Mongo
             # @example Instantiate the result.
             #   Result.new(replies, inserted_ids)
             #
-            # @param [ Protocol::Reply ] replies The wire protocol replies.
+            # @param [ Protocol::Message ] replies The wire protocol replies.
             # @param [ Array<Object> ] ids The ids of the inserted documents.
             #
             # @since 2.0.0
             def initialize(replies, ids)
-              @replies = replies.is_a?(Protocol::Reply) ? [ replies ] : replies
+              @replies = [ *replies ] if replies
               @inserted_ids = ids
             end
 
@@ -85,12 +85,12 @@ module Mongo
             # @example Instantiate the result.
             #   Result.new(replies, inserted_ids)
             #
-            # @param [ Protocol::Reply ] replies The wire protocol replies.
+            # @param [ Protocol::Message ] replies The wire protocol replies.
             # @param [ Array<Object> ] ids The ids of the inserted documents.
             #
             # @since 2.0.0
             def initialize(replies, ids)
-              @replies = replies.is_a?(Protocol::Reply) ? [ replies ] : replies
+              @replies = [ *replies ] if replies
               @inserted_ids = ids
             end
 

data/lib/mongo/operation/write/command/create_index.rb

@@ -31,6 +31,7 @@ module Mongo
           include Specifiable
           include Writable
           include TakesWriteConcern
+          include UsesCommandOpMsg
 
           private
 
@@ -45,7 +46,11 @@ module Mongo
 
           def message(server)
             sel = update_selector_for_write_concern(selector, server)
-            Protocol::Query.new(db_name, Database::COMMAND, sel, options)
+            if server.features.op_msg_enabled?
+              command_op_msg(server, sel, options)
+            else
+              Protocol::Query.new(db_name, Database::COMMAND, sel, options)
+            end
           end
         end
       end

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

@@ -35,6 +35,8 @@ module Mongo
 
           private
 
+          IDENTIFIER = 'deletes'.freeze
+
           # The query selector for this delete command operation.
           #
           # @return [ Hash ] The selector describing this delete operation.
@@ -42,10 +44,32 @@ module Mongo
           # @since 2.0.0
           def selector
             { delete: coll_name,
-              deletes: deletes,
-              ordered: ordered?
-            }.tap do |cmd|
-              cmd.merge!(writeConcern: write_concern.options) if write_concern
+              deletes: deletes
+            }.merge(command_options)
+          end
+
+          def op_msg(server)
+            global_args = { delete: coll_name,
+                            Protocol::Msg::DATABASE_IDENTIFIER => db_name
+                          }.merge!(command_options)
+            add_cluster_time!(global_args, server)
+            session.add_id!(global_args) if session
+
+            section = { type: 1, payload: { identifier: IDENTIFIER, sequence: deletes } }
+            flags = unacknowledged_write? ? [:more_to_come] : [:none]
+            Protocol::Msg.new(flags, {}, global_args, section)
+          end
+
+          # The wire protocol message for this write operation.
+          #
+          # @return [ Mongo::Protocol::Query ] Wire protocol message.
+          #
+          # @since 2.0.0
+          def message(server)
+            if server.features.op_msg_enabled?
+              op_msg(server)
+            else
+              Protocol::Query.new(db_name, Database::COMMAND, selector, options)
             end
           end
         end

data/lib/mongo/operation/write/command/drop_index.rb

@@ -32,6 +32,7 @@ module Mongo
           include Specifiable
           include Writable
           include TakesWriteConcern
+          include UsesCommandOpMsg
 
           private
 
@@ -46,7 +47,11 @@ module Mongo
 
           def message(server)
             sel = update_selector_for_write_concern(selector, server)
-            Protocol::Query.new(db_name, Database::COMMAND, sel, options)
+            if server.features.op_msg_enabled?
+              command_op_msg(server, sel, options)
+            else
+              Protocol::Query.new(db_name, Database::COMMAND, sel, options)
+            end
           end
         end
       end

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

@@ -34,29 +34,33 @@ module Mongo
 
           private
 
-          # The query selector for this insert command operation.
-          #
-          # @return [ Hash ] The selector describing this insert operation.
-          #
-          # @since 2.0.0
+          IDENTIFIER = 'documents'.freeze
+
           def selector
             { insert: coll_name,
-              documents: documents,
-              ordered: ordered?
-            }.tap do |cmd|
-              cmd.merge!(writeConcern: write_concern.options) if write_concern
-              cmd.merge!(:bypassDocumentValidation => true) if bypass_document_validation
-            end
+              documents: documents
+            }.merge!(command_options)
+          end
+
+          def op_msg(server)
+            global_args = { insert: coll_name,
+                            Protocol::Msg::DATABASE_IDENTIFIER => db_name
+                          }.merge!(command_options)
+            add_cluster_time!(global_args, server)
+            session.add_id!(global_args) if session
+
+            section = { type: 1, payload: { identifier: IDENTIFIER, sequence: documents } }
+            flags = unacknowledged_write? ? [:more_to_come] : [:none]
+            Protocol::Msg.new(flags, { validating_keys: true }, global_args, section)
           end
 
-          # The wire protocol message for this write operation.
-          #
-          # @return [ Mongo::Protocol::Query ] Wire protocol message.
-          #
-          # @since 2.2.5
           def message(server)
-            opts = options.merge(validating_keys: true)
-            Protocol::Query.new(db_name, Database::COMMAND, selector, opts)
+            if server.features.op_msg_enabled?
+              op_msg(server)
+            else
+              opts = options.merge(validating_keys: true)
+              Protocol::Query.new(db_name, Database::COMMAND, selector, opts)
+            end
           end
         end
       end