mongo 2.4.1 → 2.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9112b76649bf922ef773b7a9018ad8b46de12760
-  data.tar.gz: d152ad097652a5c4ec4351f9c86a58de77c44977
+  metadata.gz: 3730fbcd3d5fa8d756b32b8004613c056760607a
+  data.tar.gz: b0d53fb243bab427ae7b1be710aec139791c4952
 SHA512:
-  metadata.gz: dbdc8eeb2763a4ce969c20323188997bdc37e7f8b1f0b54fe8ef4288141ec3a43bd61f1e3f8d89b46bae2c8ae875068bc583e3b17eff1631319da2342c283c86
-  data.tar.gz: 6ca6c80afad5e7882d5c31f5a6c2446a01fb5ed46c1de13f5d8df6dd78d47636ce9253522150dcbf7844f768a07f56670a15bcb264e5c4a9c03475437f302c22
+  metadata.gz: 0d0da5cfbaaa055dbccd7f26c8a8ed1887ca81d18fb3ec13c12c86281a6dbc37edb8cdf986fd5d009264e9975b78ba4ba135c7159fd1784c57e6321e42f5ae15
+  data.tar.gz: ae9f827422793dc99cf945c4464ac0431648e40a27572602c47d2401e9def79512e70238b79802ac0db7123c28d422d85fcb434ea7179eb9eaa92c74e8462724

data/README.md

@@ -77,9 +77,9 @@ License
    See the License for the specific language governing permissions and
    limitations under the License.
 
-[rubygems-img]: https://badge.fury.io/rb/mongo.png
+[rubygems-img]: https://badge.fury.io/rb/mongo.svg
 [rubygems-url]: http://badge.fury.io/rb/mongo
-[travis-img]: https://secure.travis-ci.org/mongodb/mongo-ruby-driver.png?branch=master
+[travis-img]: https://secure.travis-ci.org/mongodb/mongo-ruby-driver.svg?branch=master
 [travis-url]: http://travis-ci.org/mongodb/mongo-ruby-driver?branch=master
-[codeclimate-img]: https://codeclimate.com/github/mongodb/mongo-ruby-driver.png?branch=master
+[codeclimate-img]: https://codeclimate.com/github/mongodb/mongo-ruby-driver.svg?branch=master
 [codeclimate-url]: https://codeclimate.com/github/mongodb/mongo-ruby-driver?branch=master

data/lib/mongo/client.rb

@@ -62,7 +62,7 @@ module Mongo
       :ssl_cert_string,
       :ssl_cert_object,
       :ssl_key,
-      :ssk_key_string,
+      :ssl_key_string,
       :ssl_key_object,
       :ssl_key_pass_phrase,
       :ssl_verify,
@@ -230,9 +230,9 @@ module Mongo
     def initialize(addresses_or_uri, options = Options::Redacted.new)
       @monitoring = Monitoring.new(options)
       if addresses_or_uri.is_a?(::String)
-        create_from_uri(addresses_or_uri, validate_options(options))
+        create_from_uri(addresses_or_uri, validate_options!(options))
       else
-        create_from_addresses(addresses_or_uri, validate_options(options))
+        create_from_addresses(addresses_or_uri, validate_options!(options))
       end
       yield(self) if block_given?
     end
@@ -291,7 +291,7 @@ module Mongo
     # @since 2.0.0
     def with(new_options = Options::Redacted.new)
       clone.tap do |client|
-        opts = validate_options(new_options)
+        opts = validate_options!(new_options)
         client.options.update(opts)
         Database.create(client)
         # We can't use the same cluster if some options that would affect it
@@ -374,6 +374,7 @@ module Mongo
     def create_from_uri(connection_string, opts = Options::Redacted.new)
       uri = URI.new(connection_string, opts)
       @options = Database::DEFAULT_OPTIONS.merge(uri.client_options.merge(opts)).freeze
+      validate_options!(@options)
       @cluster = Cluster.new(uri.servers, @monitoring, options)
       @database = Database.new(self, options[:database], options)
     end
@@ -395,16 +396,24 @@ module Mongo
       end
     end
 
