mongo 2.13.0 → 2.15.0.alpha

data/spec/spec_tests/cmap_spec.rb

@@ -22,9 +22,13 @@ describe 'Cmap' do
   end
 
   let(:options) do
-    SpecConfig.instance.ssl_options.merge(SpecConfig.instance.compressor_options)
-      .merge(SpecConfig.instance.retry_writes_options).merge(SpecConfig.instance.auth_options)
-      .merge(monitoring_io: false)
+    Mongo::Utils.shallow_symbolize_keys(Mongo::Client.canonicalize_ruby_options(
+      SpecConfig.instance.all_test_options,
+    )).update(monitoring_io: false).tap do |options|
+      # We have a wait queue timeout set in the test suite options, but having
+      # this option set interferes with assertions in the cmap spec tests.
+      options.delete(:wait_queue_timeout)
+    end
   end
 
   CMAP_TESTS.each do |file|

data/spec/spec_tests/crud_unified_spec.rb

@@ -0,0 +1,10 @@
+require 'spec_helper'
+
+require 'runners/unified'
+
+base = "#{CURRENT_PATH}/spec_tests/data/crud_unified"
+CRUD_UNIFIED_TESTS = Dir.glob("#{base}/**/*.yml").sort
+
+describe 'CRUD unified spec tests' do
+  define_unified_spec_tests(base, CRUD_UNIFIED_TESTS)
+end

data/spec/spec_tests/data/change_streams/change-streams-errors.yml

@@ -12,7 +12,6 @@ tests:
     changeStreamPipeline: []
     changeStreamOptions: {}
     operations: []
-    # https://jira.mongodb.org/browse/SPEC-1462
     expectations: ~
     result:
       error:

data/spec/spec_tests/data/change_streams/change-streams.yml

@@ -58,7 +58,6 @@ tests:
         arguments:
           document:
             x: 1
-    # https://jira.mongodb.org/browse/SPEC-1462
     expectations: ~
     result:
       success:
@@ -372,7 +371,6 @@ tests:
             db: *database_name
             coll: *collection_name
           updateDescription:
-            removedFields: []
             updatedFields:
               x:
                 $numberInt: "2"

data/spec/spec_tests/data/cmap/pool-checkout-connection.yml

@@ -6,10 +6,14 @@ operations:
 events:
   - type: ConnectionCheckOutStarted
     address: 42
+  - type: ConnectionCreated
+    connectionId: 1
+    address: 42
+  - type: ConnectionReady
+    connectionId: 1
+    address: 42
   - type: ConnectionCheckedOut
     connectionId: 1
     address: 42
 ignore:
   - ConnectionPoolCreated
-  - ConnectionCreated
-  - ConnectionReady

data/spec/spec_tests/data/cmap/pool-create-min-size.yml

@@ -7,6 +7,9 @@ operations:
   - name: waitForEvent
     event: ConnectionCreated
     count: 3
+  - name: waitForEvent
+    event: ConnectionReady
+    count: 3
   - name: checkOut
 events:
   - type: ConnectionPoolCreated

data/spec/spec_tests/data/connection_string/valid-warnings.yml

@@ -49,3 +49,27 @@ tests:
         auth: ~
         options:
             wtimeoutms: 10
+    -
+        description: "Empty integer option values are ignored"
+        uri: "mongodb://localhost/?maxIdleTimeMS="
+        valid: true
+        warning: true
+        hosts:
+            -
+                type: "hostname"
+                host: "localhost"
+                port: ~
+        auth: ~
+        options: ~
+    -
+        description: "Empty boolean option value are ignored"
+        uri: "mongodb://localhost/?journal="
+        valid: true
+        warning: true
+        hosts:
+            -
+                type: "hostname"
+                host: "localhost"
+                port: ~
+        auth: ~
+        options: ~

data/spec/spec_tests/data/crud_unified/estimatedDocumentCount.yml

