mongo 1.10.0.rc0 → 1.10.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8cd7d73987a4420fcb416fb0cfa6c9f711b9dc00
-  data.tar.gz: ec9b4e834cfc4169a1035ad301c87ff2684639ea
+  metadata.gz: 280fdca0cfd2705bb339614159fa2a9ac3a6646f
+  data.tar.gz: 1656445245aa6d3c58729875b7f2229416a7cc48
 SHA512:
-  metadata.gz: 09f5296283a06b7d08619f347f8723e7423e0b126d29fbfbaf1c38594e0b5d3a65e0b71de1161882d61f98186bd544c80f5fe8dfc3ae3b09ad25acf98e9611cb
-  data.tar.gz: 4bde563936a1ff51ee037bb4289d8057316fed86e9b5e009612f85f7c41552e2746698a6c5114277783d179226703d7d1dfbcccfb12d8b315c7549f3dcd8db98
+  metadata.gz: a5833530677b1c66c31d06ce0999b1aab3a0541a6cea1b5c15b71c3bc0a09c0b8adbe8585294c4095ac992eea171b401cdfc70c8d9505dda4a8bbccb29727794
+  data.tar.gz: 3a44a8940281e6fc17a3862883881ab37f35b588079afecc47b5fb07ede6a30298fa91e6052bac1d53d386fad9b843edbaecefac7c62d326c1146edd30ef8337

data/VERSION

@@ -1 +1 @@
-1.10.0.rc0
+1.10.0.rc1

data/lib/mongo/bulk_write_collection_view.rb

@@ -18,8 +18,9 @@ module Mongo
   class BulkWriteCollectionView
     include Mongo::WriteConcern
 
-    DEFAULT_OP_ARGS = {:q => {}}
+    DEFAULT_OP_ARGS = {:q => nil}
     MULTIPLE_ERRORS_MSG = "batch item errors occurred"
+    EMPTY_BATCH_MSG = "batch is empty"
 
     attr_reader :collection, :options, :ops, :op_args
 
@@ -91,6 +92,21 @@ module Mongo
 
     # Modify the query selector for subsequent bulk write operations.
     # The default query selector on creation of the bulk write view is {}.
+    # For operations that require a query selector, find() must be set
+    # per operation, or set once for all operations on the bulk object.
+    # For example, these operations:
+    #
+    #   bulk.find({"a" => 2}).update({"$inc" => {"x" => 2}})
+    #   bulk.find({"a" => 2}).update({"$set" => {"b" => 3}})
+    #
+    # may be rewritten as:
+    #
+    #   bulk = find({"a" => 2})
+    #   bulk.update({"$inc" => {"x" => 2}})
+    #   bulk.update({"$set" => {"b" => 3}})
+    #
+    # Note that modifying the query selector in this way will not affect
+    # operations that do not use a query selector, like insert().
     #
     # @param [Hash] q the query selector
     #
@@ -200,6 +216,7 @@ module Mongo
     #
     # @return [BulkWriteCollectionView]
     def execute(opts = {})
+      raise MongoArgumentError, EMPTY_BATCH_MSG if @ops.empty?
       write_concern = get_write_concern(opts, @collection)
       @ops.each_with_index{|op, index| op.last.merge!(:ord => index)} # infuse ordinal here to avoid issues with upsert
       if @collection.db.connection.use_write_command?(write_concern)
@@ -208,7 +225,7 @@ module Mongo
         errors, exchanges = @collection.operation_writer.bulk_execute(@ops, @options, opts)
       end
       @ops = []
-      return true if exchanges.first[:response] == true # w 0 without GLE
+      return true if errors.empty? && (exchanges.empty? || exchanges.first[:response] == true) # w 0 without GLE
       result = merge_result(errors, exchanges)
       raise BulkWriteError.new(MULTIPLE_ERRORS_MSG, Mongo::ErrorCode::MULTIPLE_ERRORS_OCCURRED, result) if !errors.empty? || result["writeConcernError"]
       result
