Merge branch 'master' into 3798

Author: comandeo-mongo

.rubocop_todo.yml

@@ -6,45 +6,12 @@
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 7
-# This cop supports safe autocorrection (--autocorrect).
-Layout/MultilineBlockLayout:
-  Exclude:
-    - 'lib/mongo/crypt/handle.rb'
-
-# Offense count: 2
-# This cop supports safe autocorrection (--autocorrect).
-Layout/RescueEnsureAlignment:
-  Exclude:
-    - 'spec/mongo/collection/view/change_stream_spec.rb'
-    - 'spec/mongo/collection/view/readable_spec.rb'
-
-# Offense count: 8
-# This cop supports unsafe autocorrection (--autocorrect-all).
-# Configuration parameters: RequireParenthesesForMethodChains.
-Lint/AmbiguousRange:
-  Exclude:
-    - 'spec/integration/sdam_events_spec.rb'
-    - 'spec/mongo/server/description/features_spec.rb'
-    - 'spec/runners/unified.rb'
-
 # Offense count: 190
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: AllowSafeAssignment.
 Lint/AssignmentInCondition:
   Enabled: false
 
-# Offense count: 10
-# Configuration parameters: AllowedMethods.
-# AllowedMethods: enums
-Lint/ConstantDefinitionInBlock:
-  Exclude:
-    - 'spec/integration/heartbeat_events_spec.rb'
-    - 'spec/mongo/id_spec.rb'
-    - 'spec/mongo/operation/result_spec.rb'
-    - 'spec/mongo/server/connection_spec.rb'
-    - 'spec/spec_tests/sdam_spec.rb'
-
 # Offense count: 16
 # Configuration parameters: IgnoreLiteralBranches, IgnoreConstantBranches, IgnoreDuplicateElseBranch.
 Lint/DuplicateBranch:
@@ -63,56 +30,13 @@ Lint/DuplicateBranch:
     - 'spec/runners/sdam.rb'
     - 'spec/support/client_registry.rb'
 
-# Offense count: 3
-Lint/DuplicateMethods:
-  Exclude:
-    - 'spec/runners/auth.rb'
-    - 'spec/runners/cmap.rb'
-    - 'spec/support/spec_config.rb'
-
-# Offense count: 8
-# Configuration parameters: AllowComments, AllowEmptyLambdas.
-Lint/EmptyBlock:
-  Exclude:
-    - 'spec/integration/cursor_memory_leak_spec.rb'
-    - 'spec/mongo/auth/user_spec.rb'
-    - 'spec/mongo/cursor_spec.rb'
-    - 'spec/mongo/server/description_spec.rb'
-    - 'spec/mongo/server/round_trip_time_calculator_spec.rb'
-    - 'spec/mongo/uri/srv_protocol_spec.rb'
-
-# Offense count: 3
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: AllowComments.
-Lint/EmptyConditionalBody:
-  Exclude:
-    - 'spec/runners/transactions.rb'
-    - 'spec/spec_tests/uri_options_spec.rb'
-
 # Offense count: 4
 # This cop supports unsafe autocorrection (--autocorrect-all).
 Lint/IncompatibleIoSelectWithFiberScheduler:
   Exclude:
     - 'lib/mongo/socket/ssl.rb'
     - 'lib/mongo/socket/tcp.rb'
 
-# Offense count: 7
-Lint/IneffectiveAccessModifier:
-  Exclude:
-    - 'lib/mongo/operation/shared/polymorphic_result.rb'
-    - 'lib/mongo/protocol/message.rb'
-    - 'lib/mongo/uri/options_mapper.rb'
-
-# Offense count: 4
-# This cop supports unsafe autocorrection (--autocorrect-all).
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: standard_error, runtime_error
-Lint/InheritException:
-  Exclude:
-    - 'lib/mongo/error/raise_original_error.rb'
-    - 'spec/mongo/server/connection_spec.rb'
-    - 'spec/mongo/socket_spec.rb'
-
 # Offense count: 31
 # Configuration parameters: AllowedParentClasses.
 Lint/MissingSuper:
@@ -128,12 +52,6 @@ Lint/NextWithoutAccumulator:
   Exclude:
     - 'lib/mongo/operation/shared/result/aggregatable.rb'
 
-# Offense count: 2
-Lint/NoReturnInBeginEndBlocks:
-  Exclude:
-    - 'lib/mongo/socket/ocsp_verifier.rb'
-    - 'spec/runners/change_streams/test.rb'
-
 # Offense count: 1
 Lint/NonLocalExitFromIterator:
   Exclude:

lib/mongo/cluster/reapers/cursor_reaper.rb

@@ -177,9 +177,10 @@ def kill_cursors
           end
 
           unless server
-            # TODO: We currently don't have a server for the address that the
-            # cursor is associated with. We should leave the cursor in the
-            # queue to be killed at a later time (when the server comes back).
+            # The server for this cursor has gone away --- maybe temporarily,
+            # maybe permanently, but we can't know. To prevent connections from
+            # leaking in the case of a permanent failure, we'll just silently
+            # drop this killspec and move on.
             next
           end
 

lib/mongo/cluster_time.rb

@@ -26,6 +26,8 @@ module Mongo
   #
   # @api private
   class ClusterTime < BSON::Document
