mongo 2.18.2 → 2.19.1

data/spec/support/client_registry.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-# encoding: utf-8
+# rubocop:todo all
 
 require 'singleton'
 
@@ -55,7 +55,7 @@ class ClientRegistry
 
   class << self
     def client_perished?(client)
-      if !client.cluster.connected?
+      if !client.cluster.connected? || client.closed?
         true
       else
         perished = false
@@ -86,6 +86,10 @@ class ClientRegistry
     @global_clients[name] = new_global_client(name)
   end
 
+  def new_authorized_client
+    new_global_client('authorized')
+  end
+
   def new_global_client(name)
     case name
     # Provides a basic scanned client to do a hello check.

data/spec/support/client_registry_macros.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-# encoding: utf-8
+# rubocop:todo all
 
 module ClientRegistryMacros
   def new_local_client(address, options=nil, &block)

data/spec/support/cluster_tools.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-# encoding: utf-8
+# rubocop:todo all
 
 require 'singleton'
 
@@ -113,7 +113,7 @@ class ClusterTools
   # @param [ Mongo::Address ] address
   def step_up(address)
     client = direct_client(address)
-    start = Time.now
+    start = Mongo::Utils.monotonic_time
     loop do
       begin
         client.database.command(replSetStepUp: 1)
@@ -128,7 +128,7 @@ class ClusterTools
           raise
         end
 
-        if Time.now > start + 10
+        if Mongo::Utils.monotonic_time > start + 10
           raise e
         end
       end
@@ -145,7 +145,7 @@ class ClusterTools
   # - call step down on the existing primary
   # - call step up on the target in a loop until it becomes the primary
   def change_primary
-    start = Time.now
+    start = Mongo::Utils.monotonic_time
     existing_primary = admin_client.cluster.next_primary
     existing_primary_address = existing_primary.address
 
@@ -175,11 +175,11 @@ class ClusterTools
     persistently_step_up(target.address)
 
     new_primary = admin_client.cluster.next_primary
-    puts "#{Time.now} [CT] Primary changed to #{new_primary.address}. Time to change primaries: #{Time.now - start}"
+    puts "#{Time.now} [CT] Primary changed to #{new_primary.address}. Time to change primaries: #{Mongo::Utils.monotonic_time - start}"
   end
 
   def persistently_step_up(address)
-    start = Time.now
+    start = Mongo::Utils.monotonic_time
     loop do
       puts "#{Time.now} [CT] Asking #{address} to step up"
 
@@ -189,7 +189,7 @@ class ClusterTools
         break
       end
 
-      if Time.now - start > 10
+      if Mongo::Utils.monotonic_time - start > 10
         raise "Unable to get #{address} instated as primary after 10 seconds"
       end
     end
@@ -332,6 +332,11 @@ class ClusterTools
   end
 
   def direct_client(address, options = {})
+    connect = if SpecConfig.instance.connect_options[:connect] == :load_balanced
+      :load_balanced
+    else
+      :direct
+    end
     @direct_clients ||= {}
     cache_key = {address: address}.update(options)
     (
@@ -339,7 +344,7 @@ class ClusterTools
         [address.to_s],
         SpecConfig.instance.test_options.merge(
           SpecConfig.instance.auth_options).merge(
-          connect: :direct, server_selection_timeout: 10).merge(options))
+          connect: connect, server_selection_timeout: 10).merge(options))
     ).tap do |client|
       ClientRegistry.reconnect_client_if_perished(client)
     end

data/spec/support/common_shortcuts.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-# encoding: utf-8
+# rubocop:todo all
 
 module CommonShortcuts
   module ClassMethods
@@ -281,7 +281,7 @@ module CommonShortcuts
 
     def register_cluster(cluster)
       finalizer = lambda do |cluster|
-        cluster.disconnect!
+        cluster.close
       end
       LocalResourceRegistry.instance.register(cluster, finalizer)
     end
@@ -289,7 +289,7 @@ module CommonShortcuts
     def register_server(server)
       finalizer = lambda do |server|
         if server.connected?
-          server.disconnect!
+          server.close
         end
       end
       LocalResourceRegistry.instance.register(server, finalizer)
@@ -318,7 +318,17 @@ module CommonShortcuts
     def stop_monitoring(*clients)
       clients.each do |client|
         client.cluster.next_primary
-        client.cluster.disconnect!
+        client.cluster.close
+        # We have tests that stop monitoring to reduce the noise happening in
+        # background. These tests perform operations which requires the pools
+        # to function. See also RUBY-3102.
+        client.cluster.servers_list.each do |server|
+          if pool = server.pool
+            pool.instance_variable_set('@closed', false)
+            # Stop the populator so that we don't have leftover threads.
+            pool.instance_variable_get('@populator').stop!
+          end
+        end
       end
     end
 
@@ -363,7 +373,11 @@ module CommonShortcuts
         if $last_async_task.nil?
           STDERR.puts "No async task - server never started?"
         else
-          $last_async_task.stop
+          begin
+            $last_async_task.stop
+          rescue NoMethodError => e
+            STDERR.puts "Error stopping async task: #{e}"
+          end
         end
 
         thread.kill
@@ -392,5 +406,16 @@ module CommonShortcuts
         raise
       end
     end
+
+    # Make the server usable for operations after it was marked closed.
+    # Used for tests that e.g. mock network operations to avoid interference
+    # from server monitoring.
+    def reset_pool(server)
+      if pool = server.pool_internal
+        pool.close
+      end
+      server.remove_instance_variable('@pool')
+      server.pool.ready
+    end
   end
 end

data/spec/support/constraints.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-# encoding: utf-8
+# rubocop:todo all
 
 module Constraints
 
@@ -16,4 +16,18 @@ module Constraints
       end
     end
   end
+
+  def max_bson_version(version)
+    required_version = version.split('.').map(&:to_i)
+    actual_version = bson_version(required_version.length)
+    before(:all) do
+      if (actual_version <=> required_version) > 0
+        skip "bson-ruby version #{version} or lower is required"
+      end
+    end
+  end
+
+  def bson_version(precision)
+    BSON::VERSION.split('.')[0...precision].map(&:to_i)
+  end
 end

data/spec/support/crypt/{encryptedFields.json → encrypted_fields/encryptedFields.json}