@@ -229,6 +246,14 @@ module Mongo
       h[key] = h.fetch(key, 0) + n
     end
 
+    def nil_tally(h, key, n)
+      if !h.has_key?(key)
+        h[key] = n
+      elsif h[key]
+        h[key] = n ? h[key] + n : n
+      end
+    end
+
     def append(h, key, obj)
       h[key] = h.fetch(key, []) << obj
     end
@@ -259,6 +284,7 @@ module Mongo
       end
       exchanges.each do |exchange|
         response = exchange[:response]
+        next unless response
         ok += response["ok"].to_i
         n = response["n"] || 0
         op_type = exchange[:op_type]
@@ -274,7 +300,7 @@ module Mongo
           end
           tally(result, "nUpserted", n_upserted) if n_upserted > 0
           tally(result, "nMatched", n - n_upserted)
-          tally(result, "nModified", response["nModified"] || n - n_upserted)
+          nil_tally(result, "nModified", response["nModified"])
         elsif op_type == :delete
           tally(result, "nRemoved", n)
         end
@@ -300,6 +326,7 @@ module Mongo
         end
         append(result, "writeConcernError", merge_index(writeConcernError, exchange)) if writeConcernError
       end
+      result.delete("nModified") if result.has_key?("nModified") && !result["nModified"]
       result.merge!("ok" => [ok + result["n"], 1].min)
     end
 
@@ -313,6 +340,7 @@ module Mongo
     end
 
     def op_push(op)
+      raise MongoArgumentError, "non-nil query must be set via find" if op.first != :insert && !op.last[:q]
       @ops << op
       self
     end

data/lib/mongo/collection.rb

@@ -39,10 +39,16 @@ module Mongo
     # @param [DB] db a MongoDB database instance.
     #
     # @option opts [String, Integer, Symbol] :w (1) Set default number of nodes to which a write
-    #   should be acknowledged
-    # @option opts [Boolean] :j (false) Set journal acknowledgement
-    # @option opts [Integer] :wtimeout (nil) Set replica set acknowledgement timeout
-    # @option opts [Boolean] :fsync (false) Set fsync acknowledgement.
+    #   should be acknowledged.
+    # @option opts [Integer] :wtimeout (nil) Set replica set acknowledgement timeout.
+    # @option opts [Boolean] :j (false) If true, block until write operations have been committed
+    #   to the journal. Cannot be used in combination with 'fsync'. Prior to MongoDB 2.6 this option was
+    #   ignored if the server was running without journaling. Starting with MongoDB 2.6, write operations will
+    #   fail with an exception if this option is used when the server is running without journaling.
+    # @option opts [Boolean] :fsync (false) If true, and the server is running without journaling, blocks until
+    #   the server has synced all data files to disk. If the server is running with journaling, this acts the same as
+    #   the 'j' option, blocking until write operations have been committed to the journal.
+    #   Cannot be used in combination with 'j'.
     #
     #   Notes about write concern:
     #     These write concern options will be used for insert, update, and remove methods called on this
@@ -332,11 +338,18 @@ module Mongo
     #
     # @return [ObjectId] the _id of the saved document.
     #
-    # @option opts [Hash] :w, :j, :wtimeout, :fsync Set the write concern for this operation.
-    #   :w > 0 will run a +getlasterror+ command on the database to report any assertion.
-    #   :j will confirm a write has been committed to the journal,
-    #   :wtimeout specifies how long to wait for write confirmation,
-    #   :fsync will confirm that a write has been fsynced.
+    # @option opts [String, Integer, Symbol] :w (1) Set default number of nodes to which a write
+    #   should be acknowledged.
+    # @option opts [Integer] :wtimeout (nil) Set replica set acknowledgement timeout.
+    # @option opts [Boolean] :j (false) If true, block until write operations have been committed
+    #   to the journal. Cannot be used in combination with 'fsync'. Prior to MongoDB 2.6 this option was
+    #   ignored if the server was running without journaling. Starting with MongoDB 2.6, write operations will
+    #   fail with an exception if this option is used when the server is running without journaling.
+    # @option opts [Boolean] :fsync (false) If true, and the server is running without journaling, blocks until
+    #   the server has synced all data files to disk. If the server is running with journaling, this acts the same as
+    #   the 'j' option, blocking until write operations have been committed to the journal.
+    #   Cannot be used in combination with 'j'.
+    #
     #   Options provided here will override any write concern options set on this collection,
     #   its database object, or the current connection. See the options
     #   for DB#get_last_error.
