mongo 2.3.1 → 2.4.0.rc0

data/lib/mongo/collection/view.rb

@@ -56,7 +56,12 @@ module Mongo
       attr_reader :filter
 
       # Delegate necessary operations to the collection.
-      def_delegators :collection, :client, :cluster, :database, :read_preference, :write_concern
+      def_delegators :collection,
+                     :client,
+                     :cluster,
+                     :database,
+                     :read_preference,
+                     :write_concern
 
       # Delegate to the cluster for the next primary.
       def_delegators :cluster, :next_primary
@@ -127,6 +132,7 @@ module Mongo
       #   once.
       # @option options :sort [ Hash ] The key and direction pairs used to sort the
       #   results.
+      # @option options [ Hash ] :collation The collation to use.
       #
       # @since 2.0.0
       def initialize(collection, filter = {}, options = {})
@@ -150,6 +156,10 @@ module Mongo
 
       private
 
+      def write_concern
+        WriteConcern.get(options[:write] || options[:write_concern] || collection.write_concern)
+      end
+
       def initialize_copy(other)
         @collection = other.collection
         @options = other.options.dup
@@ -167,6 +177,10 @@ module Mongo
         View.new(collection, filter, options)
       end
 
+      def validate_collation!(server, opts)
+        raise Error::UnsupportedCollation.new if opts[:collation] && !server.features.collation_enabled?
+      end
+
       def view; self; end
     end
   end

data/lib/mongo/collection/view/aggregation.rb

@@ -115,8 +115,13 @@ module Mongo
             log_warn(REROUTE)
             server = cluster.next_primary(false)
           end
+          validate_collation!(server)
           initial_query_op.execute(server)
         end
+
+        def validate_collation!(server)
+          raise Error::UnsupportedCollation.new if @options[:collation] && !server.features.collation_enabled?
+        end
       end
     end
   end

data/lib/mongo/collection/view/builder/aggregation.rb

@@ -30,10 +30,11 @@ module Mongo
             :allow_disk_use => 'allowDiskUse',
             :max_time_ms => 'maxTimeMS',
             :explain => 'explain',
-            :bypass_document_validation => 'bypassDocumentValidation'
+            :bypass_document_validation => 'bypassDocumentValidation',
+            :collation => 'collation'
           ).freeze
 
-          def_delegators :@view, :collection, :database, :read
+          def_delegators :@view, :collection, :database, :read, :write_concern
 
           # @return [ Array<Hash> ] pipeline The pipeline.
           attr_reader :pipeline
@@ -69,11 +70,20 @@ module Mongo
           #
           # @since 2.2.0
           def specification
-            { selector: aggregation_command, db_name: database.name, read: read }
+            spec = {
+                    selector: aggregation_command,
+                    db_name: database.name,
+                    read: read
+                   }
+            write? ? spec.merge!(write_concern: write_concern) : spec
           end
 
           private
 
+          def write?
+            pipeline.any? { |operator| operator[:$out] || operator['$out'] }
+          end
+
           def aggregation_command
             command = BSON::Document.new(:aggregate => collection.name, :pipeline => pipeline)
             command[:cursor] = cursor if cursor

data/lib/mongo/collection/view/builder/find_command.rb

@@ -48,7 +48,8 @@ module Mongo
             no_cursor_timeout: 'noCursorTimeout',
             await_data: 'awaitData',
             allow_partial_results: 'allowPartialResults',
-            read_concern: 'readConcern'
+            read_concern: 'readConcern',
+            collation: 'collation'
           ).freeze
 
           def_delegators :@view, :collection, :database, :filter, :options, :read
@@ -95,30 +96,15 @@ module Mongo
           def find_command
             document = BSON::Document.new('find' => collection.name, 'filter' => filter)
             command = Options::Mapper.transform_documents(convert_flags(options), MAPPINGS, document)
-            convert_limit_and_batch_size(command)
-            command
+            convert_negative_limit(command)
           end
 
-          def convert_limit_and_batch_size(command)
-            if command[:limit] && command[:limit] < 0 &&
-                command[:batchSize] && command[:batchSize] < 0
-
-              command[:limit] = command[:limit].abs
-              command[:batchSize] = command[:limit].abs
+          def convert_negative_limit(command)
+            if command[:limit] && command[:limit] < 0
+              command['limit'] = command['limit'].abs
               command[:singleBatch] = true
