mongo 2.16.0 → 2.17.1

data/spec/spec_tests/data/sessions_unified/snapshot-sessions.yml

@@ -0,0 +1,482 @@
+description: snapshot-sessions
+
+schemaVersion: "1.0"
+
+runOnRequirements:
+  - minServerVersion: "5.0"
+    topologies: [replicaset, sharded-replicaset]
+
+createEntities:
+  - client:
+      id: &client0 client0
+      observeEvents: [ commandStartedEvent]
+      ignoreCommandMonitoringEvents: [ findAndModify, insert, update ]
+  - database:
+      id: &database0 database0
+      client: *client0
+      databaseName: &database0Name database0
+  - collection:
+      id: &collection0 collection0
+      database: *database0
+      collectionName: &collection0Name collection0
+      collectionOptions:
+        writeConcern: { w: majority }
+  - session:
+      id: session0
+      client: client0
+      sessionOptions:
+        snapshot: true
+  - session:
+      id: session1
+      client: client0
+      sessionOptions:
+        snapshot: true
+
+initialData:
+  - collectionName: *collection0Name
+    databaseName: *database0Name
+    documents:
+      - { _id: 1, x: 11 }
+      - { _id: 2, x: 11 }
+
+tests:
+- description: Find operation with snapshot
+  operations:
+  - name: find
+    object: collection0
+    arguments:
+      session: session0
+      filter: { _id: 1 }
+    expectResult:
+      - {_id: 1, x: 11}
+  - name: findOneAndUpdate
+    object: collection0
+    arguments:
+      filter: { _id: 1 }
+      update: { $inc: { x: 1 } }
+      returnDocument: After
+    expectResult: { _id: 1, x: 12 }
+  - name: find
+    object: collection0
+    arguments:
+      session: session1
+      filter: { _id: 1 }
+    expectResult:
+      - { _id: 1, x: 12 }
+  - name: findOneAndUpdate
+    object: collection0
+    arguments:
+      filter: { _id: 1 }
+      update: { $inc: { x: 1 } }
+      returnDocument: After
+    expectResult: { _id: 1, x: 13 }
+  - name: find
+    object: collection0
+    arguments:
+      filter: { _id: 1 }
+    expectResult:
+    - { _id: 1, x: 13 }
+  - name: find
+    object: collection0
+    arguments:
+      session: session0
+      filter: { _id: 1 }
+    expectResult:
+    - {_id: 1, x: 11}
+  - name: find
+    object: collection0
+    arguments:
+      session: session1
+      filter: { _id: 1 }
+    expectResult:
+    - {_id: 1, x: 12}
+  expectEvents:
+  - client: client0
+    events:
+    - commandStartedEvent:
+        command:
+          find: collection0
+          readConcern:
+            level: snapshot
+            atClusterTime:
+              "$$exists": false
+    - commandStartedEvent:
+        command:
+          find: collection0
+          readConcern:
+            level: snapshot
+            atClusterTime:
+              "$$exists": false
+    - commandStartedEvent:
+        command:
+          find: collection0
+          readConcern:
+            "$$exists": false
+    - commandStartedEvent:
+        command:
+          find: collection0
+          readConcern:
+            level: snapshot
+            atClusterTime:
+              "$$exists": true
+    - commandStartedEvent:
+        command:
+          find: collection0
+          readConcern:
+            level: snapshot
+            atClusterTime:
+              "$$exists": true
+
+- description: Distinct operation with snapshot
+  operations:
+  - name: distinct
+    object: collection0
+    arguments:
+      fieldName: x
+      filter: {}
+      session: session0
+    expectResult:
+    - 11
+  - name: findOneAndUpdate
+    object: collection0
+    arguments:
+      filter: { _id: 2 }
+      update: { $inc: { x: 1 } }
+      returnDocument: After
+    expectResult: { _id: 2, x: 12 }
+  - name: distinct
+    object: collection0
+    arguments:
+      fieldName: x
+      filter: {}
+      session: session1
+    expectResult: [11, 12]
+  - name: findOneAndUpdate
+    object: collection0
+    arguments:
+      filter: { _id: 2 }
+      update: { $inc: { x: 1 } }
+      returnDocument: After
+    expectResult: { _id: 2, x: 13 }
+  - name: distinct
+    object: collection0
+    arguments:
+      fieldName: x
+      filter: {}
+    expectResult: [ 11, 13 ]
+  - name: distinct
+    object: collection0
+    arguments:
+      fieldName: x
+      filter: {}
+      session: session0
+    expectResult: [ 11 ]
+  - name: distinct
+    object: collection0
+    arguments:
+      fieldName: x
+      filter: {}
+      session: session1
+    expectResult: [ 11, 12 ]
+  expectEvents:
+  - client: client0
+    events:
+    - commandStartedEvent:
+        command:
+          distinct: collection0
+          readConcern:
+            level: snapshot
+            atClusterTime:
+              "$$exists": false
+    - commandStartedEvent:
+        command:
+          distinct: collection0
+          readConcern:
+            level: snapshot
+            atClusterTime:
+              "$$exists": false
+    - commandStartedEvent:
+        command:
+          distinct: collection0
+          readConcern:
+            "$$exists": false
+    - commandStartedEvent:
+        command:
+          distinct: collection0
+          readConcern:
+            level: snapshot
+            atClusterTime:
+              "$$exists": true
+    - commandStartedEvent:
+        command:
+          distinct: collection0
+          readConcern:
+            level: snapshot
+            atClusterTime:
+              "$$exists": true
+
+- description: Aggregate operation with snapshot
+  operations:
+  - name: aggregate
+    object: collection0
+    arguments:
+      pipeline:
+      - "$match": { _id: 1 }
+      session: session0
+    expectResult:
+    - { _id: 1, x: 11 }
+  - name: findOneAndUpdate
+    object: collection0
+    arguments:
+      filter: { _id: 1 }
+      update: { $inc: { x: 1 } }
+      returnDocument: After
+    expectResult: { _id: 1, x: 12 }
+  - name: aggregate
+    object: collection0
+    arguments:
+      pipeline:
+      - "$match":
+          _id: 1
+      session: session1
+    expectResult:
+    - {_id: 1, x: 12}
+  - name: findOneAndUpdate
+    object: collection0
+    arguments:
+      filter: { _id: 1 }
+      update: { $inc: { x: 1 } }
+      returnDocument: After
+    expectResult: { _id: 1, x: 13 }
+  - name: aggregate
+    object: collection0
+    arguments:
+      pipeline:
+      - "$match": { _id: 1 }
+    expectResult:
+    - { _id: 1, x: 13 }
+  - name: aggregate
+    object: collection0
+    arguments:
+      pipeline:
+      - "$match":
+          _id: 1
+      session: session0
+    expectResult:
+    - { _id: 1, x: 11 }
+  - name: aggregate
+    object: collection0
+    arguments:
+      pipeline:
+      - "$match": { _id: 1 }
+      session: session1
+    expectResult:
+    - { _id: 1, x: 12 }
+  expectEvents:
+  - client: client0
+    events:
+    - commandStartedEvent:
+        command:
+          aggregate: collection0
+          readConcern:
+            level: snapshot
+            atClusterTime:
+              "$$exists": false
+    - commandStartedEvent:
+        command:
+          aggregate: collection0
+          readConcern:
+            level: snapshot
+            atClusterTime:
+              "$$exists": false
+    - commandStartedEvent:
+        command:
+          aggregate: collection0
+          readConcern:
+            "$$exists": false
+    - commandStartedEvent:
+        command:
+          aggregate: collection0
+          readConcern:
+            level: snapshot
+            atClusterTime:
+              "$$exists": true
+    - commandStartedEvent:
+        command:
+          aggregate: collection0
+          readConcern:
+            level: snapshot
+            atClusterTime:
+              "$$exists": true
+
+- description: countDocuments operation with snapshot
+  operations:
+  - name: countDocuments
+    object: collection0
+    arguments:
+      filter: {}
+      session: session0
+    expectResult: 2
+  - name: countDocuments
+    object: collection0
+    arguments:
+      filter: {}
+      session: session0
+    expectResult: 2
+  expectEvents:
+  - client: client0
+    events:
+    - commandStartedEvent:
+        command:
+          aggregate: collection0
+          readConcern:
+            level: snapshot
+            atClusterTime:
+              "$$exists": false
+    - commandStartedEvent:
+        command:
+          aggregate: collection0
+          readConcern:
+            level: snapshot
+            atClusterTime:
+              "$$exists": true
+
+- description: Mixed operation with snapshot
+  operations:
+  - name: find
+    object: collection0
+    arguments:
+      session: session0
+      filter: { _id: 1 }
+    expectResult:
+    - { _id: 1, x: 11 }
+  - name: findOneAndUpdate
+    object: collection0
+    arguments:
+      filter: { _id: 1 }
+      update: { $inc: { x: 1 } }
+      returnDocument: After
+    expectResult: { _id: 1, x: 12 }
+  - name: find
+    object: collection0
+    arguments:
+      filter: { _id: 1 }
+    expectResult:
+    - { _id: 1, x: 12 }
+  - name: aggregate
+    object: collection0
+    arguments:
+      pipeline:
+      - "$match":
+          _id: 1
+      session: session0
+    expectResult:
+    - { _id: 1, x: 11 }
+  - name: distinct
+    object: collection0
+    arguments:
+      fieldName: x
+      filter: {}
+      session: session0
+    expectResult: [ 11 ] 
+  expectEvents:
+  - client: client0
+    events:
+    - commandStartedEvent:
+        command:
+          find: collection0
+          readConcern:
+            level: snapshot
+            atClusterTime:
+              "$$exists": false
+    - commandStartedEvent:
+        command:
+          find: collection0
+          readConcern:
+            "$$exists": false
+    - commandStartedEvent:
+        command:
+          aggregate: collection0
+          readConcern:
+            level: snapshot
+            atClusterTime:
+              "$$exists": true
+    - commandStartedEvent:
+        command:
+          distinct: collection0
+          readConcern:
+            level: snapshot
+            atClusterTime:
+              "$$exists": true
+
+- description: Write commands with snapshot session do not affect snapshot reads
+  operations:
+  - name: find
+    object: collection0
+    arguments:
+      filter: {}
+      session: session0
+  - name: insertOne
+    object: collection0
+    arguments:
+      document:
+        _id: 22
+        x: 33
+  - name: updateOne
+    object: collection0
+    arguments:
+      filter: { _id: 1 }
+      update: { $inc: { x: 1 } }
+  - name: find
+    object: collection0
+    arguments:
+      filter: { _id: 1 }
+      session: session0
+    expectResult:
+    - {_id: 1, x: 11}
+  expectEvents:
+  - client: client0
+    events:
+    - commandStartedEvent:
+        command:
+          find: collection0
+          readConcern:
+            level: snapshot
+            atClusterTime:
+              "$$exists": false
+    - commandStartedEvent:
+        command:
+          find: collection0
+          readConcern:
+            level: snapshot
+            atClusterTime:
+              "$$exists": true
+
+- description: First snapshot read does not send atClusterTime
+  operations:
+  - name: find
+    object: collection0
+    arguments:
+      filter: {}
+      session: session0
+  expectEvents:
+  - client: client0
+    events:
+    - commandStartedEvent:
+        command:
+          find: collection0
+          readConcern:
+            level: snapshot
+            atClusterTime:
+              "$$exists": false
+        commandName: find
+        databaseName: database0
+
+- description: StartTransaction fails in snapshot session
+  operations:
+  - name: startTransaction
+    object: session0
+    expectError:
+      isError: true
+      isClientError: true
+      errorContains: Transactions are not supported in snapshot sessions

