mongo 2.9.2 → 2.10.0.rc0

data/spec/spec_tests/data/transactions/read-concern.yml

@@ -2,6 +2,9 @@ runOn:
     -
         minServerVersion: "4.0"
         topology: ["replicaset"]
+    -
+        minServerVersion: "4.1.8"
+        topology: ["sharded"]
 
 database_name: &database_name "transaction-tests"
 collection_name: &collection_name "test"

data/spec/spec_tests/data/transactions/read-pref.yml

@@ -3,6 +3,9 @@ runOn:
     -
         minServerVersion: "4.0"
         topology: ["replicaset"]
+    -
+        minServerVersion: "4.1.8"
+        topology: ["sharded"]
 
 database_name: &database_name "transaction-tests"
 collection_name: &collection_name "test"

data/spec/spec_tests/data/transactions/reads.yml

@@ -2,6 +2,9 @@ runOn:
     -
         minServerVersion: "4.0"
         topology: ["replicaset"]
+    -
+        minServerVersion: "4.1.8"
+        topology: ["sharded"]
 
 database_name: &database_name "transaction-tests"
 collection_name: &collection_name "test"

data/spec/spec_tests/data/transactions/retryable-abort.yml

@@ -2,6 +2,9 @@ runOn:
     -
         minServerVersion: "4.0"
         topology: ["replicaset"]
+    -
+        minServerVersion: "4.1.8"
+        topology: ["sharded"]
 
 database_name: &database_name "transaction-tests"
 collection_name: &collection_name "test"
@@ -464,7 +467,7 @@ tests:
       collection:
         data: []
 
-  - description: abortTransaction succeeds after InterruptedDueToStepDown 
+  - description: abortTransaction succeeds after InterruptedDueToReplStateChange 
 
     failPoint:
       configureFailPoint: failCommand
@@ -1074,7 +1077,7 @@ tests:
       collection:
         data: []
 
-  - description: abortTransaction succeeds after WriteConcernError InterruptedDueToStepDown 
+  - description: abortTransaction succeeds after WriteConcernError InterruptedDueToReplStateChange 
 
     failPoint:
       configureFailPoint: failCommand

data/spec/spec_tests/data/transactions/retryable-commit.yml

@@ -2,6 +2,9 @@ runOn:
     -
         minServerVersion: "4.0"
         topology: ["replicaset"]
+    -
+        minServerVersion: "4.1.8"
+        topology: ["sharded"]
 
 database_name: &database_name "transaction-tests"
 collection_name: &collection_name "test"
@@ -1216,7 +1219,7 @@ tests:
         data:
           - _id: 1
 
-  - description: commitTransaction succeeds after WriteConcernError InterruptedDueToStepDown 
+  - description: commitTransaction succeeds after WriteConcernError InterruptedDueToReplStateChange 
 
     failPoint:
       configureFailPoint: failCommand

data/spec/spec_tests/data/transactions/retryable-writes.yml

@@ -2,6 +2,9 @@ runOn:
     -
         minServerVersion: "4.0"
         topology: ["replicaset"]
+    -
+        minServerVersion: "4.1.8"
+        topology: ["sharded"]
 
 database_name: &database_name "transaction-tests"
 collection_name: &collection_name "test"

data/spec/spec_tests/data/transactions/run-command.yml

@@ -2,6 +2,9 @@ runOn:
     -
         minServerVersion: "4.0"
         topology: ["replicaset"]
+    -
+        minServerVersion: "4.1.8"
+        topology: ["sharded"]
 
 database_name: &database_name "transaction-tests"
 collection_name: &collection_name "test"

data/spec/spec_tests/data/transactions/transaction-options.yml

@@ -2,6 +2,12 @@ runOn:
     -
         minServerVersion: "4.0"
         topology: ["replicaset"]
+    # Skip these tests on 4.3 due to
+    # https://jira.mongodb.org/browse/SERVER-40685 and
+    # https://jira.mongodb.org/browse/HELP-10518
+    #-
+    #    minServerVersion: "4.1.8"
+    #    topology: ["sharded"]
 
 database_name: &database_name "transaction-tests"
 collection_name: &collection_name "test"

data/spec/spec_tests/data/transactions/update.yml

