mongo 2.19.2 → 2.19.3

data/spec/lite_spec_helper.rb

@@ -106,6 +106,31 @@ Mrss.patch_mongo_for_session_registry
 
 class ExampleTimeout < StandardError; end
 
+STANDARD_TIMEOUTS = {
+  stress: 210,
+  jruby: 90,
+  default: 45,
+}.freeze
+
+def timeout_type
+  if ENV['EXAMPLE_TIMEOUT'].to_i > 0
+    :custom
+  elsif %w(1 true yes).include?(ENV['STRESS']&.downcase)
+    :stress
+  elsif BSON::Environment.jruby?
+    :jruby
+  else
+    :default
+  end
+end
+
+def example_timeout_seconds
+  STANDARD_TIMEOUTS.fetch(
+    timeout_type,
+    (ENV['EXAMPLE_TIMEOUT'] || STANDARD_TIMEOUTS[:default]).to_i
+  )
+end
+
 RSpec.configure do |config|
   config.extend(CommonShortcuts::ClassMethods)
   config.include(CommonShortcuts::InstanceMethods)
@@ -123,6 +148,12 @@ RSpec.configure do |config|
     end
   end
 
+  def require_atlas
+    before do
+      skip 'Set ATLAS_URI in environment to run atlas tests' if ENV['ATLAS_URI'].nil?
+    end
+  end
+
   if SpecConfig.instance.ci?
     SdamFormatterIntegration.subscribe
     config.add_formatter(JsonExtFormatter, File.join(File.dirname(__FILE__), '../tmp/rspec.json'))
@@ -141,16 +172,7 @@ RSpec.configure do |config|
     # Tests should take under 10 seconds ideally but it seems
     # we have some that run for more than 10 seconds in CI.
     config.around(:each) do |example|
-      timeout = if %w(1 true yes).include?(ENV['STRESS']&.downcase)
-        210
-      else
-        if BSON::Environment.jruby?
-          90
-        else
-          45
-        end
-      end
-      TimeoutInterrupt.timeout(timeout, ExampleTimeout) do
+      TimeoutInterrupt.timeout(example_timeout_seconds, ExampleTimeout) do
         example.run
       end
     end

data/spec/runners/unified/search_index_operations.rb

@@ -0,0 +1,63 @@
+# frozen_string_literal: true
+
+module Unified
+  # The definitions of available search index operations, as used by the
+  # unified tests.
+  module SearchIndexOperations
+    def create_search_index(op)
+      collection = entities.get(:collection, op.use!('object'))
+
+      use_arguments(op) do |args|
+        model = args.use('model')
+        name = model.use('name')
+        definition = model.use('definition')
+        collection.search_indexes.create_one(definition, name: name)
+      end
+    end
+
+    def create_search_indexes(op)
+      collection = entities.get(:collection, op.use!('object'))
+
+      use_arguments(op) do |args|
+        models = args.use('models')
+        collection.search_indexes.create_many(models)
+      end
+    end
+
+    def drop_search_index(op)
+      collection = entities.get(:collection, op.use!('object'))
+
+      use_arguments(op) do |args|
+        collection.search_indexes.drop_one(
+          id: args.use('id'),
+          name: args.use('name')
+        )
+      end
+    end
+
+    def list_search_indexes(op)
+      collection = entities.get(:collection, op.use!('object'))
+
+      use_arguments(op) do |args|
+        agg_opts = args.use('aggregationOptions') || {}
+        collection.search_indexes(
+          id: args.use('id'),
+          name: args.use('name'),
+          aggregate: ::Utils.underscore_hash(agg_opts)
+        ).to_a
+      end
+    end
+
+    def update_search_index(op)
+      collection = entities.get(:collection, op.use!('object'))
+
+      use_arguments(op) do |args|
+        collection.search_indexes.update_one(
+          args.use('definition'),
+          id: args.use('id'),
+          name: args.use('name')
+        )
+      end
+    end
+  end
+end

data/spec/runners/unified/test.rb

@@ -9,6 +9,7 @@ require 'runners/unified/ddl_operations'
 require 'runners/unified/change_stream_operations'
 require 'runners/unified/support_operations'
 require 'runners/unified/thread_operations'
