Merge branch 'main' into NODE-6492-txn-prose

Author: durran

test/spec/change-streams/unified/change-streams-disambiguatedPaths.json

@@ -29,7 +29,6 @@
       "maxServerVersion": "8.1.0",
       "topologies": [
         "replicaset",
-        "sharded-replicaset",
         "load-balanced",
         "sharded"
       ],
@@ -44,70 +43,6 @@
     }
   ],
   "tests": [
-    {
-      "description": "disambiguatedPaths is not present when showExpandedEvents is false/unset",
-      "operations": [
-        {
-          "name": "insertOne",
-          "object": "collection0",
-          "arguments": {
-            "document": {
-              "_id": 1,
-              "a": {
-                "1": 1
-              }
-            }
-          }
-        },
-        {
-          "name": "createChangeStream",
-          "object": "collection0",
-          "arguments": {
-            "pipeline": []
-          },
-          "saveResultAsEntity": "changeStream0"
-        },
-        {
-          "name": "updateOne",
-          "object": "collection0",
-          "arguments": {
-            "filter": {
-              "_id": 1
-            },
-            "update": {
-              "$set": {
-                "a.1": 2
-              }
-            }
-          }
-        },
-        {
-          "name": "iterateUntilDocumentOrError",
-          "object": "changeStream0",
-          "expectResult": {
-            "operationType": "update",
-            "ns": {
-              "db": "database0",
-              "coll": "collection0"
-            },
-            "updateDescription": {
-              "updatedFields": {
-                "$$exists": true
-              },
-              "removedFields": {
-                "$$exists": true
-              },
-              "truncatedArrays": {
-                "$$exists": true
-              },
-              "disambiguatedPaths": {
-                "$$exists": false
-              }
-            }
-          }
-        }
-      ]
-    },
     {
       "description": "disambiguatedPaths is present on updateDescription when an ambiguous path is present",
       "operations": [

test/spec/change-streams/unified/change-streams-disambiguatedPaths.yml

@@ -25,32 +25,6 @@ initialData:
     documents: []
 
 tests:
-  - description: "disambiguatedPaths is not present when showExpandedEvents is false/unset"
-    operations:
-      - name: insertOne
-        object: *collection0
-        arguments:
-          document: { _id: 1, 'a': { '1': 1 } }
-      - name: createChangeStream
-        object: *collection0
-        arguments: { pipeline: [] }
-        saveResultAsEntity: &changeStream0 changeStream0
-      - name: updateOne
-        object: *collection0
-        arguments:
-          filter: { _id: 1 }
-          update: { $set: { 'a.1': 2 } }
-      - name: iterateUntilDocumentOrError
-        object: *changeStream0
-        expectResult:
-          operationType: "update"
-          ns: { db: *database0, coll: *collection0 }
-          updateDescription:
-            updatedFields: { $$exists: true }
-            removedFields: { $$exists: true }
-            truncatedArrays: { $$exists: true }
-            disambiguatedPaths: { $$exists: false }
-
   - description: "disambiguatedPaths is present on updateDescription when an ambiguous path is present"
     operations:
       - name: insertOne

test/spec/change-streams/unified/change-streams.json

@@ -181,7 +181,12 @@
                   "field": "array",
                   "newSize": 2
                 }
-              ]
+              ],
+              "disambiguatedPaths": {
+                "$$unsetOrMatches": {
+                  "$$exists": true
+                }
+              }
             }
           }
         }
@@ -1408,6 +1413,11 @@
                 "$$unsetOrMatches": {
                   "$$exists": true
                 }
+              },
+              "disambiguatedPaths": {
+                "$$unsetOrMatches": {
+                  "$$exists": true
+                }
               }
             }
           }

test/spec/change-streams/unified/change-streams.yml

@@ -115,7 +115,8 @@ tests:
                 "field": "array",
                 "newSize": 2
               }
-            ]
+            ],
+            disambiguatedPaths: { $$unsetOrMatches: { $$exists: true } }
           }
         }
 
@@ -722,6 +723,7 @@ tests:
             updatedFields: { x: 2 }
             removedFields: []
             truncatedArrays: { $$unsetOrMatches: { $$exists: true } }
+            disambiguatedPaths: { $$unsetOrMatches: { $$exists: true } }
       - name: iterateUntilDocumentOrError
         object: *changeStream0
         expectResult: