mongo 2.3.1 → 2.4.0.rc0

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

@@ -41,7 +41,18 @@ module Mongo
       #   option spec :options [ Hash ] Options for the map reduce command.
       #
       # @since 2.0.0
-      class MapReduce < Command; end
+      class MapReduce < Command
+        include TakesWriteConcern
+
+        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)
+        end
+      end
     end
   end
 end

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

@@ -42,6 +42,7 @@ module Mongo
         def selector
           command = { :parallelCollectionScan => coll_name, :numCursors => cursor_count }
           command[:readConcern] = read_concern if read_concern
+          command[:maxTimeMS] = max_time_ms if max_time_ms
           command
         end
       end

data/lib/mongo/operation/read_preference.rb

@@ -28,12 +28,12 @@ module Mongo
 
       private
 
-      def update_selector(server)
+      def update_selector_for_read_pref(sel, server)
         if server.mongos? && read_pref = read.to_mongos
-          sel = selector[:$query] ? selector : { :$query => selector }
+          sel = sel[:$query] ? sel : { :$query => sel }
           sel.merge(:$readPreference => read_pref)
         else
-          selector
+          sel
         end
       end
 
@@ -41,19 +41,19 @@ module Mongo
         (server.cluster.single? && !server.mongos?) || read.slave_ok?
       end
 
-      def update_options(server)
+      def update_options_for_slave_ok(opts, server)
         if slave_ok?(server)
-          options.dup.tap do |opts|
-            (opts[:flags] ||= []) << SLAVE_OK
+          opts.dup.tap do |o|
+            (o[:flags] ||= []) << SLAVE_OK
           end
         else
-          options
+          opts
         end
       end
 
       def message(server)
-        sel = update_selector(server)
-        opts = update_options(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)
       end
     end

data/lib/mongo/operation/specifiable.rb

@@ -91,6 +91,11 @@ module Mongo
       # @since 2.2.0
       READ_CONCERN = :read_concern.freeze
 
+      # The max time ms option.
+      #
+      # @since 2.2.5
+      MAX_TIME_MS = :max_time_ms.freeze
+
       # The field for a selector.
       #
       # @since 2.0.0
@@ -136,6 +141,11 @@ module Mongo
       # @since 2.2.0
       BYPASS_DOC_VALIDATION = :bypass_document_validation.freeze
 
+      # A collation to apply to the operation.
+      #
+      # @since 2.4.0
+      COLLATION = :collation.freeze
+
       # @return [ Hash ] spec The specification for the operation.
       attr_reader :spec
 
@@ -339,6 +349,18 @@ module Mongo
         spec[READ_CONCERN]
       end
 
+      # Get the max time ms value from the spec.
+      #
+      # @example Get the max time ms.
+      #   specifiable.max_time_ms
+      #
+      # @return [ Hash ] The max time ms value.
+      #
+      # @since 2.2.5
+      def max_time_ms
+        spec[MAX_TIME_MS]
+      end
+
       # Whether or not to bypass document level validation.
       #
       # @example Get the bypass_document_validation option.
@@ -351,6 +373,18 @@ module Mongo
         spec[BYPASS_DOC_VALIDATION]
       end
 
+      # The collation to apply to the operation.
+      #
+      # @example Get the collation option.
+      #   specifiable.collation.
+      #
+      # @return [ Hash ] The collation document.
+      #
+      # @since 2.4.0
+      def collation
+        spec[COLLATION]
+      end
+
       # The selector for from the specification.
       #
       # @example Get a selector specification.

data/lib/mongo/operation/takes_write_concern.rb

@@ -0,0 +1,35 @@
+# Copyright (C) 2014-2016 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
+
+    # Adds behaviour for updating the selector for operations
+    # that may take a write concern.
+    #
+    # @since 2.4.0
+    module TakesWriteConcern
+
+      private
+
+      def update_selector_for_write_concern(sel, server)
+        if write_concern && server.features.collation_enabled?
+          sel.merge(writeConcern: write_concern.options)
+        else
+          sel
+        end
+      end
+    end
+  end
+end

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

@@ -65,7 +65,7 @@ module Mongo
           def gle
             wc = write_concern ||  WriteConcern.get(WriteConcern::DEFAULT)
             gle_message = ( ordered? && wc.get_last_error.nil? ) ?