@@ -365,10 +378,16 @@ module Mongo
     #   Return this result format only when :collect_on_error is true.
     #
     # @option opts [String, Integer, Symbol] :w (1) Set default number of nodes to which a write
-    #   should be acknowledged
-    # @option opts [Boolean] :j (false) Set journal acknowledgement
-    # @option opts [Integer] :wtimeout (nil) Set replica set acknowledgement timeout
-    # @option opts [Boolean] :fsync (false) Set fsync acknowledgement.
+    #   should be acknowledged.
+    # @option opts [Integer] :wtimeout (nil) Set replica set acknowledgement timeout.
+    # @option opts [Boolean] :j (false) If true, block until write operations have been committed
+    #   to the journal. Cannot be used in combination with 'fsync'. Prior to MongoDB 2.6 this option was
+    #   ignored if the server was running without journaling. Starting with MongoDB 2.6, write operations will
+    #   fail with an exception if this option is used when the server is running without journaling.
+    # @option opts [Boolean] :fsync (false) If true, and the server is running without journaling, blocks until
+    #   the server has synced all data files to disk. If the server is running with journaling, this acts the same as
+    #   the 'j' option, blocking until write operations have been committed to the journal.
+    #   Cannot be used in combination with 'j'.
     #
     #   Notes on write concern:
     #     Options provided here will override any write concern options set on this collection,
@@ -408,10 +427,16 @@ module Mongo
     #   If specified, only matching documents will be removed.
     #
     # @option opts [String, Integer, Symbol] :w (1) Set default number of nodes to which a write
-    #   should be acknowledged
-    # @option opts [Boolean] :j (false) Set journal acknowledgement
-    # @option opts [Integer] :wtimeout (nil) Set replica set acknowledgement timeout
-    # @option opts [Boolean] :fsync (false) Set fsync acknowledgement.
+    #   should be acknowledged.
+    # @option opts [Integer] :wtimeout (nil) Set replica set acknowledgement timeout.
+    # @option opts [Boolean] :j (false) If true, block until write operations have been committed
+    #   to the journal. Cannot be used in combination with 'fsync'. Prior to MongoDB 2.6 this option was
+    #   ignored if the server was running without journaling. Starting with MongoDB 2.6, write operations will
+    #   fail with an exception if this option is used when the server is running without journaling.
+    # @option opts [Boolean] :fsync (false) If true, and the server is running without journaling, blocks until
+    #   the server has synced all data files to disk. If the server is running with journaling, this acts the same as
+    #   the 'j' option, blocking until write operations have been committed to the journal.
+    #   Cannot be used in combination with 'j'.
     # @option opts [Integer] :limit (0) Set limit option, currently only 0 for all or 1 for just one.
     #
     #   Notes on write concern:
@@ -448,10 +473,16 @@ module Mongo
     # @option opts [Boolean] :multi (+false+) update all documents matching the selector, as opposed to
     #   just the first matching document. Note: only works in MongoDB 1.1.3 or later.
     # @option opts [String, Integer, Symbol] :w (1) Set default number of nodes to which a write