@@ -2,6 +2,9 @@ runOn:
     -
         minServerVersion: "4.0"
         topology: ["replicaset"]
+    -
+        minServerVersion: "4.1.8"
+        topology: ["sharded"]
 
 database_name: &database_name "transaction-tests"
 collection_name: &collection_name "test"
@@ -62,7 +65,6 @@ tests:
             updates:
               - q: {_id: 4}
                 u: {$inc: {x: 1}}
-                multi: false
                 upsert: true
             ordered: true
             readConcern:
@@ -80,8 +82,6 @@ tests:
             updates:
               - q: {x: 1}
                 u: {y: 1}
-                multi: false
-                upsert: false
             ordered: true
             lsid: session0
             txnNumber:
@@ -98,7 +98,6 @@ tests:
               - q: {_id: {$gte: 3}}
                 u: {$set: {z: 1}}
                 multi: true
-                upsert: false
             ordered: true
             lsid: session0
             txnNumber:
@@ -191,7 +190,6 @@ tests:
             updates:
               - q: {_id: 4}
                 u: {$inc: {x: 1}}
-                multi: false
                 upsert: true
             ordered: true
             readConcern:
@@ -209,8 +207,6 @@ tests:
             updates:
               - q: {x: 1}
                 u: {y: 1}
-                multi: false
-                upsert: false
             ordered: true
             lsid: session0
             txnNumber:
@@ -227,7 +223,6 @@ tests:
               - q: {_id: {$gte: 3}}
                 u: {$set: {z: 1}}
                 multi: true
-                upsert: false
             ordered: true
             lsid: session0
             txnNumber:

data/spec/spec_tests/data/transactions/write-concern.yml

@@ -8,7 +8,8 @@ runOn:
 database_name: &database_name "transaction-tests"
 collection_name: &collection_name "test"
 
-data: []
+data: &data
+  - _id: 0
 
 tests:
   - description: commit with majority
@@ -27,23 +28,26 @@ tests:
             _id: 1
         result:
           insertedId: 1
-      - name: commitTransaction
+      - &commitTransaction
+        name: commitTransaction
         object: session0
 
     expectations:
-      - command_started_event:
+      - &insertOneEvent
+        command_started_event:
           command:
             insert: *collection_name
             documents:
               - _id: 1
             ordered: true
-            readConcern:
-            lsid: session0
-            txnNumber:
-              $numberLong: "1"
-            startTransaction: true
-            autocommit: false
-            writeConcern:
+            <<: &transactionCommandArgs
+              lsid: session0
+              txnNumber:
+                $numberLong: "1"
+              startTransaction: true
+              autocommit: false
+              readConcern:
+              writeConcern:
           command_name: insert
           database_name: *database_name
       - command_started_event:
@@ -62,12 +66,14 @@ tests:
     outcome:
       collection:
         data:
+          - _id: 0
           - _id: 1
 
   - description: commit with default
 
     operations:
-      - name: startTransaction
+      - &startTransaction
+        name: startTransaction
         object: session0
       - name: insertOne
         object: collection
@@ -77,8 +83,7 @@ tests:
             _id: 1
         result:
           insertedId: 1
-      - name: commitTransaction
-        object: session0
+      - *commitTransaction
 
     expectations:
       - command_started_event:
@@ -87,16 +92,11 @@ tests:
             documents:
               - _id: 1
             ordered: true
-            readConcern:
-            lsid: session0
-            txnNumber:
-              $numberLong: "1"
-            startTransaction: true
-            autocommit: false
-            writeConcern:
+            <<: *transactionCommandArgs
           command_name: insert
           database_name: *database_name
-      - command_started_event:
+      - &commitWithDefaultWCEvent
+        command_started_event:
           command:
             commitTransaction: 1
             lsid: session0
@@ -111,7 +111,7 @@ tests:
     outcome:
       collection:
         data:
-
+          - _id: 0
           - _id: 1
 
   - description: abort with majority
@@ -141,13 +141,7 @@ tests:
             documents:
               - _id: 1
             ordered: true