@@ -1,6 +1,5 @@
 {
   "escCollection": "enxcol_.default.esc",
-  "eccCollection": "enxcol_.default.ecc",
   "ecocCollection": "enxcol_.default.ecoc",
   "fields": [
     {

data/spec/support/crypt/encrypted_fields/range-encryptedFields-Date.json

@@ -0,0 +1,30 @@
+{
+    "fields": [
+      {
+        "keyId": {
+          "$binary": {
+            "base64": "EjRWeBI0mHYSNBI0VniQEg==",
+            "subType": "04"
+          }
+        },
+        "path": "encryptedDate",
+        "bsonType": "date",
+        "queries": {
+          "queryType": "rangePreview",
+          "sparsity": {
+            "$numberLong": "1"
+          },
+          "min": {
+            "$date": {
+              "$numberLong": "0"
+          }
+          },
+          "max": {
+            "$date": {
+              "$numberLong": "200"
+          }
+          }
+        }
+      }
+    ]
+}

data/spec/support/crypt/encrypted_fields/range-encryptedFields-DecimalNoPrecision.json

@@ -0,0 +1,21 @@
+{
+    "fields": [
+      {
+        "keyId": {
+          "$binary": {
+            "base64": "EjRWeBI0mHYSNBI0VniQEg==",
+            "subType": "04"
+          }
+        },
+        "path": "encryptedDecimalNoPrecision",
+        "bsonType": "decimal",
+        "queries": {
+          "queryType": "rangePreview",
+          "sparsity": {
+            "$numberInt": "1"
+          }
+        }
+      }
+    ]
+  }
+  

data/spec/support/crypt/encrypted_fields/range-encryptedFields-DecimalPrecision.json

@@ -0,0 +1,29 @@
+{
+  "fields": [
+    {
+      "keyId": {
+        "$binary": {
+          "base64": "EjRWeBI0mHYSNBI0VniQEg==",
+          "subType": "04"
+        }
+      },
+      "path": "encryptedDecimalPrecision",
+      "bsonType": "decimal",
+      "queries": {
+        "queryType": "rangePreview",
+        "sparsity": {
+          "$numberInt": "1"
+        },
+        "min": {
+          "$numberDecimal": "0.0"
+        },
+        "max": {
+          "$numberDecimal": "200.0"
+        },
+        "precision": {
+          "$numberInt": "2"
+        }
+      }
+    }
+  ]
+}

data/spec/support/crypt/encrypted_fields/range-encryptedFields-DoubleNoPrecision.json

@@ -0,0 +1,21 @@
+{
+    "fields": [
+      {
+        "keyId": {
+          "$binary": {
+            "base64": "EjRWeBI0mHYSNBI0VniQEg==",
+            "subType": "04"
+          }
+        },
+        "path": "encryptedDoubleNoPrecision",
+        "bsonType": "double",
+        "queries": {
+          "queryType": "rangePreview",
+          "sparsity": {
+            "$numberLong": "1"
+          }
+        }
+      }
+    ]
+  }
+  

data/spec/support/crypt/encrypted_fields/range-encryptedFields-DoublePrecision.json

@@ -0,0 +1,30 @@
+{
+    "fields": [
+      {
+        "keyId": {
+          "$binary": {
+            "base64": "EjRWeBI0mHYSNBI0VniQEg==",
+            "subType": "04"
+          }
+        },
+        "path": "encryptedDoublePrecision",
+        "bsonType": "double",
+        "queries": {
+          "queryType": "rangePreview",
+          "sparsity": {
+            "$numberLong": "1"
+          },
+          "min": {
+            "$numberDouble": "0.0"
+          },
+          "max": {
+            "$numberDouble": "200.0"
+          },
+          "precision": {
+            "$numberInt": "2"
+          }
+        }
+      }
+    ]
+  }
+  

data/spec/support/crypt/encrypted_fields/range-encryptedFields-Int.json

@@ -0,0 +1,27 @@
+{
+    "fields": [
+      {
+        "keyId": {
+          "$binary": {
+            "base64": "EjRWeBI0mHYSNBI0VniQEg==",
+            "subType": "04"
+          }
+        },
+        "path": "encryptedInt",
+        "bsonType": "int",
+        "queries": {
+          "queryType": "rangePreview",
+          "sparsity": {
+            "$numberLong": "1"
+          },
+          "min": {
+            "$numberInt": "0"
+          },
+          "max": {
+            "$numberInt": "200"
+          }
+        }
+      }
+    ]
+  }
+  

data/spec/support/crypt/encrypted_fields/range-encryptedFields-Long.json

@@ -0,0 +1,27 @@
+{
+    "fields": [
+      {
+        "keyId": {
+          "$binary": {
+            "base64": "EjRWeBI0mHYSNBI0VniQEg==",
+            "subType": "04"
+          }
+        },
+        "path": "encryptedLong",
+        "bsonType": "long",
+        "queries": {
+          "queryType": "rangePreview",
+          "sparsity": {
+            "$numberLong": "1"
+          },
+          "min": {
+            "$numberLong": "0"
+          },
+          "max": {
+            "$numberLong": "200"
+          }
+        }
+      }
+    ]
+  }
+  

data/spec/support/crypt.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-# encoding: utf-8
+# rubocop:todo all
 
 # Copyright (C) 2009-2020 MongoDB Inc.
 #
@@ -115,7 +115,16 @@ module Crypt
     end
 
     let(:encrypted_fields) do
-      BSON::ExtJSON.parse(File.read('spec/support/crypt/encryptedFields.json'))
+      BSON::ExtJSON.parse(File.read('spec/support/crypt/encrypted_fields/encryptedFields.json'))
+    end
+
+    %w[DecimalNoPrecision DecimalPrecision Date DoubleNoPrecision DoublePrecision Int Long].each do |type|
+      let("range_encrypted_fields_#{type.downcase}".to_sym) do
+        BSON::ExtJSON.parse(
+          File.read("spec/support/crypt/encrypted_fields/range-encryptedFields-#{type}.json"),
+          mode: :bson
+        )
+      end
     end
 
     let(:key1_document) do
@@ -139,6 +148,7 @@ module Crypt
     let(:schema_map) do
       BSON::ExtJSON.parse(File.read(schema_map_file_path))
     end
+
     let(:data_key_options) { {} }
 
     let(:encrypted_ssn) do
@@ -300,7 +310,7 @@ module Crypt
         'MONGO_RUBY_DRIVER_GCP_PRIVATE_KEY, ' +
         'MONGO_RUBY_DRIVER_GCP_PROJECT_ID, MONGO_RUBY_DRIVER_GCP_LOCATION, ' +
         'MONGO_RUBY_DRIVER_GCP_KEY_RING, MONGO_RUBY_DRIVER_GCP_KEY_NAME ' +
-        'environment variables to be set information from Azure.'
+        'environment variables to be set information from GCP.'
 
         if SpecConfig.instance.fle?
           fail(reason)

data/spec/support/dns.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-# encoding: utf-8
+# rubocop:todo all
 
 require 'rubydns'
 

data/spec/support/json_ext_formatter.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-# encoding: utf-8
+# rubocop:todo all
 
 class JsonExtFormatter < RSpec::Core::Formatters::JsonFormatter
   RSpec::Core::Formatters.register self, :message,

data/spec/support/keyword_struct.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-# encoding: utf-8
+# rubocop:todo all
 
 # Intermediate step between a Struct and an OpenStruct. Allows only designated
 # field names to be read or written but allows passing fields to constructor

data/spec/support/local_resource_registry.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-# encoding: utf-8
+# rubocop:todo all
 
 require 'singleton'
 

data/spec/support/macros.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+# rubocop:todo all
 
 module Mongo
   module Macros

data/spec/support/matchers.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-# encoding: utf-8
+# rubocop:todo all
 
 RSpec::Matchers.define :be_int32 do |num|
   match do |actual|
@@ -60,17 +60,17 @@ end
 
 RSpec::Matchers.define :take_longer_than do |min_expected_time|
   match do |proc|
-    start_time = Time.now
+    start_time = Mongo::Utils.monotonic_time
     proc.call
-    (Time.now - start_time).should > min_expected_time
+    (Mongo::Utils.monotonic_time - start_time).should > min_expected_time
   end
 end
 
 RSpec::Matchers.define :take_shorter_than do |min_expected_time|
   match do |proc|
-    start_time = Time.now
+    start_time = Mongo::Utils.monotonic_time
     proc.call
-    (Time.now - start_time).should < min_expected_time
+    (Mongo::Utils.monotonic_time - start_time).should < min_expected_time
   end
 end
 

data/spec/support/mongos_macros.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+# rubocop:todo all
 
 module MongosMacros
 
@@ -14,4 +15,10 @@ module MongosMacros
       direct_client.use(db_name)[collection].distinct('foo').to_a
     end
   end
+
+  def maybe_run_mongos_distincts(db_name, collection='test')
+    if ClusterConfig.instance.topology == :sharded
+      run_mongos_distincts(db_name, collection)
+    end
+  end
 end

data/spec/support/monitoring_ext.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-# encoding: utf-8
+# rubocop:todo all
 
 module Mongo
   class Monitoring

data/spec/support/primary_socket.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-# encoding: utf-8
+# rubocop:todo all
 
 module PrimarySocket
   def self.included(base)

data/spec/support/sdam_formatter_integration.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-# encoding: utf-8
+# rubocop:todo all
 
 $sdam_formatter_lock = Mutex.new
 

data/spec/support/shared/app_metadata.rb

@@ -1,5 +1,17 @@
 # frozen_string_literal: true
-# encoding: utf-8
+# rubocop:todo all
+
+def target_arch
+  @target_arch ||= begin
+    uname = `uname -a`.strip
+    case uname
+    when /aarch/ then "aarch64"
+    when /x86/   then "x86_64"
+    when /arm/   then "arm64"
+    else raise "unrecognized architecture: #{uname.inspect}"
+    end
+  end
+end
 
 shared_examples 'app metadata document' do
   let(:app_metadata) do
@@ -27,7 +39,7 @@ shared_examples 'app metadata document' do
         # Ruby 2.7.3 uses linux.
         %w(linux linux-gnu).should include(document[:client][:os][:name])
       end
-      document[:client][:os][:architecture].should == 'x86_64'
+      document[:client][:os][:architecture].should == target_arch
     end
   end
 
@@ -45,7 +57,7 @@ shared_examples 'app metadata document' do
       else
         document[:client][:os][:name].should =~ /darwin\d+/
       end
-      document[:client][:os][:architecture].should == 'x86_64'
+      document[:client][:os][:architecture].should == target_arch
     end
   end
 

data/spec/support/shared/auth_context.rb

@@ -1,3 +1,4 @@
+# rubocop:todo all
 shared_context 'auth unit tests' do
   let(:generation_manager) do
     Mongo::Server::ConnectionPool::GenerationManager.new(server: server)

data/spec/support/shared/protocol.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-# encoding: utf-8
+# rubocop:todo all
 
 shared_examples 'message with a header' do
   let(:collection_name) { 'test' }

data/spec/support/shared/scram_conversation.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-# encoding: utf-8
+# rubocop:todo all
 
 shared_context 'scram conversation context' do
   let(:connection) do

data/spec/support/shared/server_selector.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-# encoding: utf-8
+# rubocop:todo all
 
 shared_context 'server selector' do
 

data/spec/support/shared/session.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-# encoding: utf-8
+# rubocop:todo all
 
 shared_examples 'an operation using a session' do