mongo 2.23.0 → 2.24.0

data/lib/mongo/client_encryption.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# rubocop:todo all
 
 # Copyright (C) 2019-2020 MongoDB Inc.
 #
@@ -81,7 +80,7 @@ module Mongo
     #
     # @return [ BSON::Binary ] The 16-byte UUID of the new data key as a
     #   BSON::Binary object with type :uuid.
-    def create_data_key(kms_provider, options={})
+    def create_data_key(kms_provider, options = {})
       key_document = Crypt::KMS::MasterKeyDocument.new(kms_provider, options)
 
       key_alt_names = options[:key_alt_names]
@@ -119,7 +118,7 @@ module Mongo
     #
     # @raise [ ArgumentError ] if either contention_factor or query_type
     #   is set, and algorithm is not "Indexed".
-    def encrypt(value, options={})
+    def encrypt(value, options = {})
       @encrypter.encrypt(value, options)
     end
 
@@ -220,7 +219,7 @@ module Mongo
     def get_keys
       @encrypter.get_keys
     end
-    alias :keys :get_keys
+    alias keys get_keys
 
     # Removes a key_alt_name from a key in the key vault collection with the given id.
     #
@@ -273,7 +272,7 @@ module Mongo
       encrypted_fields = create_data_keys(coll_opts[:encrypted_fields], kms_provider, master_key)
       begin
         new_coll_opts = coll_opts.dup.merge(encrypted_fields: encrypted_fields)
-        [database[coll_name].create(new_coll_opts), encrypted_fields]
+        [ database[coll_name].create(new_coll_opts), encrypted_fields ]
       rescue Mongo::Error => e
         raise Error::CryptError, "Error creating collection with encrypted fields \
               #{encrypted_fields}: #{e.class}: #{e.message}"

data/lib/mongo/cluster/periodic_executor.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# rubocop:todo all
 
 # Copyright (C) 2014-2020 MongoDB Inc.
 #
@@ -16,9 +15,7 @@
 # limitations under the License.
 
 module Mongo
-
   class Cluster
-
     # A manager that calls #execute on its executors at a regular interval.
     #
     # @api private
@@ -53,7 +50,7 @@ module Mongo
 
       attr_reader :options
 
-      alias :restart! :run!
+      alias restart! run!
 
       def do_work
         execute
@@ -69,7 +66,7 @@ module Mongo
 
         begin
           flush
-        rescue
+        rescue StandardError
         end
 
         true

data/lib/mongo/cluster/reapers/cursor_reaper.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# rubocop:todo all
 
 # Copyright (C) 2014-2020 MongoDB Inc.
 #
@@ -16,9 +15,7 @@
 # limitations under the License.
 
 module Mongo
-
   class Cluster
-
     # A manager that sends kill cursors operations at regular intervals to close
     # cursors that have been garbage collected without being exhausted.
     #
@@ -32,7 +29,7 @@ module Mongo
       # kill cursors operations.
       #
       # @since 2.3.0
-      FREQUENCY = 1.freeze
+      FREQUENCY = 1
 
       # Create a cursor reaper.
       #
@@ -69,12 +66,8 @@ module Mongo
       #
       # @since 2.3.0
       def register_cursor(id)
-        if id.nil?
-          raise ArgumentError, 'register_cursor called with nil cursor_id'
-        end
-        if id == 0
-          raise ArgumentError, 'register_cursor called with cursor_id=0'
-        end
+        raise ArgumentError, 'register_cursor called with nil cursor_id' if id.nil?
+        raise ArgumentError, 'register_cursor called with cursor_id=0' if id == 0
 
         @mutex.synchronize do
           @active_cursor_ids << id
@@ -92,12 +85,8 @@ module Mongo
       #
       # @since 2.3.0
       def unregister_cursor(id)
-        if id.nil?
-          raise ArgumentError, 'unregister_cursor called with nil cursor_id'
-        end
-        if id == 0
-          raise ArgumentError, 'unregister_cursor called with cursor_id=0'
-        end
+        raise ArgumentError, 'unregister_cursor called with nil cursor_id' if id.nil?
+        raise ArgumentError, 'unregister_cursor called with cursor_id=0' if id == 0
 
         @mutex.synchronize do
           @active_cursor_ids.delete(id)
@@ -106,7 +95,7 @@ module Mongo
 
       # Read and decode scheduled kill cursors operations.
       #
-      # This method mutates instance variables without locking, so is is not
+      # This method mutates instance variables without locking, so it is not
       # thread safe. Generally, it should not be called itself, this is a helper
       # for `kill_cursor` method.
       #
@@ -116,6 +105,10 @@ module Mongo
           if @active_cursor_ids.include?(kill_spec.cursor_id)
             @to_kill[kill_spec.server_address] ||= Set.new
             @to_kill[kill_spec.server_address] << kill_spec
+          elsif (session = kill_spec.session) && session.implicit?
+            # Cursor was already closed; end the session immediately to release
+            # references rather than waiting for the kill_spec to go out of scope.
+            session.end_session
           end
         end
       rescue ThreadError
@@ -131,7 +124,7 @@ module Mongo
       #
       # @since 2.3.0
       def kill_cursors
-        # TODO optimize this to batch kill cursor operations for the same
+        # TODO: optimize this to batch kill cursor operations for the same
         # server/database/collection instead of killing each cursor
         # individually.
         loop do
@@ -173,7 +166,7 @@ module Mongo
           # operation, though this would make that operation have a
           # different API from all of the other ones which accept hashes.
           spec = {
-            cursor_ids: [kill_spec.cursor_id],
+            cursor_ids: [ kill_spec.cursor_id ],
             coll_name: kill_spec.coll_name,
             db_name: kill_spec.db_name,
           }
@@ -184,9 +177,10 @@ module Mongo
           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
 
@@ -201,15 +195,13 @@ module Mongo
             op.execute(server, context: Operation::Context.new(options: options))
           end
 
-          if session = kill_spec.session
-            if session.implicit?
-              session.end_session
-            end
-          end
+          next unless session = kill_spec.session
+
+          session.end_session if session.implicit?
         end
       end
-      alias :execute :kill_cursors
-      alias :flush :kill_cursors
+      alias execute kill_cursors
+      alias flush kill_cursors
     end
   end
 end

data/lib/mongo/cluster/reapers/socket_reaper.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# rubocop:todo all
 
 # Copyright (C) 2014-2020 MongoDB Inc.
 #
@@ -16,9 +15,7 @@
 # limitations under the License.
 
 module Mongo
-
   class Cluster
-
     # A manager that calls a method on each of a cluster's pools to close idle
     #  sockets.
     #
@@ -26,7 +23,6 @@ module Mongo
     #
     # @since 2.5.0
     class SocketReaper
-
       # Initialize the SocketReaper object.
       #
       # @example Initialize the socket reaper.
@@ -58,8 +54,7 @@ module Mongo
       #   garbage collected.
       #
       # @since 2.5.0
-      def flush
-      end
+      def flush; end
     end
   end
 end