-
-            else
-              [:limit, :batchSize].each do |opt|
-                if command[opt]
-                  if command[opt] < 0
-                    command[opt] = command[opt].abs
-                    command[:singleBatch] = true
-                  elsif command[opt] == 0
-                    command.delete(opt)
-                  end
-                end
-              end
             end
+            command
           end
 
           def convert_flags(options)

data/lib/mongo/collection/view/builder/map_reduce.rb

@@ -32,10 +32,11 @@ module Mongo
             out: 'out',
             scope: 'scope',
             verbose: 'verbose',
-            bypass_document_validation: 'bypassDocumentValidation'
+            bypass_document_validation: 'bypassDocumentValidation',
+            collation: 'collation'
           ).freeze
 
-          def_delegators :@view, :collection, :database, :filter, :read
+          def_delegators :@view, :collection, :database, :filter, :read, :write_concern
 
           # @return [ String ] map The map function.
           attr_reader :map
@@ -77,7 +78,11 @@ module Mongo
           #
           # @since 2.2.0
           def command_specification
-            { selector: find_command, db_name: database.name, read: read }
+            {
+              selector: find_command,
+              db_name: database.name,
+              read: read
+            }
           end
 
           # Get the specification for the document query after a map/reduce.
@@ -101,11 +106,23 @@ module Mongo
           #
           # @since 2.2.0
           def specification
-            { selector: map_reduce_command, db_name: database.name, read: read }
+            spec = {
+              selector: map_reduce_command,
+              db_name: database.name,
+              read: read
+            }
+            write?(spec) ? spec.merge!(write_concern: write_concern) : spec
           end
 
           private
 
+          def write?(spec)
+            if out = spec[:selector][:out]
+              out.is_a?(String) ||
+                (out.respond_to?(:keys) && out.keys.first.to_s.downcase != View::MapReduce::INLINE)
+            end
+          end
+
           def find_command
             BSON::Document.new('find' => query_collection, 'filter' => {})
           end
@@ -119,8 +136,8 @@ module Mongo
               :out => { inline: 1 }
             )
             command[:readConcern] = collection.read_concern if collection.read_concern
-            command.merge!(Options::Mapper.transform_documents(options, MAPPINGS))
             command.merge!(view.options)
+            command.merge!(Options::Mapper.transform_documents(options, MAPPINGS))
             command
           end
 

data/lib/mongo/collection/view/iterable.rb

@@ -77,6 +77,7 @@ module Mongo
         end
 
         def send_initial_query(server)
+          validate_collation!(server, options)
           initial_query_op(server).execute(server)
         end
       end

data/lib/mongo/collection/view/map_reduce.rb

@@ -211,6 +211,7 @@ module Mongo
             log_warn(REROUTE)
             server = cluster.next_primary(false)
           end
+          validate_collation!(server)
           result = initial_query_op.execute(server)
           inline? ? result : send_fetch_query(server)
         end
@@ -234,6 +235,10 @@ module Mongo
         def send_fetch_query(server)
           fetch_query_op(server).execute(server)
         end
+
+        def validate_collation!(server)
+          raise Error::UnsupportedCollation.new if options[:collation] && !server.features.collation_enabled?
+        end
       end
     end
   end

data/lib/mongo/collection/view/readable.rb

@@ -121,6 +121,7 @@ module Mongo
         # @option options :max_time_ms [ Integer ] The maximum amount of time to allow the
         #   command to run.
         # @option options [ Hash ] :read The read preference options.
+        # @option options [ Hash ] :collation The collation to use.
         #
         # @return [ Integer ] The document count.
         #
@@ -132,9 +133,18 @@ module Mongo
           cmd[:limit] = options[:limit] if options[:limit]
           cmd[:maxTimeMS] = options[:max_time_ms] if options[:max_time_ms]
           cmd[:readConcern] = collection.read_concern if collection.read_concern
+          preference = ServerSelector.get(options[:read] || read_preference)
+          server = preference.select_server(cluster)
+          validate_collation!(server, options)
+          cmd[:collation] = options[:collation] if options[:collation]
           read_with_retry do