+require 'runners/unified/search_index_operations'
 require 'runners/unified/assertions'
 require 'support/utils'
 require 'support/crypt'
@@ -23,6 +24,7 @@ module Unified
     include ChangeStreamOperations
     include SupportOperations
     include ThreadOperations
+    include SearchIndexOperations
     include Assertions
     include RSpec::Core::Pending
 
@@ -120,7 +122,7 @@ module Unified
             # the other set members, in standalone deployments because
             # there is only one server, but changes behavior in
             # sharded clusters compared to how the test suite is configured.
-            opts[:single_address] = true
+            options[:single_address] = true
           end
 
           if store_events = spec.use('storeEventsAsEntities')

data/spec/spec_helper.rb

@@ -20,7 +20,7 @@ RSpec.configure do |config|
   config.extend(Constraints)
 
   config.before(:all) do
-    if ClusterConfig.instance.fcv_ish >= '3.6' && !SpecConfig.instance.serverless? # Serverless instances do not support killAllSessions command.
+    if SpecConfig.instance.kill_all_server_sessions?
       kill_all_server_sessions
     end
   end

data/spec/spec_tests/data/index_management/createSearchIndex.yml

@@ -0,0 +1,62 @@
+description: "createSearchIndex"
+schemaVersion: "1.4"
+createEntities:
+  - client:
+      id: &client0 client0
+      useMultipleMongoses: false
+      observeEvents:
+        - commandStartedEvent
+  - database:
+      id: &database0 database0
+      client: *client0
+      databaseName: *database0
+  - collection:
+      id: &collection0 collection0
+      database: *database0
+      collectionName: *collection0
+
+runOnRequirements:
+  - minServerVersion: "7.0.0"
+    topologies: [ replicaset, load-balanced, sharded ]
+    serverless: forbid
+
+tests:
+  - description: "no name provided for an index definition"
+    operations:
+      - name: createSearchIndex
+        object: *collection0
+        arguments:
+          model: { definition: &definition { mappings: { dynamic: true } } }
+        expectError:
+          # This test always errors in a non-Atlas environment.  The test functions as a unit test  by asserting
+          # that the driver constructs and sends the correct command.
+          isError: true
+          errorContains: Search index commands are only supported with Atlas
+    expectEvents:
+      - client: *client0
+        events:
+          - commandStartedEvent:
+              command:
+                createSearchIndexes: *collection0
+                indexes: [ { definition: *definition } ]
+                $db: *database0
+
+  - description: "name provided for an index definition"
+    operations:
+      - name: createSearchIndex
+        object: *collection0
+        arguments: 
+          model: { definition: &definition { mappings: { dynamic: true } } , name: 'test index' }
+        expectError:
+          # This test always errors in a non-Atlas environment.  The test functions as a unit test  by asserting
+          # that the driver constructs and sends the correct command.
+          isError: true
+          errorContains: Search index commands are only supported with Atlas
+    expectEvents:
+      - client: *client0
+        events:
+          - commandStartedEvent:
+              command:
+                createSearchIndexes: *collection0
+                indexes: [ { definition: *definition, name: 'test index' } ]
+                $db: *database0

data/spec/spec_tests/data/index_management/createSearchIndexes.yml

