mongo 2.10.2 → 2.10.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d640dac0ce599ea7aa742522d55ead0bd20a2f3f4d9a8c632c28eb5090d38b44
-  data.tar.gz: cb6993b9aa97c89f93e6e4018aaa7f2f5de0473566162364d5f8beb6f49df2b8
+  metadata.gz: 530b40af0e0b87333d108098e0252efb044c9ecd366f4b61990e09373345eeb6
+  data.tar.gz: 0460c43dd38a0f6f372913326cf1da273ff9a9aa62e2d9f2b44dcdae652600b3
 SHA512:
-  metadata.gz: 11e03d68d1209e627911032bc2e818c77d100afde0f7b5b0b3166c4b52be2224f50299d086edbfb41b20151e5ea8985cb1c79b095047d72c313830836fd8b4b3
-  data.tar.gz: f450cba2ee21f571c4eb9e94029dc1d883158409fb9e7d2012633466b4445cb659264e0d2f971a0b3b96d699c631cc6d444e20ff5183a18a428b1ced7518f463
+  metadata.gz: 02632d48133a1102fd13a7d5bab3a2770afe1b3e9a1ca1317eada51cdcdbf99f10204e8cbeff9d3ad309f59a4bb7cd026490566337bcaa9ed05e767a600f24a2
+  data.tar.gz: 3eaf94e796cb099293b19d199dec2b2163e23ef284bbc5c0f85006136b5312dbb1f7abc419c05fa23e9f3b54084f5e825cf20b2d2169fa66a732594227978db5

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