-    def validate_options(opts = Options::Redacted.new)
+    def validate_options!(opts = Options::Redacted.new)
       return Options::Redacted.new unless opts
       Options::Redacted.new(opts.select do |o|
-        if VALID_OPTIONS.include?(o)
-          true
+        if VALID_OPTIONS.include?(o.to_sym)
+          validate_max_min_pool_size!(o.to_sym, opts) and true
         else
           log_warn("Unsupported client option '#{o}'. It will be ignored.")
           false
         end
       end)
     end
+
+    def validate_max_min_pool_size!(option, opts)
+      if option == :min_pool_size
+        max = opts[:max_pool_size] || Server::ConnectionPool::Queue::MAX_SIZE
+        raise Error::InvalidMinPoolSize.new(opts[:min_pool_size], max) unless opts[:min_pool_size] <= max
+      end
+      true
+    end
   end
 end

data/lib/mongo/cluster.rb

@@ -33,6 +33,11 @@ module Mongo
     # @since 2.1.1
     MAX_READ_RETRIES = 1
 
+    # The default number of mongos write retries.
+    #
+    # @since 2.4.2
+    MAX_WRITE_RETRIES = 1
+
     # The default mongos read retry interval, in seconds.
     #
     # @since 2.1.1
@@ -174,7 +179,7 @@ module Mongo
       @cursor_reaper = CursorReaper.new
       @cursor_reaper.run!
 
-      ObjectSpace.define_finalizer(self, self.class.finalize(pools))
+      ObjectSpace.define_finalizer(self, self.class.finalize(pools, @cursor_reaper))
     end
 
     # Finalize the cluster for garbage collection. Disconnects all the scoped
@@ -189,10 +194,10 @@ module Mongo
     # @return [ Proc ] The Finalizer.
     #
     # @since 2.2.0
-    def self.finalize(pools)
+    def self.finalize(pools, cursor_reaper)
       proc do
-        begin; @cursor_reaper.kill_cursors; rescue; end
-        @cursor_reaper.stop!
+        begin; cursor_reaper.kill_cursors; rescue; end
+        cursor_reaper.stop!
         pools.values.each do |pool|
           pool.disconnect!
         end

data/lib/mongo/cluster/cursor_reaper.rb

@@ -42,6 +42,7 @@ module Mongo
         @to_kill = {}
         @active_cursors = Set.new
         @mutex = Mutex.new
+        @thread = nil
       end
 
       # Start the cursor reaper's thread.

data/lib/mongo/cluster/topology.rb

@@ -49,7 +49,7 @@ module Mongo
       # @since 2.0.0
       def initial(seeds, monitoring, options)
         if options.has_key?(:connect)
-          OPTIONS.fetch(options[:connect]).new(options, monitoring, seeds)
+          OPTIONS.fetch(options[:connect].to_sym).new(options, monitoring, seeds)
         elsif options.has_key?(:replica_set)
           ReplicaSet.new(options, monitoring, options)
         else

data/lib/mongo/collection.rb

@@ -50,9 +50,6 @@ module Mongo
     # Delegate to the cluster for the next primary.
     def_delegators :cluster, :next_primary
 
-    # Convenience delegators to find.
-    def_delegators :find, :parallel_scan
-
     # Options that can be updated on a new Collection instance via the #with method.
     #
     # @since 2.1.0

data/lib/mongo/collection/view.rb

@@ -60,8 +60,7 @@ module Mongo
                      :client,
                      :cluster,
                      :database,
-                     :read_preference,
-                     :write_concern
+                     :read_preference
 
       # Delegate to the cluster for the next primary.
       def_delegators :cluster, :next_primary
@@ -154,12 +153,20 @@ module Mongo
             " @filter=#{filter.to_s} @options=#{options.to_s}>"
       end
 
-      private
-
+      # Get the write concern on this +View+.
+      #
+      # @example Get the write concern.
+      #   view.write_concern
+      #
+      # @return [ Mongo::WriteConcern ] The write concern.
+      #
+      # @since 2.0.0
       def write_concern
         WriteConcern.get(options[:write] || options[:write_concern] || collection.write_concern)
       end
 
+      private
+
       def initialize_copy(other)
         @collection = other.collection
         @options = other.options.dup
@@ -178,7 +185,7 @@ module Mongo
       end
 
       def apply_collation!(doc, server, opts = {})