@@ -0,0 +1,83 @@
+description: "createSearchIndexes"
+schemaVersion: "1.4"
+createEntities:
+  - client:
+      id: &client0 client0
+      useMultipleMongoses: false
+      observeEvents:
+        - commandStartedEvent
+  - database:
+      id: &database0 database0
+      client: *client0
+      databaseName: *database0
+  - collection:
+      id: &collection0 collection0
+      database: *database0
+      collectionName: *collection0
+
+runOnRequirements:
+  - minServerVersion: "7.0.0"
+    topologies: [ replicaset, load-balanced, sharded ]
+    serverless: forbid
+
+tests:
+  - description: "empty index definition array"
+    operations:
+      - name: createSearchIndexes
+        object: *collection0
+        arguments: 
+          models: []
+        expectError:
+          # This test always errors in a non-Atlas environment.  The test functions as a unit test  by asserting
+          # that the driver constructs and sends the correct command.
+          isError: true
+          errorContains: Search index commands are only supported with Atlas
+    expectEvents:
+      - client: *client0
+        events:
+          - commandStartedEvent:
+              command:
+                createSearchIndexes: *collection0
+                indexes: []
+                $db: *database0
+
+
+  - description: "no name provided for an index definition"
+    operations:
+      - name: createSearchIndexes
+        object: *collection0
+        arguments:
+          models: [ { definition: &definition { mappings: { dynamic: true } } } ]
+        expectError:
+          # This test always errors in a non-Atlas environment.  The test functions as a unit test  by asserting
+          # that the driver constructs and sends the correct command.
+          isError: true
+          errorContains: Search index commands are only supported with Atlas
+    expectEvents:
+      - client: *client0
+        events:
+          - commandStartedEvent:
+              command:
+                createSearchIndexes: *collection0
+                indexes: [ { definition: *definition } ]
+                $db: *database0
+
+  - description: "name provided for an index definition"
+    operations:
+      - name: createSearchIndexes
+        object: *collection0
+        arguments: 
+          models: [ { definition: &definition { mappings: { dynamic: true } } , name: 'test index' } ]
+        expectError:
+          # This test always errors in a non-Atlas environment.  The test functions as a unit test  by asserting
+          # that the driver constructs and sends the correct command.
+          isError: true
+          errorContains: Search index commands are only supported with Atlas
+    expectEvents:
+      - client: *client0
+        events:
+          - commandStartedEvent:
+              command:
+                createSearchIndexes: *collection0
+                indexes: [ { definition: *definition, name: 'test index' } ]
+                $db: *database0

data/spec/spec_tests/data/index_management/dropSearchIndex.yml

@@ -0,0 +1,42 @@
+description: "dropSearchIndex"
+schemaVersion: "1.4"
+createEntities:
+  - client:
+      id: &client0 client0
+      useMultipleMongoses: false
+      observeEvents:
+        - commandStartedEvent
+  - database:
+      id: &database0 database0
+      client: *client0
+      databaseName: *database0
+  - collection:
+      id: &collection0 collection0
+      database: *database0
+      collectionName: *collection0
+
+runOnRequirements:
+  - minServerVersion: "7.0.0"
+    topologies: [ replicaset, load-balanced, sharded ]
+    serverless: forbid
+
+tests:
+  - description: "sends the correct command"
+    operations:
+      - name: dropSearchIndex
+        object: *collection0
+        arguments:
+          name: &indexName 'test index'
+        expectError:
+          # This test always errors in a non-Atlas environment.  The test functions as a unit test  by asserting
+          # that the driver constructs and sends the correct command.
+          isError: true
+          errorContains: Search index commands are only supported with Atlas
+    expectEvents:
+      - client: *client0
+        events:
+          - commandStartedEvent:
+              command:
+                dropSearchIndex: *collection0
+                name: *indexName
+                $db: *database0

data/spec/spec_tests/data/index_management/listSearchIndexes.yml