+    include Comparable
+
     def initialize(elements = nil)
       super
 
@@ -62,25 +64,6 @@ def <=>(other)
       end
     end
 
-    # Older Rubies do not implement other logical operators through <=>.
-    # TODO revise whether these methods are needed when
-    # https://jira.mongodb.org/browse/RUBY-1622 is implemented.
-    def >=(other)
-      (self <=> other) != -1
-    end
-
-    def >(other)
-      (self <=> other) == 1
-    end
-
-    def <=(other)
-      (self <=> other) != 1
-    end
-
-    def <(other)
-      (self <=> other) == -1
-    end
-
     # Compares two ClusterTime instances by comparing their timestamps.
     def ==(other)
       if self['clusterTime'] && other['clusterTime'] &&

lib/mongo/crypt/handle.rb

@@ -288,8 +288,7 @@ def do_rsaes_pkcs_signature(key_binary_p, input_binary_p,
       # Every crypto binding ignores its first argument, which is an option
       # mongocrypt_ctx_t object and is not required to use crypto hooks.
       def set_crypto_hooks
-        @aes_encrypt = proc do |_, key_binary_p, iv_binary_p, input_binary_p,
-          output_binary_p, response_length_p, status_p|
+        @aes_encrypt = proc do |_, key_binary_p, iv_binary_p, input_binary_p, output_binary_p, response_length_p, status_p|
           do_aes(
             key_binary_p,
             iv_binary_p,
@@ -300,8 +299,7 @@ def set_crypto_hooks
           )
         end
 
-        @aes_decrypt = proc do |_, key_binary_p, iv_binary_p, input_binary_p,
-          output_binary_p, response_length_p, status_p|
+        @aes_decrypt = proc do |_, key_binary_p, iv_binary_p, input_binary_p, output_binary_p, response_length_p, status_p|
           do_aes(
             key_binary_p,
             iv_binary_p,
@@ -319,13 +317,11 @@ def set_crypto_hooks
           end
         end
 
-        @hmac_sha_512 = proc do |_, key_binary_p, input_binary_p,
-          output_binary_p, status_p|
+        @hmac_sha_512 = proc do |_, key_binary_p, input_binary_p, output_binary_p, status_p|
           do_hmac_sha('SHA512', key_binary_p, input_binary_p, output_binary_p, status_p)
         end
 
-        @hmac_sha_256 = proc do |_, key_binary_p, input_binary_p,
-          output_binary_p, status_p|
+        @hmac_sha_256 = proc do |_, key_binary_p, input_binary_p, output_binary_p, status_p|
           do_hmac_sha('SHA256', key_binary_p, input_binary_p, output_binary_p, status_p)
         end
 
@@ -347,8 +343,7 @@ def set_crypto_hooks
           @hmac_hash
         )
 
-        @aes_ctr_encrypt = proc do |_, key_binary_p, iv_binary_p, input_binary_p,
-          output_binary_p, response_length_p, status_p|
+        @aes_ctr_encrypt = proc do |_, key_binary_p, iv_binary_p, input_binary_p, output_binary_p, response_length_p, status_p|
           do_aes(
             key_binary_p,
             iv_binary_p,
@@ -360,8 +355,7 @@ def set_crypto_hooks
           )
         end
 
-        @aes_ctr_decrypt = proc do |_, key_binary_p, iv_binary_p, input_binary_p,
-          output_binary_p, response_length_p, status_p|
+        @aes_ctr_decrypt = proc do |_, key_binary_p, iv_binary_p, input_binary_p, output_binary_p, response_length_p, status_p|
           do_aes(
             key_binary_p,
             iv_binary_p,
@@ -380,8 +374,7 @@ def set_crypto_hooks
           @aes_ctr_decrypt
         )
 
-        @rsaes_pkcs_signature_cb = proc do |_, key_binary_p, input_binary_p,
-          output_binary_p, status_p|
+        @rsaes_pkcs_signature_cb = proc do |_, key_binary_p, input_binary_p, output_binary_p, status_p|
           do_rsaes_pkcs_signature(key_binary_p, input_binary_p, output_binary_p, status_p)
         end
 

lib/mongo/error/raise_original_error.rb

@@ -24,7 +24,7 @@ class Error
     # @note This class must not derive from Error.
     #
     # @api private
-    class RaiseOriginalError < Exception
+    class RaiseOriginalError < Exception # rubocop:disable Lint/InheritException
     end
   end
 end

lib/mongo/operation/result.rb

@@ -104,9 +104,6 @@ class Result
       def initialize(replies, connection_description = nil, connection_global_id = nil, context: nil, connection: nil)
         @context = context
 
-        # TODO: older versions of MongoDB (2.4 and below?) could sometimes end
-        # up with nil here, which indicated an unackowledged write. Is that
-        # still the case? Can we simplify this?
         return unless replies
 
         if replies.is_a?(Array)

lib/mongo/operation/shared/polymorphic_result.rb

@@ -26,12 +26,12 @@ module Operation
     module PolymorphicResult
       include PolymorphicLookup
 
-      private
-
       def self.included(base)
         base.extend ClassMethods
       end
 
+      private
+
       module ClassMethods
         attr_accessor :result_class
       end