-    #   should be acknowledged
-    # @option opts [Boolean] :j (false) Set journal acknowledgement
-    # @option opts [Integer] :wtimeout (nil) Set replica set acknowledgement timeout
-    # @option opts [Boolean] :fsync (false) Set fsync acknowledgement.
+    #   should be acknowledged.
+    # @option opts [Integer] :wtimeout (nil) Set replica set acknowledgement timeout.
+    # @option opts [Boolean] :j (false) If true, block until write operations have been committed
+    #   to the journal. Cannot be used in combination with 'fsync'. Prior to MongoDB 2.6 this option was
+    #   ignored if the server was running without journaling. Starting with MongoDB 2.6, write operations will
+    #   fail with an exception if this option is used when the server is running without journaling.
+    # @option opts [Boolean] :fsync (false) If true, and the server is running without journaling, blocks until
+    #   the server has synced all data files to disk. If the server is running with journaling, this acts the same as
+    #   the 'j' option, blocking until write operations have been committed to the journal.
+    #   Cannot be used in combination with 'j'.
     #
     #   Notes on write concern:
     #     Options provided here will override any write concern options set on this collection,
@@ -626,6 +657,9 @@ module Mongo
     # @example Define the pipeline as an array of operator hashes:
     #   coll.aggregate([ {"$project" => {"last_name" => 1, "first_name" => 1 }}, {"$match" => {"last_name" => "Jones"}} ])
     #
+    # @example With server version 2.5.1 or newer, pass a cursor option to retrieve unlimited aggregation results:
+    #   coll.aggregate([ {"$group" => { :_id => "$_id", :count => { "$sum" => "$members" }}} ], :cursor => {} )
+    #
     # @param [Array] pipeline Should be a single array of pipeline operator hashes.
     #
     #   '$project' Reshapes a document stream by including fields, excluding fields, inserting computed fields,
@@ -649,7 +683,8 @@ module Mongo
     #  on. If $out is specified and :read is not :primary, the aggregation will be rerouted to the primary with
     #  a warning. See Collection#find for more details.
     # @option opts [String]  :comment (nil) a comment to include in profiling logs
-    # @option opts [Hash] :cursor cursor options for aggregation
+    # @option opts [Hash] :cursor return a cursor object instead of an Array.  Takes an optional batchSize parameter
+    #  to specify the maximum size, in documents, of the first batch returned.
     #
     # @return [Array] An Array with the aggregate command's results.
     #
@@ -824,7 +859,16 @@ module Mongo
       end
     end
 
-
+    # Scan this entire collection in parallel.
+    # Returns a list of up to num_cursors cursors that can be iterated concurrently. As long as the collection
+    # is not modified during scanning, each document appears once in one of the cursors' result sets.
+    #
+    # @note Requires server version >= 2.5.5
+    #
+    # @param [Integer] num_cursors the number of cursors to return.
+    # @param [Hash] opts
+    #
+    # @return [Array] An array of up to num_cursors cursors for iterating over the collection.
     def parallel_scan(num_cursors, opts={})
       cmd                          = BSON::OrderedHash.new
       cmd[:parallelCollectionScan] = self.name
@@ -1082,7 +1126,7 @@ module Mongo
       selector.merge!(opts)
 
       begin
-        cmd = BSON::OrderedHash[:createIndexes, @name].merge!(selector)
+        cmd = BSON::OrderedHash[:createIndexes, @name, :indexes, [selector]]
         @db.command(cmd)
       rescue Mongo::OperationFailure => ex
         if ex.error_code == Mongo::ErrorCode::COMMAND_NOT_FOUND || ex.error_code.nil?
@@ -1090,7 +1134,7 @@ module Mongo
           send_write(:insert, nil, selector, false, {:w => 1}, Mongo::DB::SYSTEM_INDEX_COLLECTION)
         else
           raise Mongo::OperationFailure, "Failed to create index #{selector.inspect} with the following error: " +
-           "#{e.message}"
+           "#{ex.message}"
         end
       end
 

data/lib/mongo/collection_writer.rb

@@ -28,7 +28,6 @@ module Mongo
       :update => :updates,
       :delete => :deletes
     }
-    MAX_WRITE_BATCH_SIZE     = 1000
 
     def initialize(collection)
       @collection = collection