@@ -0,0 +1,85 @@
+description: "listSearchIndexes"
+schemaVersion: "1.4"
+createEntities:
+  - client:
+      id: &client0 client0
+      useMultipleMongoses: false
+      observeEvents:
+        - commandStartedEvent
+  - database:
+      id: &database0 database0
+      client: *client0
+      databaseName: *database0
+  - collection:
+      id: &collection0 collection0
+      database: *database0
+      collectionName: *collection0
+
+runOnRequirements:
+  - minServerVersion: "7.0.0"
+    topologies: [ replicaset, load-balanced, sharded ]
+    serverless: forbid
+
+tests:
+  - description: "when no name is provided, it does not populate the filter"
+    operations:
+      - name: listSearchIndexes
+        object: *collection0
+        expectError:
+          # This test always errors in a non-Atlas environment.  The test functions as a unit test  by asserting
+          # that the driver constructs and sends the correct command.
+          isError: true
+          errorContains: Search index commands are only supported with Atlas
+    expectEvents:
+      - client: *client0
+        events:
+          - commandStartedEvent:
+              command:
+                aggregate: *collection0
+                pipeline:
+                  - $listSearchIndexes: {}
+
+  - description: "when a name is provided, it is present in the filter"
+    operations:
+      - name: listSearchIndexes
+        object: *collection0
+        arguments: 
+          name: &indexName "test index"
+        expectError:
+          # This test always errors in a non-Atlas environment.  The test functions as a unit test  by asserting
+          # that the driver constructs and sends the correct command.
+          isError: true
+          errorContains: Search index commands are only supported with Atlas
+    expectEvents:
+      - client: *client0
+        events:
+          - commandStartedEvent:
+              command:
+                aggregate: *collection0
+                pipeline:
+                  - $listSearchIndexes: { name: *indexName }
+                $db: *database0
+
+  - description: aggregation cursor options are supported
+    operations:
+      - name: listSearchIndexes
+        object: *collection0
+        arguments: 
+          name: &indexName "test index"
+          aggregationOptions: 
+            batchSize: 10
+        expectError:
+          # This test always errors in a non-Atlas environment.  The test functions as a unit test  by asserting
+          # that the driver constructs and sends the correct command.
+          isError: true
+          errorContains: Search index commands are only supported with Atlas
+    expectEvents:
+      - client: *client0
+        events:
+          - commandStartedEvent:
+              command:
+                aggregate: *collection0
+                cursor: { batchSize: 10 }
+                pipeline:
+                  - $listSearchIndexes: { name: *indexName }
+                $db: *database0

data/spec/spec_tests/data/index_management/updateSearchIndex.yml

@@ -0,0 +1,45 @@
+description: "updateSearchIndex"
+schemaVersion: "1.4"
+createEntities:
+  - client:
+      id: &client0 client0
+      useMultipleMongoses: false
+      observeEvents:
+        - commandStartedEvent
+  - database:
+      id: &database0 database0
+      client: *client0
+      databaseName: *database0
+  - collection:
+      id: &collection0 collection0
+      database: *database0
+      collectionName: *collection0
+
+runOnRequirements:
+  - minServerVersion: "7.0.0"
+    topologies: [ replicaset, load-balanced, sharded ]
+    serverless: forbid
+
+tests:
+  - description: "sends the correct command"
+    operations:
+      - name: updateSearchIndex
+        object: *collection0
+        arguments:
+          name: &indexName 'test index'
+          definition: &definition {}
+        expectError:
+          # This test always errors in a non-Atlas environment.  The test functions as a unit test  by asserting
+          # that the driver constructs and sends the correct command.
+          isError: true
+          errorContains: Search index commands are only supported with Atlas
+    expectEvents:
+      - client: *client0
+        events:
+          - commandStartedEvent:
+              command:
+                updateSearchIndex: *collection0
+                name: *indexName
+                definition: *definition
+                $db: *database0
+

data/spec/spec_tests/index_management_unified_spec.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+require 'runners/unified'
+
+base = "#{CURRENT_PATH}/spec_tests/data/index_management"
+INDEX_MANAGEMENT_UNIFIED_TESTS = Dir.glob("#{base}/**/*.yml").sort
+
+# rubocop:disable RSpec/EmptyExampleGroup
+describe 'index management unified spec tests' do
+  define_unified_spec_tests(base, INDEX_MANAGEMENT_UNIFIED_TESTS)
+end
+# rubocop:enable RSpec/EmptyExampleGroup

data/spec/support/faas/app/aws_lambda/mongodb/Gemfile.lock

@@ -0,0 +1,19 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    bson (4.15.0)
+    mongo (2.19.1)
+      bson (>= 4.14.1, < 5.0.0)
+
+PLATFORMS
+  arm64-darwin-22
+  x86_64-linux
+
+DEPENDENCIES
+  mongo
+
+RUBY VERSION
+   ruby 3.2.2p53
+
+BUNDLED WITH
+   2.4.12

data/spec/support/spec_config.rb

@@ -172,6 +172,11 @@ class SpecConfig
     !!ENV['SERVERLESS']
   end
 
+  def kill_all_server_sessions?
+    !serverless? && # Serverless instances do not support killAllSessions command.
+      ClusterConfig.instance.fcv_ish >= '3.6'
+  end
+
   # Test suite configuration
 
   def client_debug?