-            readConcern:
-            lsid: session0
-            txnNumber:
-              $numberLong: "1"
-            startTransaction: true
-            autocommit: false
-            writeConcern:
+            <<: *transactionCommandArgs
           command_name: insert
           database_name: *database_name
       - command_started_event:
@@ -165,7 +159,7 @@ tests:
 
     outcome:
       collection:
-        data: []
+        data: *data
 
   - description: abort with default
 
@@ -190,13 +184,7 @@ tests:
             documents:
               - _id: 1
             ordered: true
-            readConcern:
-            lsid: session0
-            txnNumber:
-              $numberLong: "1"
-            startTransaction: true
-            autocommit: false
-            writeConcern:
+            <<: *transactionCommandArgs
           command_name: insert
           database_name: *database_name
       - command_started_event:
@@ -213,7 +201,7 @@ tests:
 
     outcome:
       collection:
-        data: []
+        data: *data
 
   - description: start with unacknowledged write concern
 
@@ -239,3 +227,325 @@ tests:
         result:
           # Client-side error.
           errorContains: transactions do not support unacknowledged write concern
+
+  - description: unacknowledged write concern coll insertOne
+
+    operations:
+      - *startTransaction
+      - name: insertOne
+        <<: &collection_w0
+          object: collection
+          collectionOptions:
+            writeConcern: { w: 0 }
+        arguments:
+          session: session0
+          document:
+            _id: 1
+        result:
+          insertedId: 1
+      - *commitTransaction
+
+    expectations:
+      - *insertOneEvent
+      - *commitWithDefaultWCEvent
+
+    outcome:
+      collection:
+        data:
+          - _id: 0
+          - _id: 1
+
+  - description: unacknowledged write concern coll insertMany
+
+    operations:
+      - *startTransaction
+      - name: insertMany
+        <<: *collection_w0
+        arguments:
+          session: session0
+          documents:
+            - _id: 1
+            - _id: 2
+        result:
+          insertedIds: {0: 1, 1: 2}
+      - *commitTransaction
+
+    expectations:
+      - command_started_event:
+          command:
+            insert: *collection_name
+            documents:
+              - _id: 1
+              - _id: 2
+            ordered: true
+            <<: *transactionCommandArgs
+          command_name: insert
+          database_name: *database_name
+      - *commitWithDefaultWCEvent
+
+    outcome:
+      collection:
+        data:
+          - _id: 0
+          - _id: 1
+          - _id: 2
+
+  - description: unacknowledged write concern coll bulkWrite
+
+    operations:
+      - *startTransaction
+      - name: bulkWrite
+        <<: *collection_w0
+        arguments:
+          session: session0
+          requests:
+            - name: insertOne
+              arguments:
+                document: {_id: 1}
+        result:
+          deletedCount: 0
+          insertedCount: 1
+          insertedIds: {0: 1}
+          matchedCount: 0
+          modifiedCount: 0
+          upsertedCount: 0
+          upsertedIds: {}
+      - *commitTransaction
+
+    expectations:
+      - *insertOneEvent
+      - *commitWithDefaultWCEvent
+
+    outcome:
+      collection:
+        data:
+          - _id: 0
+          - _id: 1
+
+
+  - description: unacknowledged write concern coll deleteOne
+
+    operations:
+      - *startTransaction
+      - name: deleteOne
+        <<: *collection_w0
+        arguments:
+          session: session0
+          filter:
+            _id: 0
+        result:
+          deletedCount: 1
+      - *commitTransaction
+
+    expectations:
+      - command_started_event:
+          command:
+            delete: *collection_name
+            deletes:
+              - q: {_id: 0}
+                limit: 1
+            ordered: true
+            <<: *transactionCommandArgs
+          command_name: delete
+          database_name: *database_name
+      - *commitWithDefaultWCEvent
+
+    outcome:
+      collection:
+        data: []
+
+  - description: unacknowledged write concern coll deleteMany
+
+    operations:
+      - *startTransaction
+      - name: deleteMany
+        <<: *collection_w0
+        arguments:
+          session: session0
+          filter:
+            _id: 0
+        result:
+          deletedCount: 1
+      - *commitTransaction
+
+    expectations:
+      - command_started_event:
+          command:
+            delete: *collection_name
+            deletes:
+              - q: {_id: 0}
+                limit: 0
+            ordered: true
+            <<: *transactionCommandArgs
+          command_name: delete
+          database_name: *database_name
+      - *commitWithDefaultWCEvent
+
+    outcome:
+      collection:
+        data: []
+
+  - description: unacknowledged write concern coll updateOne
+
+    operations:
+      - *startTransaction
+      - name: updateOne
+        <<: *collection_w0
+        arguments:
+          session: session0
+          filter: {_id: 0}
+          update:
+            $inc: {x: 1}
+          upsert: true
+        result:
+          matchedCount: 1
+          modifiedCount: 1
+          upsertedCount: 0
+      - *commitTransaction
+
+    expectations:
+      - command_started_event:
+          command:
+            update: *collection_name
+            updates:
+              - q: {_id: 0}
+                u: {$inc: {x: 1}}
+                upsert: true
+            ordered: true
+            <<: *transactionCommandArgs
+          command_name: update
+          database_name: *database_name
+      - *commitWithDefaultWCEvent
+
+    outcome:
+      collection:
+        data:
+          - {_id: 0, x: 1}
+
+  - description: unacknowledged write concern coll updateMany
+
+    operations:
+      - *startTransaction
+      - name: updateMany
+        <<: *collection_w0
+        arguments:
+          session: session0
+          filter: {_id: 0}
+          update:
+            $inc: {x: 1}
+          upsert: true
+        result:
+          matchedCount: 1
+          modifiedCount: 1
+          upsertedCount: 0
+      - *commitTransaction
+
+    expectations:
+      - command_started_event:
+          command:
+            update: *collection_name
+            updates:
+              - q: {_id: 0}
+                u: {$inc: {x: 1}}
+                multi: true
+                upsert: true
+            ordered: true
+            <<: *transactionCommandArgs
+          command_name: update
+          database_name: *database_name
+      - *commitWithDefaultWCEvent
+
+    outcome:
+      collection:
+        data:
+          - {_id: 0, x: 1}
+
+  - description: unacknowledged write concern coll findOneAndDelete
+
+    operations:
+      - *startTransaction
+      - name: findOneAndDelete
+        <<: *collection_w0
+        arguments:
+          session: session0
+          filter: {_id: 0}
+        result: {_id: 0}
+      - *commitTransaction
+
+    expectations:
+      - command_started_event:
+          command:
+            findAndModify: *collection_name
+            query: {_id: 0}
+            remove: True
+            <<: *transactionCommandArgs
+          command_name: findAndModify
+          database_name: *database_name
+      - *commitWithDefaultWCEvent
+
+    outcome:
+      collection:
+        data: []
+
+  - description: unacknowledged write concern coll findOneAndReplace
+
+    operations:
+      - *startTransaction
+      - name: findOneAndReplace
+        <<: *collection_w0
+        arguments:
+          session: session0
+          filter: {_id: 0}
+          replacement: {x: 1}
+          returnDocument: Before
+        result: {_id: 0}
+      - *commitTransaction
+
+    expectations:
+      - command_started_event:
+          command:
+            findAndModify: *collection_name
+            query: {_id: 0}
+            update: {x: 1}
+            new: false
+            <<: *transactionCommandArgs
+          command_name: findAndModify
+          database_name: *database_name
+      - *commitWithDefaultWCEvent
+
+    outcome:
+      collection:
+        data:
+          - {_id: 0, x: 1}
+
+  - description: unacknowledged write concern coll findOneAndUpdate
+
+    operations:
+      - *startTransaction
+      - name: findOneAndUpdate
+        <<: *collection_w0
+        arguments:
+          session: session0
+          filter: {_id: 0}
+          update:
+            $inc: {x: 1}
+          returnDocument: Before
+        result: {_id: 0}
+      - *commitTransaction
+
+    expectations:
+      - command_started_event:
+          command:
+            findAndModify: *collection_name
+            query: {_id: 0}
+            update: {$inc: {x: 1}}
+            new: false
+            <<: *transactionCommandArgs
+          command_name: findAndModify
+          database_name: *database_name
+      - *commitWithDefaultWCEvent
+
+    outcome:
+      collection:
+        data:
+          - {_id: 0, x: 1}