@@ -36,7 +35,7 @@ module Mongo
       @db = @collection.db
       @connection = @db.connection
       @logger     = @connection.logger
-      @max_write_batch_size = MAX_WRITE_BATCH_SIZE
+      @max_write_batch_size = Mongo::MongoClient::DEFAULT_MAX_WRITE_BATCH_SIZE
     end
 
     # common implementation only for new batch write commands (insert, update, delete) and old batch insert
@@ -52,6 +51,7 @@ module Mongo
       exchanges = []
       serialized_doc = nil
       message = BSON::ByteBuffer.new("", max_message_size)
+      @max_write_batch_size = @collection.db.connection.max_write_batch_size
       docs = documents.dup
       catch(:error) do
         until docs.empty? || (!errors.empty? && !collect_on_error) # process documents a batch at a time
@@ -99,6 +99,7 @@ module Mongo
       error_docs = [] # docs with serialization errors
       errors = []
       exchanges = []
+      @max_write_batch_size = @collection.db.connection.max_write_batch_size
       @write_batch_size = [documents.size, @max_write_batch_size].min
       docs = documents.dup
       until docs.empty?

data/lib/mongo/connection/node.rb

@@ -193,6 +193,10 @@ module Mongo
       min_wire_version <= feature && feature <= max_wire_version
     end
 
+    def max_write_batch_size
+      @max_write_batch_size || Mongo::MongoClient::DEFAULT_MAX_WRITE_BATCH_SIZE
+    end
+
     protected
 
     # Ensure that this node is a healthy member of a replica set.
@@ -229,6 +233,7 @@ module Mongo
       @max_message_size = config['maxMessageSizeBytes'] || @max_bson_size * MESSAGE_SIZE_FACTOR
       @max_wire_version = config['maxWireVersion'] || 0
       @min_wire_version = config['minWireVersion'] || 0
+      @max_write_batch_size = config['maxWriteBatchSize'] || Mongo::MongoClient::DEFAULT_MAX_WRITE_BATCH_SIZE
     end
   end
 end

data/lib/mongo/cursor.rb

@@ -494,7 +494,10 @@ module Mongo
           {fields => 1}
         when Array
           return nil if fields.length.zero?
-          fields.inject({}) { |hash, field| hash[field] = 1; hash }
+          fields.inject({}) do |hash, field|
+            field.is_a?(Hash) ? hash.merge!(field) : hash[field] = 1
+            hash
+          end
         when Hash
           return fields
       end

data/lib/mongo/db.rb

@@ -88,10 +88,16 @@ module Mongo
     #   the factory should not inject a new key).
     #
     # @option opts [String, Integer, Symbol] :w (1) Set default number of nodes to which a write
-    #   should be acknowledged
-    # @option opts [Boolean] :j (false) Set journal acknowledgement
-    # @option opts [Integer] :wtimeout (nil) Set replica set acknowledgement timeout
-    # @option opts [Boolean] :fsync (false) Set fsync acknowledgement.
+    #   should be acknowledged.
+    # @option opts [Integer] :wtimeout (nil) Set replica set acknowledgement timeout.
+    # @option opts [Boolean] :j (false) If true, block until write operations have been committed
+    #   to the journal. Cannot be used in combination with 'fsync'. Prior to MongoDB 2.6 this option was
+    #   ignored if the server was running without journaling. Starting with MongoDB 2.6, write operations will
+    #   fail with an exception if this option is used when the server is running without journaling.
+    # @option opts [Boolean] :fsync (false) If true, and the server is running without journaling, blocks until
+    #   the server has synced all data files to disk. If the server is running with journaling, this acts the same as
+    #   the 'j' option, blocking until write operations have been committed to the journal.
+    #   Cannot be used in combination with 'j'.
     #
     #   Notes on write concern:
     #     These write concern options are propagated to Collection objects instantiated off of this DB. If no