data/spec/spec_tests/seed_list_discovery_spec.rb

@@ -15,7 +15,7 @@ describe 'DNS Seedlist Discovery' do
 
   SEED_LIST_DISCOVERY_TESTS.each do |test_path|
 
-    spec = YAML.load(File.read(test_path))
+    spec = ::Utils.load_spec_yaml_file(test_path)
 
     test = Mongo::ConnectionString::Test.new(spec)
 

data/spec/spec_tests/sessions_unified_spec.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
+require 'spec_helper'
+
+require 'runners/unified'
+
+base = "#{CURRENT_PATH}/spec_tests/data/sessions_unified"
+SESSIONS_UNIFIED_TESTS = Dir.glob("#{base}/**/*.yml").sort
+
+describe 'Sessions unified spec tests' do
+  define_unified_spec_tests(base, SESSIONS_UNIFIED_TESTS)
+end

data/spec/support/utils.rb

@@ -595,4 +595,35 @@ module Utils
       end
     end
   end
+
+  module_function def load_spec_yaml_file(path)
+    permitted_classes = [
+                          BigDecimal,
+                          Date,
+                          Time,
+                          Range,
+                          Regexp,
+                          Symbol,
+                          BSON::Binary,
+                          BSON::Code,
+                          BSON::CodeWithScope,
+                          BSON::DbPointer,
+                          BSON::Decimal128,
+                          BSON::Int32,
+                          BSON::Int64,
+                          BSON::MaxKey,
+                          BSON::MinKey,
+                          BSON::ObjectId,
+                          BSON::Regexp::Raw,
+                          BSON::Symbol::Raw,
+                          BSON::Timestamp,
+                          BSON::Undefined,
+                        ]
+    if RUBY_VERSION.start_with?("2.5")
+      YAML.safe_load(File.read(path), permitted_classes, [], true)
+    else
+      # Here we have Ruby 2.6+ that supports the new syntax of `safe_load``.
+      YAML.safe_load(File.read(path), permitted_classes: permitted_classes, aliases: true)
+    end
+  end
 end