mongo 2.2.2 → 2.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 72df9675f13de7a6111464ef0089ba64b4ef11af
-  data.tar.gz: 20832950dd436fb031938d2e164cca2c7fe5d84c
+  metadata.gz: 4aa2e3cfc044a5c4e8c69c0a951c485db0aa93b7
+  data.tar.gz: 86f18a46a73a5d7d0234eb8468833258c441247c
 SHA512:
-  metadata.gz: eaaf003581ddec08e424a7a8168917b4a971514029527229ffe0e1a5746715be52caf0eb8e1f3ef4af29e35d744b23240282fecfa157280f4e31cb4f8c03bfbf
-  data.tar.gz: 32dd69254433179769be7b7d030e230da1b499ce59da53ab1535b1d736cca6dd2a3bb8d1516323abdf3f8dbb7d2285356ef011c708f8a460cc2ffa1e4e88f015
+  metadata.gz: 26109683ee810a6af091755feb5a2cbbbf578c28177194abb3601efe2478b77b9cb4cd261e3dfe69d3d7dd33daa40e326c3e10ab2cc5c89b7b0d7c6401b90ca2
+  data.tar.gz: 4109ba38cfb7841490a7216e61b8e16e97edffbeb438afc418a24876f10c6f6b092128402e218786df74c82ee047c1f9917d2e4bb1a4e1d6022bb37631c06819

data/Rakefile

@@ -41,3 +41,158 @@ namespace :docs do
     system "yardoc -o #{out} --title mongo-#{Mongo::VERSION}"
   end
 end