-                Mongo::WriteConcern.get(Mongo::WriteConcern::DEFAULT).get_last_error :
+                WriteConcern.get(WriteConcern::DEFAULT).get_last_error :
                 wc.get_last_error
             if gle_message
               Protocol::Query.new(

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

@@ -30,6 +30,7 @@ module Mongo
         class CreateIndex
           include Specifiable
           include Writable
+          include TakesWriteConcern
 
           private
 
@@ -41,6 +42,11 @@ module Mongo
           def selector
             { :createIndexes => coll_name, :indexes => indexes }
           end
+
+          def message(server)
+            sel = update_selector_for_write_concern(selector, server)
+            Protocol::Query.new(db_name, Database::COMMAND, sel, options)
+          end
         end
       end
     end

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

@@ -31,6 +31,7 @@ module Mongo
         class DropIndex
           include Specifiable
           include Writable
+          include TakesWriteConcern
 
           private
 
@@ -42,6 +43,11 @@ module Mongo
           def selector
             { :dropIndexes => coll_name, :index => index_name }
           end
+
+          def message(server)
+            sel = update_selector_for_write_concern(selector, server)
+            Protocol::Query.new(db_name, Database::COMMAND, sel, options)
+          end
         end
       end
     end

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

@@ -54,7 +54,7 @@ module Mongo
           # @return [ Mongo::Protocol::Query ] Wire protocol message.
           #
           # @since 2.2.5
-          def message
+          def message(server)
             opts = options.merge(validating_keys: true)
             Protocol::Query.new(db_name, Database::COMMAND, selector, opts)
           end

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

@@ -52,6 +52,7 @@ module Mongo
             }.tap do |cmd|
               cmd.merge!(writeConcern: write_concern.options) if write_concern
               cmd.merge!(:bypassDocumentValidation => true) if bypass_document_validation
+              cmd.merge!(:collation => collation) if collation
             end
           end
         end

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

@@ -36,7 +36,7 @@ module Mongo
           # @since 2.0.0
           def execute(server)
             server.with_connection do |connection|
-              connection.dispatch([ message ], operation_id)
+              connection.dispatch([ message(server) ], operation_id)
             end
           end
 
@@ -47,7 +47,7 @@ module Mongo
           # @return [ Mongo::Protocol::Query ] Wire protocol message.
           #
           # @since 2.0.0
-          def message
+          def message(server)
             Protocol::Query.new(db_name, Database::COMMAND, selector, options)
           end
         end

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

@@ -58,8 +58,8 @@ module Mongo
           end
         end
 
-        def message
-          Protocol::Insert.new(db_name, Index::COLLECTION, index_documents, validating_keys: false)
+        def message(server)
+          Protocol::Insert.new(db_name, Index::COLLECTION, index_documents)
         end
       end
     end

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

@@ -40,7 +40,7 @@ module Mongo
           Command::CreateUser.new(spec)
         end
 
-        def message
+        def message(server)
           user_spec = { user: user.name }.merge(user.spec)
           Protocol::Insert.new(db_name, Auth::User::COLLECTION, [ user_spec ])
         end

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

@@ -60,7 +60,11 @@ module Mongo
           Command::Delete.new(s)
         end
 
-        def message
+        def has_collation?
+          delete[:collation]
+        end
+
+        def message(server)
           selector = delete[Operation::Q]
           opts     = (delete[Operation::LIMIT] || 0) <= 0 ? {} : { :flags => [ :single_remove ] }
           Protocol::Delete.new(db_name, coll_name, selector, opts)

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

@@ -28,7 +28,7 @@ module Mongo
           server.with_connection do |connection|
             result_class = self.class.const_defined?(:LegacyResult, false) ? self.class::LegacyResult :
                 self.class.const_defined?(:Result, false) ? self.class::Result : Result
-            result_class.new(connection.dispatch([ message, gle ].compact)).validate!
+            result_class.new(connection.dispatch([ message(server), gle ].compact)).validate!
           end
         end
 

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

@@ -57,11 +57,11 @@ module Mongo
 
         def execute_message(server)
           server.with_connection do |connection|
-            Result.new(connection.dispatch([ message, gle ].compact), @ids).validate!
+            Result.new(connection.dispatch([ message(server), gle ].compact), @ids).validate!
           end
         end
 
-        def message
+        def message(server)
           opts = !!options[:continue_on_error] ? { :flags => [:continue_on_error] } : {}
           Protocol::Insert.new(db_name, coll_name, ensure_ids(documents), opts)
         end

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