@@ -0,0 +1,267 @@
+description: "estimatedDocumentCount"
+
+schemaVersion: "1.0"
+
+createEntities:
+  - client:
+      id: &client0 client0
+      useMultipleMongoses: false # Avoid setting fail points with multiple mongoses
+      uriOptions: { retryReads: false } # Avoid retrying fail points with closeConnection
+      observeEvents: [ commandStartedEvent ]
+  - database:
+      id: &database0 database0
+      client: *client0
+      databaseName: &database0Name edc-tests
+  - collection:
+      id: &collection0 collection0
+      database: *database0
+      collectionName: &collection0Name coll0
+  - collection:
+      # Nonexistent collection intentionally omitted from initialData
+      id: &collection1 collection1
+      database: *database0
+      collectionName: &collection1Name coll1
+
+initialData:
+  - collectionName: *collection0Name
+    databaseName: *database0Name
+    documents:
+      - { _id: 1, x: 11 }
+      - { _id: 2, x: 22 }
+      - { _id: 3, x: 33 }
+
+tests:
+  - description: "estimatedDocumentCount uses $collStats on 4.9.0 or greater"
+    runOnRequirements:
+      - minServerVersion: "4.9.0"
+    operations:
+      - name: estimatedDocumentCount
+        object: *collection0
+        expectResult: 3
+    expectEvents:
+      - client: *client0
+        events:
+          - commandStartedEvent:
+              command:
+                aggregate: *collection0Name
+                pipeline: &pipeline
+                  - $collStats: { count: {} }
+                  - $group: { _id: 1, n: { $sum: $count }}
+              commandName: aggregate
+              databaseName: *database0Name
+
+  - description: "estimatedDocumentCount with maxTimeMS on 4.9.0 or greater"
+    runOnRequirements:
+      - minServerVersion: "4.9.0"
+    operations:
+      - name: estimatedDocumentCount
+        object: *collection0
+        arguments:
+          maxTimeMS: 6000
+        expectResult: 3
+    expectEvents:
+      - client: *client0
+        events:
+          - commandStartedEvent:
+              command:
+                aggregate: *collection0Name
+                pipeline: &pipeline
+                  - $collStats: { count: {} }
+                  - $group: { _id: 1, n: { $sum: $count }}
+                maxTimeMS: 6000
+              commandName: aggregate
+              databaseName: *database0Name
+
+  - description: "estimatedDocumentCount on non-existent collection on 4.9.0 or greater"
+    runOnRequirements:
+      - minServerVersion: "4.9.0"
+    operations:
+      - name: estimatedDocumentCount
+        object: *collection1
+        expectResult: 0
+    expectEvents:
+      - client: *client0
+        events:
+          - commandStartedEvent:
+              command:
+                aggregate: *collection1Name
+                pipeline: &pipeline
+                  - $collStats: { count: {} }
+                  - $group: { _id: 1, n: { $sum: $count }}
+              commandName: aggregate
+              databaseName: *database0Name
+
+  - description: "estimatedDocumentCount errors correctly on 4.9.0 or greater--command error"
+    runOnRequirements:
+      - minServerVersion: "4.9.0"
+    operations:
+      - name: failPoint
+        object: testRunner
+        arguments:
+          client: *client0
+          failPoint:
+            configureFailPoint: failCommand
+            mode: { times: 1 }
+            data:
+              failCommands: [ aggregate ]
+              errorCode: 8 # UnknownError
+      - name: estimatedDocumentCount
+        object: *collection0
+        expectError:
+          errorCode: 8 # UnknownError
+    expectEvents:
+      - client: *client0
+        events:
+          - commandStartedEvent:
+              command:
+                aggregate: *collection0Name
+                pipeline: &pipeline
+                  - $collStats: { count: {} }
+                  - $group: { _id: 1, n: { $sum: $count }}
+              commandName: aggregate
+              databaseName: *database0Name
+
+  - description: "estimatedDocumentCount errors correctly on 4.9.0 or greater--socket error"
+    runOnRequirements:
+      - minServerVersion: "4.9.0"
+    operations:
+      - name: failPoint
+        object: testRunner
+        arguments:
+          client: *client0
+          failPoint:
+            configureFailPoint: failCommand
+            mode: { times: 1 }
+            data:
+              failCommands: [ aggregate ]
+              closeConnection: true
+      - name: estimatedDocumentCount
+        object: *collection0
+        expectError:
+          isError: true
+    expectEvents:
+      - client: *client0
+        events:
+          - commandStartedEvent:
+              command:
+                aggregate: *collection0Name
+                pipeline: &pipeline
+                  - $collStats: { count: {} }
+                  - $group: { _id: 1, n: { $sum: $count }}
+              commandName: aggregate
+              databaseName: *database0Name
+
+  - description: "estimatedDocumentCount uses count on less than 4.9.0"
+    runOnRequirements:
+      - maxServerVersion: "4.8.99"
+    operations:
+      - name: estimatedDocumentCount
+        object: *collection0
+        expectResult: 3
+    expectEvents:
+      - client: *client0
+        events:
+          - commandStartedEvent:
+              command:
+                count: *collection0Name
+              commandName: count
+              databaseName: *database0Name
+
+  - description: "estimatedDocumentCount with maxTimeMS on less than 4.9.0"
+    runOnRequirements:
+      - maxServerVersion: "4.8.99"
+    operations:
+      - name: estimatedDocumentCount
+        object: *collection0
+        arguments:
+          maxTimeMS: 6000
+        expectResult: 3
+    expectEvents:
+      - client: *client0
+        events:
+          - commandStartedEvent:
+              command:
+                count: *collection0Name
+                maxTimeMS: 6000
+              commandName: count
+              databaseName: *database0Name
+
+  - description: "estimatedDocumentCount on non-existent collection on less than 4.9.0"
+    runOnRequirements:
+      - maxServerVersion: "4.8.99"
+    operations:
+      - name: estimatedDocumentCount
+        object: *collection1
+        expectResult: 0
+    expectEvents:
+      - client: *client0
+        events:
+          - commandStartedEvent:
+              command:
+                count: *collection1Name
+              commandName: count
+              databaseName: *database0Name
+
+  - description: "estimatedDocumentCount errors correctly on less than 4.9.0--command error"
+    runOnRequirements:
+      - minServerVersion: "4.0.0"
+        maxServerVersion: "4.8.99"
+        topologies: [ single, replicaset ]
+      - minServerVersion: "4.2.0"
+        maxServerVersion: "4.8.99"
+        topologies: [ sharded ]
+    operations:
+      - name: failPoint
+        object: testRunner
+        arguments:
+          client: *client0
+          failPoint:
+            configureFailPoint: failCommand
+            mode: { times: 1 }
+            data:
+              failCommands: [ count ]
+              errorCode: 8 # UnknownError
+      - name: estimatedDocumentCount
+        object: *collection0
+        expectError:
+          errorCode: 8 # UnknownError
+    expectEvents:
+      - client: *client0
+        events:
+          - commandStartedEvent:
+              command:
+                count: *collection0Name
+              commandName: count
+              databaseName: *database0Name
+
+  - description: "estimatedDocumentCount errors correctly on less than 4.9.0--socket error"
+    runOnRequirements:
+      - minServerVersion: "4.0.0"
+        maxServerVersion: "4.8.99"
+        topologies: [ single, replicaset ]
+      - minServerVersion: "4.2.0"
+        maxServerVersion: "4.8.99"
+        topologies: [ sharded ]
+    operations:
+      - name: failPoint
+        object: testRunner
+        arguments:
+          client: *client0
+          failPoint:
+            configureFailPoint: failCommand
+            mode: { times: 1 }
+            data:
+              failCommands: [ count ]
+              closeConnection: true
+      - name: estimatedDocumentCount
+        object: *collection0
+        expectError:
+          isError: true
+    expectEvents:
+      - client: *client0
+        events:
+          - commandStartedEvent:
+              command:
+                count: *collection0Name
+              commandName: count
+              databaseName: *database0Name