-            options = options.merge(read: read) unless options[:read]
-            database.command(cmd, options).n.to_i
+            Operation::Commands::Command.new({
+                                               :selector => cmd,
+                                               :db_name => database.name,
+                                               :options => { :limit => -1 },
+                                               :read => preference,
+                                             }).execute(server).n.to_i
+
           end
         end
 
@@ -149,6 +159,7 @@ module Mongo
         # @option options :max_time_ms [ Integer ] The maximum amount of time to allow the
         #   command to run.
         # @option options [ Hash ] :read The read preference options.
+        # @option options [ Hash ] :collation The collation to use.
         #
         # @return [ Array<Object> ] The list of distinct values.
         #
@@ -159,9 +170,18 @@ module Mongo
                   :query => filter }
           cmd[:maxTimeMS] = options[:max_time_ms] if options[:max_time_ms]
           cmd[:readConcern] = collection.read_concern if collection.read_concern
+          preference = ServerSelector.get(options[:read] || read_preference)
+          server = preference.select_server(cluster)
+          validate_collation!(server, options)
+          cmd[:collation] = options[:collation] if options[:collation]
           read_with_retry do
-            options = options.merge(read: read) unless options[:read]
-            database.command(cmd, options).first['values']
+            Operation::Commands::Command.new({
+                                               :selector => cmd,
+                                               :db_name => database.name,
+                                               :options => { :limit => -1 },
+                                               :read => preference
+                                             }).execute(server).first['values']
+
           end
         end
 
@@ -439,21 +459,22 @@ module Mongo
           options[:read] || read_preference
         end
 
-        def parallel_scan(cursor_count)
+        def parallel_scan(cursor_count, options = {})
           server = read.select_server(cluster, false)
-          Operation::Commands::ParallelScan.new(
-            :coll_name => collection.name,
-            :db_name => database.name,
-            :cursor_count => cursor_count,
-            :read_concern => collection.read_concern
-          ).execute(server).cursor_ids.map do |cursor_id|
+          cmd = Operation::Commands::ParallelScan.new({
+                  :coll_name => collection.name,
+                  :db_name => database.name,
+                  :cursor_count => cursor_count,
+                  :read_concern => collection.read_concern
+                }.merge!(options))
+          cmd.execute(server).cursor_ids.map do |cursor_id|
             result = if server.features.find_command_enabled?