-        if coll = opts[:collation] || opts['collation'] || collation
+        if coll = doc[:collation] || opts[:collation] || opts['collation'] || collation
           validate_collation!(server, coll)
           doc[:collation] = coll
         end

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

@@ -126,8 +126,8 @@ module Mongo
             return options if options.empty?
             opts = options.dup
             opts.delete(:cursor_type)
-            Flags.map_flags(options).reduce(opts) do |opts, key|
-              opts.merge!(key => true)
+            Flags.map_flags(options).reduce(opts) do |o, key|
+              o.merge!(key => true)
             end
           end
         end

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

@@ -134,9 +134,9 @@ module Mongo
           cmd[:maxTimeMS] = opts[:max_time_ms] if opts[:max_time_ms]
           cmd[:readConcern] = collection.read_concern if collection.read_concern
           preference = ServerSelector.get(opts[:read] || read)
-          server = preference.select_server(cluster)
-          apply_collation!(cmd, server, opts)
           read_with_retry do
+            server = preference.select_server(cluster, false)
+            apply_collation!(cmd, server, opts)
             Operation::Commands::Command.new({
                                                :selector => cmd,
                                                :db_name => database.name,
@@ -170,9 +170,9 @@ module Mongo
           cmd[:maxTimeMS] = opts[:max_time_ms] if opts[:max_time_ms]
           cmd[:readConcern] = collection.read_concern if collection.read_concern
           preference = ServerSelector.get(opts[:read] || read)
-          server = preference.select_server(cluster)
-          apply_collation!(cmd, server, opts)
           read_with_retry do
+            server = preference.select_server(cluster, false)
+            apply_collation!(cmd, server, opts)
             Operation::Commands::Command.new({
                                                :selector => cmd,
                                                :db_name => database.name,

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

@@ -41,10 +41,10 @@ module Mongo
           cmd[:maxTimeMS] = max_time_ms if max_time_ms
           cmd[:writeConcern] = write_concern.options if write_concern
 
-          server = next_primary
-          apply_collation!(cmd, server, opts)
-
           write_with_retry do
+            server = next_primary
+            apply_collation!(cmd, server, opts)
+
             Operation::Commands::Command.new({
                                               :selector => cmd,
                                               :db_name => database.name
@@ -108,10 +108,10 @@ module Mongo
           cmd[:bypassDocumentValidation] = !!opts[:bypass_document_validation]
           cmd[:writeConcern] = write_concern.options if write_concern
 
-          server = next_primary
-          apply_collation!(cmd, server, opts)
-
           value = write_with_retry do
+            server = next_primary
+            apply_collation!(cmd, server, opts)
+
             Operation::Commands::Command.new({
                                               :selector => cmd,
                                               :db_name => database.name
@@ -213,9 +213,10 @@ module Mongo
 
         def remove(value, opts = {})
           delete_doc = { Operation::Q => filter, Operation::LIMIT => value }
-          server = next_primary
-          apply_collation!(delete_doc, server, opts)
           write_with_retry do
+            server = next_primary
+            apply_collation!(delete_doc, server, opts)
+
             Operation::Write::Delete.new(
               :delete => delete_doc,
               :db_name => collection.database.name,
@@ -230,9 +231,10 @@ module Mongo
                          Operation::U => spec,
                          Operation::MULTI => multi,
                          Operation::UPSERT => !!opts[:upsert] }
-          server = next_primary
-          apply_collation!(update_doc, server, opts)
           write_with_retry do
+            server = next_primary
+            apply_collation!(update_doc, server, opts)
+
             Operation::Write::Update.new(
               :update => update_doc,
               :db_name => collection.database.name,

data/lib/mongo/cursor.rb

@@ -58,6 +58,7 @@ module Mongo
       @initial_result = result
       @remaining = limit if limited?
       @cursor_id = result.cursor_id
+      @coll_name = nil
       register
       ObjectSpace.define_finalizer(self, self.class.finalize(result.cursor_id,
                                                              cluster,

data/lib/mongo/error.rb

@@ -83,6 +83,7 @@ require 'mongo/error/invalid_database_name'
 require 'mongo/error/invalid_document'
 require 'mongo/error/invalid_file'
 require 'mongo/error/invalid_file_revision'
+require 'mongo/error/invalid_min_pool_size'
 require 'mongo/error/invalid_application_name'
 require 'mongo/error/invalid_nonce'
 require 'mongo/error/invalid_replacement_document'

data/lib/mongo/error/invalid_min_pool_size.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
+  class Error
+
+    # Exception that is raised when trying to create a client with an invalid
+    #   min_pool_size option.
+    #
+    # @since 2.4.2
+    class InvalidMinPoolSize < Error
+
+      # Instantiate the new exception.
+      #
+      # @example Instantiate the exception.
+      #   Mongo::Error::InvalidMinPoolSize.new(10, 5)
+      #
+      # @since 2.4.2
+      def initialize(min, max)
+        super("Invalid min pool size: #{min}. Please ensure that it is less than the max size: #{max}. ")
+      end
+    end
+  end
+end

data/lib/mongo/error/operation_failure.rb

@@ -20,19 +20,26 @@ module Mongo
     # @since 2.0.0
     class OperationFailure < Error
 
+      # These are magic error messages that could indicate a master change.
+      #
+      # @since 2.4.2
+      WRITE_RETRY_MESSAGES = [
+        'no master',
+        'not master',
+        'could not contact primary',
+        'Not primary'
+      ].freeze
+
       # These are magic error messages that could indicate a cluster
       # reconfiguration behind a mongos. We cannot check error codes as they
       # change between versions, for example 15988 which has 2 completely
       # different meanings between 2.4 and 3.0.
       #
       # @since 2.1.1
-      RETRY_MESSAGES = [
+      RETRY_MESSAGES = WRITE_RETRY_MESSAGES + [
         'transport error',
         'socket exception',
         "can't connect",
-        'no master',
-        'not master',
-        'could not contact primary',
         'connect failed',
         'error querying',
         'could not get last error',
@@ -42,7 +49,7 @@ module Mongo
         'dbclient error communicating with server'
       ].freeze
 
-      # Can the operation that caused the error be retried?
+      # Can the read operation that caused the error be retried?
       #
       # @example Is the error retryable?
       #   error.retryable?
@@ -53,6 +60,18 @@ module Mongo
       def retryable?
         RETRY_MESSAGES.any?{ |m| message.include?(m) }
       end
+
+      # Can the write operation that caused the error be retried?
+      #
+      # @example Is the error retryable for writes?
+      #   error.write_retryable?
+      #
+      # @return [ true, false ] If the error is retryable.
+      #
+      # @since 2.4.2
+      def write_retryable?
+        WRITE_RETRY_MESSAGES.any? { |m| message.include?(m) }
+      end
     end
   end
 end

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

@@ -176,16 +176,7 @@ module Mongo
             # @return [ Integer ] The number of documents modified.
             #
             # @since 2.2.3
-            def n_modified
-              return 0 unless acknowledged?
-              @replies.reduce(0) do |n, reply|
-                if upsert?(reply)
-                  n
-                else
-                  updated_existing?(reply) ? n += reply.documents.first[N] : n
-                end
-              end
-            end
+            def n_modified; end
 
             private
 

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

@@ -76,6 +76,18 @@ module Mongo
             upsert?.first['_id']
           end
 
+          # Returns the number of documents upserted.
+          #
+          # @example Get the number of upserted documents.
+          #   result.upserted_count
+          #
+          # @return [ Integer ] The number upserted.
+          #
+          # @since 2.4.2
+          def upserted_count
+            upsert? ? n : 0
+          end
+
           private
 
           def upsert?
@@ -121,15 +133,10 @@ module Mongo
           # @example Get the modified count.
           #   result.modified_count
           #
-          # @return [ Integer ] The modified count.
+          # @return [ nil ] Always omitted for legacy versions.
           #
           # @since 2.0.0
-          def modified_count
-            return 0 unless acknowledged?
-            return n if updated_existing?
-            return 0 if upsert?
-            n
-          end
+          def modified_count; end
 
           # The identifier of the inserted document if an upsert
           #   took place.
@@ -144,6 +151,18 @@ module Mongo
             first[UPSERTED] if upsert?
           end
 
+          # Returns the number of documents upserted.
+          #
+          # @example Get the number of upserted documents.
+          #   result.upserted_count
+          #
+          # @return [ Integer ] The number upserted.
+          #
+          # @since 2.4.2
+          def upserted_count
+            upsert? ? n : 0
+          end
+
           private
 
           def upsert?