data/spec/spec_tests/data/retryable_reads/estimatedDocumentCount-4.9.yml

@@ -0,0 +1,60 @@
+runOn:
+    - minServerVersion: "4.9.0"
+
+database_name: &database_name "retryable-reads-tests"
+collection_name: &collection_name "coll"
+
+data:
+    - { _id: 1, x: 11 }
+    - { _id: 2, x: 22 }
+
+tests:
+    -
+        description: "EstimatedDocumentCount succeeds on first attempt"
+        operations:
+            - &retryable_operation_succeeds
+                <<: &retryable_operation
+                    name: estimatedDocumentCount
+                    object: collection
+                result: 2
+        expectations:
+            - &retryable_command_started_event
+                command_started_event:
+                    command:
+                        aggregate: *collection_name
+                        pipeline: &pipeline
+                          - $collStats: { count: {} }
+                          - $group: { _id: 1, n: { $sum: $count }}
+                    database_name: *database_name
+    -
+        description: "EstimatedDocumentCount succeeds on second attempt"
+        failPoint:  &failCommand_failPoint
+            configureFailPoint: failCommand
+            mode: { times: 1 }
+            data:
+                failCommands: [aggregate]
+                closeConnection: true
+        operations: [*retryable_operation_succeeds]
+        expectations:
+             - *retryable_command_started_event
+             - *retryable_command_started_event
+    -
+        description: "EstimatedDocumentCount fails on first attempt"
+        clientOptions:
+            retryReads: false
+        failPoint: *failCommand_failPoint
+        operations:
+            - &retryable_operation_fails
+                <<: *retryable_operation
+                error: true
+        expectations:
+             - *retryable_command_started_event
+    -
+        description: "EstimatedDocumentCount fails on second attempt"
+        failPoint:
+          <<: *failCommand_failPoint
+          mode: { times: 2 }
+        operations: [*retryable_operation_fails]
+        expectations:
+             - *retryable_command_started_event
+             - *retryable_command_started_event

data/spec/spec_tests/data/retryable_reads/{estimatedDocumentCount.yml → estimatedDocumentCount-pre4.9.yml}

@@ -1,9 +1,11 @@
 runOn:
     -
         minServerVersion: "4.0"
+        maxServerVersion: "4.8.99"
         topology: ["single", "replicaset"]
     -
         minServerVersion: "4.1.7"
+        maxServerVersion: "4.8.99"
         topology: ["sharded"]
 
 database_name: &database_name "retryable-reads-tests"