-              Operation::Commands::GetMore.new({
+                Operation::Commands::GetMore.new({
                   :selector => { :getMore => cursor_id, :collection => collection.name },
                   :db_name  => database.name
                 }).execute(server)
-            else
-              Operation::Read::GetMore.new({
+              else
+                Operation::Read::GetMore.new({
                   :to_return => 0,
                   :cursor_id => cursor_id,
                   :db_name   => database.name,

data/lib/mongo/collection/view/writable.rb

@@ -35,11 +35,17 @@ module Mongo
           cmd[:fields] = projection if projection
           cmd[:sort] = sort if sort
           cmd[:maxTimeMS] = max_time_ms if max_time_ms
-          wc = options[:write_concern] || (collection.write_concern &&
-                                           collection.write_concern.options)
-          cmd[:writeConcern] = wc if wc
+          cmd[:writeConcern] = write_concern.options if write_concern
+
+          server = next_primary
+          validate_collation!(server, options)
+          cmd[:collation] = options[:collation] if options[:collation]
+
           write_with_retry do
-            database.command(cmd).first['value']
+            Operation::Commands::Command.new({
+                                              :selector => cmd,
+                                              :db_name => database.name
+                                             }).execute(server).first['value']
           end
         end
 
@@ -80,7 +86,7 @@ module Mongo
         # @option opts [ true, false ] :upsert Whether to upsert if the document doesn't exist.
         # @option opts [ true, false ] :bypass_document_validation Whether or
         #   not to skip document level validation.
-        # @option options [ Hash ] :write_concern The write concern options.
+        # @option opts [ Hash ] :write_concern The write concern options.
         #   Defaults to the collection's write concern.
         #
         # @return [ BSON::Document ] The document.
@@ -95,13 +101,19 @@ module Mongo
           cmd[:upsert] = opts[:upsert] if opts[:upsert]
           cmd[:maxTimeMS] = max_time_ms if max_time_ms
           cmd[:bypassDocumentValidation] = !!opts[:bypass_document_validation]
-          wc = options[:write_concern] || (collection.write_concern &&
-                                           collection.write_concern.options)
-          cmd[:writeConcern] = wc if wc
-          write_with_retry do
-            value = database.command(cmd).first['value']
-            value unless value.nil? || value.empty?
+          cmd[:writeConcern] = write_concern.options if write_concern
+
+          server = next_primary
+          validate_collation!(server, options)
+          cmd[:collation] = options[:collation] if options[:collation]
+          
+          value = write_with_retry do
+            Operation::Commands::Command.new({
+                                              :selector => cmd,
+                                              :db_name => database.name
+                                             }).execute(server).first['value']
           end
+          value unless value.nil? || value.empty?
         end
 
         # Remove documents from the collection.
@@ -109,11 +121,15 @@ module Mongo
         # @example Remove multiple documents from the collection.
         #   collection_view.delete_many
         #
+        # @param [ Hash ] opts The options.
+        #
+        # @option opts [ Hash ] :collation The collation to use.
+        #
         # @return [ Result ] The response from the database.
         #
         # @since 2.0.0
-        def delete_many
-          remove(0)
+        def delete_many(opts = {})
+          remove(0, opts)
         end
 
         # Remove a document from the collection.
@@ -121,11 +137,15 @@ module Mongo
         # @example Remove a single document from the collection.
         #   collection_view.delete_one
         #
+        # @param [ Hash ] opts The options.
+        #
+        # @option opts [ Hash ] :collation The collation to use.
+        #
         # @return [ Result ] The response from the database.
         #
         # @since 2.0.0
-        def delete_one
-          remove(1)
+        def delete_one(opts = {})
+          remove(1, opts)
         end
 
         # Replaces a single document in the database with the new document.
@@ -138,6 +158,7 @@ module Mongo
         #
         # @option opts [ true, false ] :upsert Whether to upsert if the
         #   document doesn't exist.
+        # @option opts [ Hash ] :collation The collation to use.
         #
         # @return [ Result ] The response from the database.
         #
@@ -156,6 +177,7 @@ module Mongo
         #
         # @option opts [ true, false ] :upsert Whether to upsert if the
         #   document doesn't exist.
+        # @option opts [ Hash ] :collation The collation to use.
         #
         # @return [ Result ] The response from the database.
         #
@@ -174,6 +196,7 @@ module Mongo
         #
         # @option opts [ true, false ] :upsert Whether to upsert if the
         #   document doesn't exist.
+        # @option opts [ Hash ] :collation The collation to use.
         #
         # @return [ Result ] The response from the database.
         #
@@ -184,29 +207,37 @@ module Mongo
 
         private
 
-        def remove(value)
+        def remove(value, opts)
+          server = next_primary
+          validate_collation!(server, opts)
+          delete_doc = { Operation::Q => filter, Operation::LIMIT => value }
+          delete_doc[:collation] = opts[:collation] if opts[:collation]
           write_with_retry do
             Operation::Write::Delete.new(
-              :delete => { Operation::Q => filter, Operation::LIMIT => value },
+              :delete => delete_doc,
               :db_name => collection.database.name,
               :coll_name => collection.name,
               :write_concern => collection.write_concern
-            ).execute(next_primary)
+            ).execute(server)
           end
         end
 
         def update(spec, multi, opts)
+          server = next_primary
+          validate_collation!(server, opts)
+          update_doc = { Operation::Q => filter,
+                         Operation::U => spec,
+                         Operation::MULTI => multi,
+                         Operation::UPSERT => !!opts[:upsert] }
+          update_doc[:collation] = opts[:collation] if opts[:collation]
           write_with_retry do
             Operation::Write::Update.new(
-              :update => { Operation::Q => filter,
-                           Operation::U => spec,
-                           Operation::MULTI => multi,
-                           Operation::UPSERT => !!opts[:upsert] },
+              :update => update_doc,
               :db_name => collection.database.name,
               :coll_name => collection.name,
               :write_concern => collection.write_concern,
               :bypass_document_validation => !!opts[:bypass_document_validation]
-            ).execute(next_primary)
+            ).execute(server)
           end
         end
       end