@@ -135,6 +141,8 @@ module Mongo
     #   used to authenticate against a database when the credentials exist
     #   elsewhere.
     # @param mechanism [String] The authentication mechanism to be used.
+    # @param extra [Hash] A optional hash of extra options to be stored with
+    #   the credential set.
     #
     # @note The ability to disable the save_auth option has been deprecated.
     #   With save_auth=false specified, driver authentication behavior during
@@ -144,12 +152,12 @@ module Mongo
     #
     # @raise [AuthenticationError] Raised if authentication fails.
     # @return [Boolean] The result of the authentication operation.
-    def authenticate(username, password=nil, save_auth=nil, source=nil, mechanism=nil)
+    def authenticate(username, password=nil, save_auth=nil, source=nil, mechanism=nil, extra=nil)
       warn "[DEPRECATED] Disabling the 'save_auth' option no longer has " +
            "any effect. Please see the API documentation for more details " +
            "on this change." unless save_auth.nil?
 
-      @client.add_auth(self.name, username, password, source, mechanism)
+      @client.add_auth(self.name, username, password, source, mechanism, extra)
       true
     end
 
@@ -222,9 +230,9 @@ module Mongo
       end
 
       if user_info.key?('users') && !user_info['users'].empty?
-        update_user(username, password, opts)
+        create_or_update_user(:updateUser, username, password, read_only, opts)
       else
-        create_user(username, password, read_only, opts)
+        create_or_update_user(:createUser, username, password, read_only, opts)
       end
     end
 
@@ -667,7 +675,7 @@ module Mongo
     # @param opts [Hash]
     #
     # @private
-    def create_user(username, password, read_only, opts)
+    def create_or_update_user(command, username, password, read_only, opts)
       if read_only || !opts.key?(:roles)
         warn "Creating a user with the read_only option or without roles is " +
              "deprecated in MongoDB >= 2.6"
@@ -682,47 +690,21 @@ module Mongo
 
       opts = opts.dup
       pwd = Mongo::Authentication.hash_password(username, password) if password
-      create_opts = pwd ? { :pwd => pwd } : {}
+      cmd_opts = pwd ? { :pwd => pwd } : {}
       # specify that the server shouldn't digest the password because the driver does
-      create_opts[:digestPassword] = false
+      cmd_opts[:digestPassword] = false
       unless opts.key?(:roles)
         if name == 'admin'
           roles = read_only ? ['readAnyDatabase'] : ['root']
         else
           roles = read_only ? ['read'] : ["dbOwner"]
         end
-        create_opts[:roles] = roles
+        cmd_opts[:roles] = roles
       end
-      create_opts[:writeConcern] =
+      cmd_opts[:writeConcern] =
         opts.key?(:writeConcern) ? opts.delete(:writeConcern) : { :w => 1 }
-      create_opts.merge!(opts)
-      command({ :createUser => username }, create_opts)
-    end
-
-    # Update a user.
-    #
-    # @param username [String] The username.
-    # @param password [String] The user's password.
-    # @param opts [Hash]
-    #
-    # @private
-    def update_user(username, password, opts)
-      # The password is always salted and hashed by the driver.
-      if opts.key?(:digestPassword)
-        raise MongoArgumentError,
-          "The digestPassword option is not available via DB#add_user. " +
-          "Use DB#command(:createUser => ...) instead for this option."
-      end
-
-      opts = opts.dup
-      pwd = Mongo::Authentication.hash_password(username, password) if password
-      update_opts = pwd ? { :pwd => pwd } : {}
-      # specify that the server shouldn't digest the password because the driver does
-      update_opts[:digestPassword] = false
-      update_opts[:writeConcern] =
-        opts.key?(:writeConcern) ? opts.delete(:writeConcern) : { :w => 1 }
-      update_opts.merge!(opts)
-      command({ :updateUser => username }, update_opts)
+      cmd_opts.merge!(opts)
+      command({ command => username }, cmd_opts)
     end
 
     # Create a user in MongoDB versions < 2.5.3.