+
+require_relative "profile/benchmarking"
+
+# Some require data files, available from the drivers team. See the comments above each task for details."
+namespace :benchmark do
+  desc "Run the driver benchmark tests."
+
+  namespace :micro do
+    desc "Run the common driver micro benchmarking tests"
+
+    namespace :flat do
+      desc "Benchmarking for flat bson documents."
+
+      # Requirement: A file in Mongo::Benchmarking::DATA_PATH, called flat_bson.json.
+      task :encode do
+        puts "MICRO BENCHMARK:: FLAT:: ENCODE"
+        Mongo::Benchmarking::Micro.run(:flat, :encode)
+      end
+
+      # Requirement: A file in Mongo::Benchmarking::DATA_PATH, called flat_bson.json.
+      task :decode do
+        puts "MICRO BENCHMARK:: FLAT:: DECODE"
+        Mongo::Benchmarking::Micro.run(:flat, :decode)
+      end
+    end
+
+    namespace :deep do
+      desc "Benchmarking for deep bson documents."
+
+      # Requirement: A file in Mongo::Benchmarking::DATA_PATH, called deep_bson.json.
+      task :encode do
+        puts "MICRO BENCHMARK:: DEEP:: ENCODE"
+        Mongo::Benchmarking::Micro.run(:deep, :encode)
+      end
+
+      # Requirement: A file in Mongo::Benchmarking::DATA_PATH, called deep_bson.json.
+      task :decode do
+        puts "MICRO BENCHMARK:: DEEP:: DECODE"
+        Mongo::Benchmarking::Micro.run(:deep, :decode)
+      end
+    end
+
+    namespace :full do
+      desc "Benchmarking for full bson documents."
+
+      # Requirement: A file in Mongo::Benchmarking::DATA_PATH, called full_bson.json.
+      task :encode do
+        puts "MICRO BENCHMARK:: FULL:: ENCODE"
+        Mongo::Benchmarking::Micro.run(:full, :encode)
+      end
+
+      # Requirement: A file in Mongo::Benchmarking::DATA_PATH, called full_bson.json.
+      task :decode do
+        puts "MICRO BENCHMARK:: FULL:: DECODE"
+        Mongo::Benchmarking::Micro.run(:full, :decode)
+      end
+    end
+  end
+
+  namespace :single_doc do
+    desc "Run the common driver single-document benchmarking tests"
+    task :command do
+      puts "SINGLE DOC BENCHMARK:: COMMAND"
+      Mongo::Benchmarking::SingleDoc.run(:command)
+    end
+
+    # Requirement: A file in Mongo::Benchmarking::DATA_PATH, called TWEET.json.
+    task :find_one do
+      puts "SINGLE DOC BENCHMARK:: FIND ONE BY ID"
+      Mongo::Benchmarking::SingleDoc.run(:find_one)
+    end
+
+    # Requirement: A file in Mongo::Benchmarking::DATA_PATH, called SMALL_DOC.json.
+    task :insert_one_small do
+      puts "SINGLE DOC BENCHMARK:: INSERT ONE SMALL DOCUMENT"
+      Mongo::Benchmarking::SingleDoc.run(:insert_one_small)
+    end
+
+    # Requirement: A file in Mongo::Benchmarking::DATA_PATH, called LARGE_DOC.json.
+    task :insert_one_large do
+      puts "SINGLE DOC BENCHMARK:: INSERT ONE LARGE DOCUMENT"
+      Mongo::Benchmarking::SingleDoc.run(:insert_one_large)
+    end
+  end
+
+  namespace :multi_doc do
+    desc "Run the common driver multi-document benchmarking tests"
+
+    # Requirement: A file in Mongo::Benchmarking::DATA_PATH, called TWEET.json.
+    task :find_many do
+      puts "MULTI DOCUMENT BENCHMARK:: FIND MANY"
+      Mongo::Benchmarking::MultiDoc.run(:find_many)
+    end
+
+    # Requirement: A file in Mongo::Benchmarking::DATA_PATH, called SMALL_DOC.json.
+    task :bulk_insert_small do
+      puts "MULTI DOCUMENT BENCHMARK:: BULK INSERT SMALL"
+      Mongo::Benchmarking::MultiDoc.run(:bulk_insert_small)
+    end
+
+    # Requirement: A file in Mongo::Benchmarking::DATA_PATH, called LARGE_DOC.json.
+    task :bulk_insert_large do
+      puts "MULTI DOCUMENT BENCHMARK:: BULK INSERT LARGE"
+      Mongo::Benchmarking::MultiDoc.run(:bulk_insert_large)
+    end
+
+    # Requirement: A file in Mongo::Benchmarking::DATA_PATH, called GRIDFS_LARGE.
+    task :gridfs_upload do
+      puts "MULTI DOCUMENT BENCHMARK:: GRIDFS UPLOAD"
+      Mongo::Benchmarking::MultiDoc.run(:gridfs_upload)
+    end
+
+    # Requirement: A file in Mongo::Benchmarking::DATA_PATH, called GRIDFS_LARGE.
+    task :gridfs_download do
+      puts "MULTI DOCUMENT BENCHMARK:: GRIDFS DOWNLOAD"
+      Mongo::Benchmarking::MultiDoc.run(:gridfs_download)
+    end
+  end
+
+  namespace :parallel do
+    desc "Run the common driver paralell ETL benchmarking tests"
+
+    # Requirement: A directory in Mongo::Benchmarking::DATA_PATH, called LDJSON_MULTI,
+    # with the files used in this task.
+    task :import do
+      puts "PARALLEL ETL BENCHMARK:: IMPORT"
+      Mongo::Benchmarking::Parallel.run(:import)
+    end
+
+    # Requirement: A directory in Mongo::Benchmarking::DATA_PATH, called LDJSON_MULTI,
+    # with the files used in this task.
+    # Requirement: Another directory in "#{Mongo::Benchmarking::DATA_PATH}/LDJSON_MULTI"
+    # called 'output'.
+    task :export do
+      puts "PARALLEL ETL BENCHMARK:: EXPORT"
+      Mongo::Benchmarking::Parallel.run(:export)
+    end
+
+    # Requirement: A directory in Mongo::Benchmarking::DATA_PATH, called GRIDFS_MULTI,
+    # with the files used in this task.
+    task :gridfs_upload do
+      puts "PARALLEL ETL BENCHMARK:: GRIDFS UPLOAD"
+      Mongo::Benchmarking::Parallel.run(:gridfs_upload)
+    end
+
+    # Requirement: A directory in Mongo::Benchmarking::DATA_PATH, called GRIDFS_MULTI,
+    # with the files used in this task.
+    # Requirement: Another directory in "#{Mongo::Benchmarking::DATA_PATH}/GRIDFS_MULTI"
+    # called 'output'.
+    task :gridfs_download do
+      puts "PARALLEL ETL BENCHMARK:: GRIDFS DOWNLOAD"
+      Mongo::Benchmarking::Parallel.run(:gridfs_download)
+    end
+  end
+end

data/lib/mongo/bulk_write/result.rb