@@ -39,7 +39,7 @@ module Mongo
           Command::RemoveUser.new(spec)
         end
 
-        def message
+        def message(server)
           Protocol::Delete.new(db_name, Auth::User::COLLECTION, { user: user_name })
         end
       end

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

@@ -63,7 +63,11 @@ module Mongo
           Command::Update.new(s)
         end
 
-        def message
+        def has_collation?
+          update[:collation]
+        end
+
+        def message(server)
           flags = []
           flags << :multi_update if update[Operation::MULTI]
           flags << :upsert if update[Operation::UPSERT]

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

@@ -40,7 +40,7 @@ module Mongo
           Command::UpdateUser.new(spec)
         end
 
-        def message
+        def message(server)
           user_spec = { user: user.name }.merge(user.spec)
           Protocol::Update.new(db_name, Auth::User::COLLECTION, { user: user.name }, user_spec)
         end

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

@@ -34,8 +34,8 @@ module Mongo
         #
         # @since 2.1.0
         def execute(server)
-          if !server.features.write_command_enabled? ||
-               (write_concern && write_concern.get_last_error.nil?)
+          if !server.features.write_command_enabled? || unacknowledged_write?
+            raise Error::UnsupportedCollation.new(Error::UnsupportedCollation::UNACKNOWLEDGED_WRITES_MESSAGE) if has_collation?
             execute_message(server)
           else
             execute_write_command(server)
@@ -44,6 +44,14 @@ module Mongo
 
         private
 
+        def has_collation?
+          false
+        end
+
+        def unacknowledged_write?
+          write_concern && write_concern.get_last_error.nil?
+        end
+
         def execute_write_command(server)
           result_class = self.class.const_defined?(:Result, false) ? self.class::Result : Result
           result_class.new(write_command_op.execute(server)).validate!

data/lib/mongo/protocol/insert.rb

@@ -54,7 +54,6 @@ module Mongo
         @documents = documents
         @flags = options[:flags] || []
         @upconverter = Upconverter.new(collection, documents, options)
-        @options = options
       end
 
       # Return the event payload for monitoring.
@@ -77,7 +76,7 @@ module Mongo
       private
 
       def validating_keys?
-        @options.fetch(:validating_keys, true)
+        true
       end
 
       attr_reader :upconverter

data/lib/mongo/protocol/query.rb

@@ -252,7 +252,7 @@ module Mongo
         #
         # @since 2.1.0
         def command_name
-          (filter[:$query] || !command?) ? FIND : filter.keys.first
+          command? ? filter.keys.first : FIND
         end
 
         private
@@ -261,13 +261,9 @@ module Mongo
           collection == Database::COMMAND
         end
 
-        def query_filter
-          filter[:$query] || filter
-        end
-
         def op_command
           document = BSON::Document.new
-          query_filter.each do |field, value|
+          filter.each do |field, value|
             document.store(field.to_s, value)
           end
           document
@@ -276,7 +272,7 @@ module Mongo
         def find_command
           document = BSON::Document.new
           document.store(FIND, collection)
-          document.store(FILTER, query_filter)
+          document.store(FILTER, filter[:$query] ? filter[:$query] : filter)
           OPTION_MAPPINGS.each do |legacy, option|
             document.store(option, options[legacy]) unless options[legacy].nil?
           end

data/lib/mongo/server.rb

@@ -44,7 +44,7 @@ module Mongo
     attr_reader :monitoring
 
     # Get the description from the monitor and scan on monitor.
-    def_delegators :monitor, :description, :scan!
+    def_delegators :monitor, :description, :scan!, :heartbeat_frequency, :last_scan
 
     # Delegate convenience methods to the monitor description.
     def_delegators :description,
@@ -64,7 +64,12 @@ module Mongo
                    :secondary?,
                    :standalone?,
                    :unknown?,
-                   :unknown!
+                   :unknown!,
+                   :last_write_date
+
+    # Get the app metadata from the cluster.
+    def_delegators :cluster,
+                   :app_metadata
 
     # Is this server equal to another?
     #
@@ -158,7 +163,7 @@ module Mongo
       @cluster = cluster
       @monitoring = monitoring
       @options = options.freeze
-      @monitor = Monitor.new(address, event_listeners, options)
+      @monitor = Monitor.new(address, event_listeners, options.merge(app_metadata: cluster.app_metadata))
       monitor.scan!
       monitor.run!
       ObjectSpace.define_finalizer(self, self.class.finalize(monitor))