@@ -602,7 +602,7 @@ module Mongo
           cmd.execute(server).cursor_ids.map do |cursor_id|
             result = if server.features.find_command_enabled?
               Operation::GetMore.new({
-                :selector => {:getMore => cursor_id,
+                :selector => {:getMore => BSON::Int64.new(cursor_id),
                              :collection => collection.name},
                 :db_name => database.name,
                 :session => session,
@@ -610,7 +610,7 @@ module Mongo
              else
               Operation::GetMore.new({
                 :to_return => 0,
-                :cursor_id => cursor_id,
+                :cursor_id => BSON::Int64.new(cursor_id),
                 :db_name => database.name,
                 :coll_name => collection.name
               }).execute(server)

data/lib/mongo/cursor/builder/get_more_command.rb

@@ -57,7 +57,10 @@ module Mongo
         private
 
         def get_more_command
-          command = { :getMore => cursor.id, :collection => collection_name }
+          command = {
+            :getMore => BSON::Int64.new(cursor.id),
+            :collection => collection_name,
+          }
           command[:batchSize] = batch_size.abs if batch_size && batch_size != 0
           # If the max_await_time_ms option is set, then we set maxTimeMS on
           # the get more command.

data/lib/mongo/cursor/builder/kill_cursors_command.rb

@@ -54,7 +54,10 @@ module Mongo
         private
 
         def kill_cursors_command
-          { :killCursors => collection_name, :cursors => [ cursor.id ] }
+          {
+            killCursors: collection_name,
+            cursors: [ BSON::Int64.new(cursor.id) ],
+          }
         end
 
         class << self
@@ -65,11 +68,19 @@ module Mongo
           #   KillCursorsCommand.update_cursors(spec, ids)
           #
           # @return [ Hash ] The specification.
-          # @return [ Array ] The ids to update with.
+          # @return [ Array<Integer> ] The ids to update with.
           #
           # @since 2.3.0
           def update_cursors(spec, ids)
-            spec[:selector].merge!(cursors: spec[:selector][:cursors] & ids)
+            # Ruby 2.5+ can & BSON::Int64 instances.
+            # Ruby 2.4 and earlier cannot.
+            # Convert stored ids to Ruby integers for compatibility with
+            # older Rubies.
+            ids = get_cursors_list(spec) & ids
+            ids = ids.map do |cursor_id|
+              BSON::Int64.new(cursor_id)
+            end
+            spec[:selector].merge!(cursors: ids)
           end
 
           # Get the list of cursor ids from a spec generated by this Builder.
@@ -77,11 +88,11 @@ module Mongo
           # @example Get the list of cursor ids.
           #   KillCursorsCommand.cursors(spec)
           #
-          # @return [ Hash ] The specification.
+          # @return [ Array<Integer> ] The cursor ids.
           #
           # @since 2.3.0
           def get_cursors_list(spec)
-            spec[:selector][:cursors]
+            spec[:selector][:cursors].map(&:value)
           end
         end
       end

data/lib/mongo/cursor/builder/op_get_more.rb

@@ -50,9 +50,9 @@ module Mongo
         def specification
           {
             :to_return => to_return,
-            :cursor_id => cursor.id,
+            :cursor_id => BSON::Int64.new(cursor.id),
             :db_name   => database.name,
-            :coll_name => collection_name
+            :coll_name => collection_name,
           }
         end
       end

data/lib/mongo/cursor/builder/op_kill_cursors.rb

@@ -48,7 +48,11 @@ module Mongo
         #
         # @since 2.2.0
         def specification
-          { :coll_name => collection_name, :db_name => database.name, :cursor_ids => [ cursor.id ] }
+          {
+            coll_name: collection_name,
+            db_name: database.name,
+            cursor_ids: [ BSON::Int64.new(cursor.id) ],
+          }
         end
 
         class << self
@@ -59,11 +63,19 @@ module Mongo
           #   OpKillCursors.update_cursors(spec, ids)
           #
           # @return [ Hash ] The specification.
-          # @return [ Array ] The ids to update with.
+          # @return [ Array<Integer> ] The ids to update with.
           #
           # @since 2.3.0
           def update_cursors(spec, ids)
-            spec.merge!(cursor_ids: spec[:cursor_ids] & ids)
+            # Ruby 2.5+ can & BSON::Int64 instances.
+            # Ruby 2.4 and earlier cannot.
+            # Convert stored ids to Ruby integers for compatibility with
+            # older Rubies.
+            ids = get_cursors_list(spec) & ids
+            ids = ids.map do |cursor_id|
+              BSON::Int64.new(cursor_id)
+            end
+            spec.merge!(cursor_ids: ids)
           end
 
           # Get the list of cursor ids from a spec generated by this Builder.
@@ -71,11 +83,11 @@ module Mongo
           # @example Get the list of cursor ids.
           #   OpKillCursors.cursors(spec)
           #
-          # @return [ Hash ] The specification.
+          # @return [ Array<Integer> ] The cursor ids.
           #
           # @since 2.3.0
           def get_cursors_list(spec)
-            spec[:cursor_ids]
+            spec[:cursor_ids].map(&:value)
           end
         end
       end

data/lib/mongo/error/operation_failure.rb

@@ -80,15 +80,15 @@ module Mongo
       # @since 2.6.0
       attr_reader :code_name
 
-      # Whether the error is a retryable error according to the legacy read retry
-      # logic.
+      # Whether the error is a retryable error according to the legacy
+      # read retry logic.
       #
       # @return [ true, false ]
       #
       # @since 2.1.1
       # @deprecated
       def retryable?
-        RETRY_MESSAGES.any?{ |m| message.include?(m) }
+        write_retryable? || RETRY_MESSAGES.any?{ |m| message.include?(m) }
       end
 
       # Whether the error is a retryable error according to the modern retryable

data/lib/mongo/protocol/get_more.rb

@@ -110,6 +110,7 @@ module Mongo
         # The get more constant.
         #
         # @since 2.2.0
+        # @deprecated
         GET_MORE = 'getMore'.freeze
 
         # @return [ String ] collection The name of the collection.
@@ -148,7 +149,7 @@ module Mongo
         # @since 2.1.0
         def command
           document = BSON::Document.new
-          document.store(GET_MORE, cursor_id)
+          document.store('getMore', BSON::Int64.new(cursor_id))
           document.store(Message::BATCH_SIZE, number_to_return)
           document.store(Message::COLLECTION, collection)
           document

data/lib/mongo/protocol/kill_cursors.rb

@@ -52,7 +52,7 @@ module Mongo
           command_name: 'killCursors',
           database_name: @database,
           command: upconverter.command,
-          request_id: request_id
+          request_id: request_id,
         )
       end
 
@@ -85,16 +85,6 @@ module Mongo
       # @since 2.1.0
       class Upconverter
 
-        # The kill cursors constant.
-        #
-        # @since 2.2.0
-        KILL_CURSORS = 'killCursors'.freeze
-
-        # The cursors constant.
-        #
-        # @since 2.2.0
-        CURSORS = 'cursors'.freeze
-
         # @return [ String ] collection The name of the collection.
         attr_reader :collection
 
@@ -125,8 +115,11 @@ module Mongo
         # @since 2.1.0
         def command
           document = BSON::Document.new
-          document.store(KILL_CURSORS, collection)
-          document.store(CURSORS, cursor_ids)
+          document.store('killCursors', collection)
+          store_ids = cursor_ids.map do |cursor_id|
+            BSON::Int64.new(cursor_id)
+          end
+          document.store('cursors', store_ids)
           document
         end
       end

data/lib/mongo/protocol/serializers.rb

@@ -102,13 +102,16 @@ module Mongo
       # Serializes and de-serializes one 32-bit integer.
       module Int32
 
-        # Serializes a fixnum to a 4-byte 32-bit integer
+        # Serializes a number to a 32-bit integer
         #
         # @param buffer [ String ] Buffer to receive the serialized Int32.
-        # @param value [ Fixnum ] 32-bit integer to be serialized.
+        # @param value [ Integer | BSON::Int32 ] 32-bit integer to be serialized.
         #
         # @return [String] Buffer with serialized value.
         def self.serialize(buffer, value, validating_keys = BSON::Config.validating_keys?)
+          if value.is_a?(BSON::Int32)
+            value = value.value
+          end
           buffer.put_int32(value)
         end
 
@@ -127,13 +130,16 @@ module Mongo
       # Serializes and de-serializes one 64-bit integer.
       module Int64
 
-        # Serializes a fixnum to an 8-byte 64-bit integer
+        # Serializes a number to a 64-bit integer
         #
         # @param buffer [ String ] Buffer to receive the serialized Int64.
-        # @param value [ Fixnum ] 64-bit integer to be serialized.
+        # @param value [ Integer | BSON::Int64 ] 64-bit integer to be serialized.
         #
         # @return [ String ] Buffer with serialized value.
         def self.serialize(buffer, value, validating_keys = BSON::Config.validating_keys?)
+          if value.is_a?(BSON::Int64)
+            value = value.value
+          end
           buffer.put_int64(value)
         end
 

data/lib/mongo/retryable.rb

@@ -119,7 +119,12 @@ module Mongo
         legacy_read_with_retry(session, server_selector, &block)
       else
         server = select_server(cluster, server_selector, session)
-        yield server
+        begin
+          yield server
+        rescue Error::SocketError, Error::SocketTimeoutError, Error::OperationFailure => e
+          e.add_note('retries disabled')
+          raise e
+        end
       end
     end
 
@@ -214,12 +219,14 @@ module Mongo
       begin
         yield(server, txn_num, false)
       rescue Error::SocketError, Error::SocketTimeoutError => e
+        e.add_note('modern retry')
         e.add_note("attempt 1")
         if session.in_transaction? && !ending_transaction
           raise e
         end
         retry_write(e, session, txn_num, &block)
       rescue Error::OperationFailure => e
+        e.add_note('modern retry')
         e.add_note("attempt 1")
         if e.unsupported_retryable_write?
           raise_unsupported_error(e)
@@ -250,7 +257,12 @@ module Mongo
     def nro_write_with_retry(session, write_concern, &block)
       if session && session.client.options[:retry_writes]
         server = select_server(cluster, ServerSelector.primary, session)
-        yield server
+        begin
+          yield server
+        rescue Error::SocketError, Error::SocketTimeoutError, Error::OperationFailure => e
+          e.add_note('retries disabled')
+          raise e
+        end
       else
         legacy_write_with_retry(nil, session, &block)
       end
@@ -280,7 +292,8 @@ module Mongo
         server ||= select_server(cluster, ServerSelector.primary, session)
         yield server
       rescue Error::OperationFailure => e
-        e.add_note("attempt #{attempt + 1}")
+        e.add_note('legacy retry')
+        e.add_note("attempt #{attempt}")
         server = nil
         if attempt > client.max_write_retries
           raise e
@@ -298,18 +311,19 @@ module Mongo
     private
 
     def modern_read_with_retry(session, server_selector, &block)
-      attempt = 0
       server = select_server(cluster, server_selector, session)
       begin
         yield server
       rescue Error::SocketError, Error::SocketTimeoutError => e
-        e.add_note("attempt #{attempt + 1}")
+        e.add_note('modern retry')
+        e.add_note("attempt 1")
         if session.in_transaction?
           raise e
         end
         retry_read(e, server_selector, session, &block)
       rescue Error::OperationFailure => e
-        e.add_note("attempt #{attempt + 1}")
+        e.add_note('modern retry')
+        e.add_note("attempt 1")
         if session.in_transaction? || !e.write_retryable?
           raise e
         end
@@ -324,7 +338,8 @@ module Mongo
         attempt += 1
         yield server
       rescue Error::SocketError, Error::SocketTimeoutError => e
-        e.add_note("attempt #{attempt + 1}")
+        e.add_note('legacy retry')
+        e.add_note("attempt #{attempt}")
         if attempt > client.max_read_retries || (session && session.in_transaction?)
           raise e
         end
@@ -332,8 +347,9 @@ module Mongo
         server = select_server(cluster, server_selector, session)
         retry
       rescue Error::OperationFailure => e
-        e.add_note("attempt #{attempt + 1}")
-        if cluster.sharded? && e.retryable? && !(session && session.in_transaction?)
+        e.add_note('legacy retry')
+        e.add_note("attempt #{attempt}")
+        if e.retryable? && !(session && session.in_transaction?)
           if attempt > client.max_read_retries
             raise e
           end
@@ -375,9 +391,11 @@ module Mongo
       begin
         yield server, true
       rescue Error::SocketError, Error::SocketTimeoutError => e
+        e.add_note('modern retry')
         e.add_note("attempt 2")
         raise e
       rescue Error::OperationFailure => e
+        e.add_note('modern retry')
         unless e.write_retryable?
           original_error.add_note("later retry failed: #{e.class}: #{e}")
           raise original_error
@@ -385,6 +403,7 @@ module Mongo
         e.add_note("attempt 2")
         raise e
       rescue => e
+        e.add_note('modern retry')
         original_error.add_note("later retry failed: #{e.class}: #{e}")
         raise original_error
       end
@@ -398,15 +417,19 @@ module Mongo
       # server unknown). Here we just need to wait for server selection.
       server = select_server(cluster, ServerSelector.primary, session)
       unless server.retry_writes?
+        # Do not need to add "modern retry" here, it should already be on
+        # the first exception.
         original_error.add_note('did not retry because server selected for retry does not supoprt retryable writes')
         raise original_error
       end
       log_retry(original_error, message: 'Write retry')
       yield(server, txn_num, true)
     rescue Error::SocketError, Error::SocketTimeoutError => e
+      e.add_note('modern retry')
       e.add_note('attempt 2')
       raise e
     rescue Error::OperationFailure => e
+      e.add_note('modern retry')
       if e.write_retryable?
         e.add_note('attempt 2')
         raise e
@@ -415,6 +438,8 @@ module Mongo
         raise original_error
       end
     rescue => e
+      # Do not need to add "modern retry" here, it should already be on
+      # the first exception.
       original_error.add_note("later retry failed: #{e.class}: #{e}")
       raise original_error
     end

data/lib/mongo/version.rb

@@ -17,5 +17,5 @@ module Mongo
   # The current version of the driver.
   #
   # @since 2.0.0
-  VERSION = '2.10.2'.freeze
+  VERSION = '2.10.3'.freeze
 end

data/mongo.gemspec

@@ -32,5 +32,5 @@ Gem::Specification.new do |s|
   s.require_paths     = ['lib']
   s.bindir            = 'bin'
 
-  s.add_dependency 'bson', '>=4.4.2', '<5.0.0'
+  s.add_dependency 'bson', '>=4.6.0', '<5.0.0'
 end

data/spec/integration/cursor_reaping_spec.rb

@@ -59,7 +59,7 @@ describe 'Cursor reaping' do
       client.cluster.instance_variable_get('@periodic_executor').execute
 
       started_event = EventSubscriber.started_events.detect do |event|
-        event.command['killCursors'] && event.command['cursors'].include?(cursor_id)
+        event.command['killCursors'] && event.command['cursors'].map(&:value).include?(cursor_id)
       end
 
       expect(started_event).not_to be_nil

data/spec/integration/get_more_spec.rb

@@ -0,0 +1,32 @@
+require 'spec_helper'
+
+describe 'getMore operation' do
+  # https://jira.mongodb.org/browse/RUBY-1987
+  min_server_fcv '3.2'
+
+  let(:collection) do
+    subscribed_client['get_more_spec']
+  end
+
+  let(:scope) do
+    collection.find.batch_size(1).each
+  end
+
+  before do
+    collection.delete_many
+    collection.insert_one(a: 1)
+    #collection.insert_one(a: 2)
+    EventSubscriber.clear_events!
+  end
+
+  let(:get_more_command) do
+    event = EventSubscriber.single_command_started_event('getMore')
+    event.command['getMore']
+  end
+
+  it 'sends cursor id as int64' do
+    scope.to_a
+
+    expect(get_more_command).to be_a(BSON::Int64)
+  end
+end