@@ -166,7 +166,7 @@ module Mongo
       #
       # @since 2.1.0
       def upserted_ids
-        @results[UPSERTED_IDS]
+        @results[UPSERTED_IDS] || []
       end
 
       # Validates the bulk write result.

data/lib/mongo/bulk_write/result_combiner.rb

@@ -77,18 +77,20 @@ module Mongo
 
       def combine_counts!(result)
         Result::FIELDS.each do |field|
-          if result.respond_to?(field)
-            results.merge!(field => (results[field] || 0) + result.send(field))
+          if result.respond_to?(field) && value = result.send(field)
+            results.merge!(field => (results[field] || 0) + value)
           end
         end
       end
 
       def combine_ids!(result)
         if result.respond_to?(Result::INSERTED_IDS)
-          results.merge!(Result::INSERTED_IDS => result.inserted_ids)
+          results[Result::INSERTED_IDS] = (results[Result::INSERTED_IDS] || []) +
+                                            result.inserted_ids
         end
         if result.respond_to?(Result::UPSERTED)
-          results.merge!(Result::UPSERTED_IDS => result.upserted.map{ |doc| doc['_id'] })
+          results[Result::UPSERTED_IDS] = (results[Result::UPSERTED_IDS] || []) +
+                                            result.upserted.map{ |doc| doc['_id'] }
         end
       end
 
@@ -109,7 +111,8 @@ module Mongo
 
       def combine_write_concern_errors!(result)
         if write_concern_errors = result.aggregate_write_concern_errors(count)
-          results.merge!(Error::WRITE_CONCERN_ERRORS => write_concern_errors)
+          results[Error::WRITE_CONCERN_ERRORS] = (results[Error::WRITE_CONCERN_ERRORS] || []) +
+                                                   write_concern_errors
         end
       end
     end

data/lib/mongo/cluster/topology/replica_set.rb

@@ -144,7 +144,8 @@ module Mongo
         #
         # @since 2.0.6
         def add_hosts?(description, servers)
-          !!(member_of_this_set?(description) && !has_primary?(servers))
+          !!(member_of_this_set?(description) &&
+              (!has_primary?(servers) || description.primary?))
         end
 
         # Whether a description can be used to remove hosts from the cluster.

data/lib/mongo/error.rb

@@ -62,6 +62,11 @@ module Mongo
     #
     # @since 2.0.0
     BAD_VALUE = 2.freeze
+
+    # Constant for a Cursor not found error.
+    #
+    # @since 2.2.3
+    CURSOR_NOT_FOUND = 'Cursor not found.'
   end
 end
 

data/lib/mongo/error/parser.rb

@@ -27,6 +27,9 @@ module Mongo
       # @return [ String ] message The error message parsed from the document.
       attr_reader :message
 
+      # @return [ Array<Protocol::Reply> ] replies The message replies.
+      attr_reader :replies
+
       # Create the new parser with the returned document.
       #
       # @example Create the new parser.
@@ -35,8 +38,9 @@ module Mongo
       # @param [ BSON::Document ] document The returned document.
       #
       # @since 2.0.0
-      def initialize(document)
+      def initialize(document, replies = nil)
         @document = document || {}
+        @replies = replies
         parse!
       end
 
@@ -50,6 +54,7 @@ module Mongo
         parse_multiple(@message, WRITE_ERRORS)
         parse_single(@message, ERRMSG,
                      document[WRITE_CONCERN_ERROR]) if document[WRITE_CONCERN_ERROR]
+        parse_flag(@message)
       end
 
       def parse_single(message, key, doc = document)
@@ -66,6 +71,12 @@ module Mongo
         end
       end
 
+      def parse_flag(message)
+        if replies && replies.first && replies.first.cursor_not_found?
+          append(message, CURSOR_NOT_FOUND)
+        end
+      end
+
       def append(message, error)
         if message.length > 1
           message.concat(", #{error}")

data/lib/mongo/operation/result.rb

@@ -290,7 +290,7 @@ module Mongo
       end
 
       def parser
-        @parser ||= Error::Parser.new(first_document)
+        @parser ||= Error::Parser.new(first_document, replies)
       end
 
       def first_document
@@ -298,7 +298,7 @@ module Mongo
       end
 
       def query_failure?
-        replies.first && replies.first.query_failure?
+        replies.first && (replies.first.query_failure? || replies.first.cursor_not_found?)
       end
     end
   end

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

@@ -34,7 +34,11 @@ module Mongo
             def n_removed
               return 0 unless acknowledged?
               @replies.reduce(0) do |n, reply|
-                n += reply.documents.first[Result::N]
+                if reply.documents.first[Result::N]
+                  n += reply.documents.first[Result::N]
+                else
+                  n
+                end
               end
             end
           end

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

@@ -46,9 +46,9 @@ module Mongo
               return 0 unless acknowledged?
               @replies.reduce(0) do |n, reply|
                 if upsert?(reply)
-                  n += 1
+                  n += reply.documents.first[UPSERTED].size
                 else
-                  n += 0
+                  n
                 end
               end
             end
@@ -65,14 +65,22 @@ module Mongo
               return 0 unless acknowledged?
               @replies.reduce(0) do |n, reply|
                 if upsert?(reply)
-                  n += 0
+                  reply.documents.first[N] - n_upserted
                 else
-                  n += reply.documents.first[N]
+                  if reply.documents.first[N]
+                    n += reply.documents.first[N]
+                  else
+                    n
+                  end
                 end
               end
             end
 
             # Gets the number of documents modified.
+            # Not that in a mixed sharded cluster a call to
+            # update could return nModified (>= 2.6) or not (<= 2.4).
+            # If any call does not return nModified we can't report
+            # a valid final count so set the field to nil.
             #
             # @example Get the modified count.
             #   result.n_modified
@@ -83,7 +91,11 @@ module Mongo
             def n_modified
               return 0 unless acknowledged?
               @replies.reduce(0) do |n, reply|
-                n += reply.documents.first[MODIFIED] || 0
+                if n && reply.documents.first[MODIFIED]
+                  n += reply.documents.first[MODIFIED]
+                else
+                  nil
+                end
               end
             end
 
@@ -155,12 +167,31 @@ module Mongo
                 end
               end
             end
-            alias :n_modified :n_matched
+
+            # Gets the number of documents modified.
+            #
+            # @example Get the modified count.
+            #   result.n_modified
+            #
+            # @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
 
             private
 
             def upsert?(reply)
-              !updated_existing?(reply) && reply.documents.first[N] == 1
+              reply.documents.first[BulkWrite::Result::UPSERTED] ||
+                (!updated_existing?(reply) && reply.documents.first[N] == 1)
             end
 
             def updated_existing?(reply)

data/lib/mongo/protocol/reply.rb

@@ -38,6 +38,18 @@ module Mongo
         flags.include?(:query_failure)
       end
 
+      # Determine if the reply had a cursor not found flag.
+      #
+      # @example Did the reply have a cursor not found flag.
+      #   reply.cursor_not_found?
+      #
+      # @return [ true, false ] If the query cursor was not found.
+      #
+      # @since 2.2.3
+      def cursor_not_found?
+        flags.include?(:cursor_not_found)
+      end
+
       # Return the event payload for monitoring.
       #
       # @example Return the event payload.

data/lib/mongo/server/description.rb

@@ -147,7 +147,7 @@ module Mongo
       # Fields to exclude when comparing two descriptions.
       #
       # @since 2.0.6
-      EXCLUDE_FOR_COMPARISON = [ LOCAL_TIME, ELECTION_ID, SET_VERSION ].freeze
+      EXCLUDE_FOR_COMPARISON = [ LOCAL_TIME ].freeze
 
       # @return [ Address ] address The server's address.
       attr_reader :address
@@ -570,7 +570,6 @@ module Mongo
       # @since 2.0.6
       def ==(other)
         return false if self.class != other.class
-        return true if config == other.config
         compare_config(other)
       end
       alias_method :eql?, :==

data/lib/mongo/uri.rb

@@ -168,9 +168,10 @@ module Mongo
     #
     # @since 2.0.0
     AUTH_MECH_MAP = {
-      'PLAIN'      => :plain,
-      'MONGODB-CR' => :mongodb_cr,
-      'GSSAPI'     => :gssapi
+      'PLAIN'       => :plain,
+      'MONGODB-CR'  => :mongodb_cr,
+      'GSSAPI'      => :gssapi,
+      'SCRAM-SHA-1' => :scram
     }.freeze
 
     # Options that are allowed to appear more than once in the uri.