Revert "SERVER-95976 Introduce "matchCollectionUUIDForUpdateLookup" parameter in the change stream stage (#31141)" (#33299)

GitOrigin-RevId: 00f042c1dfa19cb3b5baae8a44b8cc046e55da4e

Author: auto-revert-app[bot]

etc/backports_required_for_multiversion_tests.yml

@@ -573,22 +573,6 @@ last-continuous:
     ticket: SERVER-95670
   - test_file: jstests/sharding/query/owning_shard_expression.js
     ticket: SERVER-95670
-  - test_file: jstests/core/write/update/upsert_duplicate_key_retry_collation.js
-    ticket: SERVER-84089
-  - test_file: jstests/change_streams/update_lookup_before_ddl.js
-    ticket: SERVER-95976
-  - test_file: jstests/change_streams/lookup_post_image.js
-    ticket: SERVER-95976
-  - test_file: jstests/sharding/change_stream_update_lookup_collation.js
-    ticket: SERVER-95976
-  - test_file: jstests/concurrency/fsm_workloads/upsert_unique_index_collation.js
-    ticket: SERVER-94156
-  - test_file: jstests/core/index/geo/geo_2d_point_near_zero.js
-    ticket: SERVER-92930
-  - test_file: jstests/replsets/sync_source_clears_post_failure.js
-    ticket: SERVER-91960
-  - test_file: jstests/sharding/catalog_cache_refresh_with_persisted_collection_cache_corrupted.js
-    ticket: SERVER-95807
   - test_file: jstests/sharding/timeseries_query_extended_range.js
     ticket: SERVER-73641
   - test_file: jstests/core/timeseries/timeseries_index_partial.js
@@ -1222,22 +1206,6 @@ last-lts:
     ticket: SERVER-95670
   - test_file: jstests/sharding/query/owning_shard_expression.js
     ticket: SERVER-95670
-  - test_file: jstests/core/write/update/upsert_duplicate_key_retry_collation.js
-    ticket: SERVER-84089
-  - test_file: jstests/change_streams/update_lookup_before_ddl.js
-    ticket: SERVER-95976
-  - test_file: jstests/change_streams/lookup_post_image.js
-    ticket: SERVER-95976
-  - test_file: jstests/sharding/change_stream_update_lookup_collation.js
-    ticket: SERVER-95976
-  - test_file: jstests/concurrency/fsm_workloads/upsert_unique_index_collation.js
-    ticket: SERVER-94156
-  - test_file: jstests/core/index/geo/geo_2d_point_near_zero.js
-    ticket: SERVER-92930
-  - test_file: jstests/replsets/sync_source_clears_post_failure.js
-    ticket: SERVER-91960
-  - test_file: jstests/sharding/catalog_cache_refresh_with_persisted_collection_cache_corrupted.js
-    ticket: SERVER-95807
   - test_file: jstests/sharding/timeseries_query_extended_range.js
     ticket: SERVER-73641
   - test_file: jstests/core/timeseries/timeseries_index_partial.js

jstests/change_streams/lookup_post_image.js

@@ -188,11 +188,6 @@ assertCreateCollection(db, coll.getName());
 // collection.
 assert.commandWorked(coll.insert({_id: "fullDocument is lookup 2"}));
 
-// If this test is running with secondary read preference, it's necessary for the insert
-// to propagate to all secondary nodes and be available for majority reads before we can
-// assume looking up the document will succeed.
-FixtureHelpers.awaitLastOpCommitted(db);
-
 // After a collection has been dropped and re-created, verify a change stream can be created with
 // 'fullDocument: updateLookup' using a resume token from before the collection was dropped.
 cursor = cst.startWatchingChanges({
@@ -210,13 +205,13 @@ assert.eq(latestChange.operationType, "insert");
 assert(latestChange.hasOwnProperty("fullDocument"));
 assert.eq(latestChange.fullDocument, {_id: "fullDocument is lookup 2"});
 
-// The next entry is the 'update' operation. Confirm that the next entry's post-image is not-null
-// even though the original collection has been dropped and the new incarnation of the collection
-// with the same name has a different UUID.
+// The next entry is the 'update' operation. Confirm that the next entry's post-image is null
+// because the original collection (i.e. the collection that the 'update' was applied to) has
+// been dropped and the new incarnation of the collection has a different UUID.
 latestChange = cst.getOneChange(cursor);
 assert.eq(latestChange.operationType, "update");
 assert(latestChange.hasOwnProperty("fullDocument"));
-assert.eq(latestChange.fullDocument, {"_id": "fullDocument is lookup 2"});
+assert.eq(latestChange.fullDocument, null);
 
 jsTestLog("Testing full document lookup with a real getMore");
 assert.commandWorked(coll.insert({_id: "getMoreEnabled"}));

jstests/change_streams/oplog_rewrite/change_stream_null_existence_eq_rewrite_test.js

@@ -22,7 +22,7 @@ const startPoint = db.getMongo().watch().getResumeToken();
 const numDocs = 8;
 
 // Generate a write workload for the change stream to consume.
-generateChangeStreamWriteWorkload(testDB, collName, numDocs, false /* includeInvalidatingEvents */);
+generateChangeStreamWriteWorkload(testDB, collName, numDocs);
 
 // Function to generate a list of all paths to be tested from those observed in the event stream.
 function traverseEvent(event, outputMap, prefixPath = "") {

jstests/change_streams/update_lookup_before_ddl.js

@@ -134,7 +134,6 @@ res = assert.commandWorked(testDB.runCommand({
                   from: foreignCollection.getName(),
                   localField: 'local',
                   foreignField: 'foreign',
-                  pipeline: [{$project: {a: 1}}],
                   as: 'results',
               }
             },
@@ -147,8 +146,10 @@ res = assert.commandWorked(testDB.runCommand({
 foreignCollection.drop();
 getMoreCollName = res.cursor.ns.substr(res.cursor.ns.indexOf('.') + 1);
 res = testDB.runCommand({getMore: res.cursor.id, collection: getMoreCollName});
-assert.commandWorked(res,
-                     'expected getMore to succeed despite the foreign collection being dropped');
+assert.commandFailedWithCode(
+    res,
+    [ErrorCodes.QueryPlanKilled, ErrorCodes.NamespaceNotFound],
+    'expected getMore to fail when the foreign collection has been dropped');
 
 // Make sure the cursors were cleaned up.
 assertNoOpenCursorsOnSourceCollection();
@@ -213,9 +214,10 @@ res = assert.commandWorked(testDB.runCommand({
 foreignCollection.drop();
 getMoreCollName = res.cursor.ns.substr(res.cursor.ns.indexOf('.') + 1);
 res = testDB.runCommand({getMore: res.cursor.id, collection: getMoreCollName});
-assert.commandWorked(res,
-                     'expected getMore to succeed despite the foreign collection being dropped');
-
+assert.commandFailedWithCode(
+    res,
+    ErrorCodes.NamespaceNotFound,
+    'expected getMore to fail when the foreign collection has been dropped');
 // Make sure the cursors were cleaned up.
 assertNoOpenCursorsOnSourceCollection();
 
@@ -244,8 +246,10 @@ res = assert.commandWorked(testDB.runCommand({
 foreignCollection.drop();
 getMoreCollName = res.cursor.ns.substr(res.cursor.ns.indexOf('.') + 1);
 res = testDB.runCommand({getMore: res.cursor.id, collection: getMoreCollName});
-assert.commandWorked(res,
-                     'expected getMore to succeed despite the foreign collection being dropped');
+assert.commandFailedWithCode(
+    res,
+    ErrorCodes.NamespaceNotFound,
+    'expected getMore to fail when the foreign collection has been dropped');
 
 // Make sure the cursors were cleaned up.
 assertNoOpenCursorsOnSourceCollection();

jstests/noPassthrough/aggregation_cursor_invalidations.js

@@ -101,8 +101,8 @@ for (let nextDocKey of [{shardKey: "abc", _id: "abc_1"}, {shardKey: "ABC", _id:
     assert.eq(next.documentKey, nextDocKey, tojson(next));
     assert.docEq(Object.merge(nextDocKey, {updatedCount: 1}), next.fullDocument);
 }
-assert.eq(numIdIndexUsages(st.rs0.getPrimary()), idIndexUsagesPreIteration.shard0);
-assert.eq(numIdIndexUsages(st.rs1.getPrimary()), idIndexUsagesPreIteration.shard1);
+assert.eq(numIdIndexUsages(st.rs0.getPrimary()), idIndexUsagesPreIteration.shard0 + 1);
+assert.eq(numIdIndexUsages(st.rs1.getPrimary()), idIndexUsagesPreIteration.shard1 + 1);
 
 changeStream.close();
 
@@ -147,8 +147,8 @@ for (let nextDocKey of [{shardKey: "ABC", _id: "abc_1"}, {shardKey: "abc", _id:
     assert.eq(next.documentKey, nextDocKey, tojson(next));
     assert.docEq(Object.merge(nextDocKey, {updatedCount: 2}), next.fullDocument);
 }
-assert.eq(numIdIndexUsages(st.rs0.getPrimary()), idIndexUsagesPreIteration.shard0);
-assert.eq(numIdIndexUsages(st.rs1.getPrimary()), idIndexUsagesPreIteration.shard1);
+assert.eq(numIdIndexUsages(st.rs0.getPrimary()), idIndexUsagesPreIteration.shard0 + 1);
+assert.eq(numIdIndexUsages(st.rs1.getPrimary()), idIndexUsagesPreIteration.shard1 + 1);
 
 strengthOneChangeStream.close();
 

jstests/sharding/change_stream_update_lookup_collation.js

@@ -185,13 +185,6 @@ structs:
                              "updateDescription" field in update events will be omitted.
                 query_shape: literal
 
-            matchCollectionUUIDForUpdateLookup:
-                type: optionalBool
-                description: An internal flag that ensures that updateLookup is performed on the 
-                             collection where UUID matches the one from the corresponding change 
-                             event. In case of a mismatch, null document will be returned.
-                query_shape: literal
-
     DocumentSourceChangeStreamOplogMatchSpec:
         strict: true
         description: A document used to specify the $_internalChangeStreamOplogMatch stage of an

src/mongo/db/pipeline/document_source_change_stream.idl

@@ -204,20 +204,9 @@ boost::optional<Document> DocumentSourceChangeStreamAddPostImage::lookupLatestPo
     // Update lookup queries sent from mongoS to shards are allowed to use speculative majority
     // reads. Even if the lookup itself succeeded, it may not have returned any results if the
     // document was deleted in the time since the update op.
-    tassert(9797601, "UUID should be present in the resume token", resumeTokenData.uuid);
-    try {
-        // In case we are running $changeStreams and are performing updateLookup, we do not pass
-        // 'collectionUUID' to avoid any UUID validation on the target collection. UUID of the
-        // target collection should only be checked if 'matchCollectionUUIDForUpdateLookup' flag has
-        // been passed.
-        auto collectionUUID = pExpCtx->changeStreamSpec->getMatchCollectionUUIDForUpdateLookup()
-            ? boost::optional<UUID>(*resumeTokenData.uuid)
-            : boost::none;
-        return pExpCtx->mongoProcessInterface->lookupSingleDocument(
-            pExpCtx, nss, std::move(collectionUUID), documentKey, std::move(readConcern));
-    } catch (const ExceptionFor<ErrorCodes::TooManyMatchingDocuments>& ex) {
-        uasserted(ErrorCodes::ChangeStreamFatalError, ex.what());
-    }
+    invariant(resumeTokenData.uuid);
+    return pExpCtx->mongoProcessInterface->lookupSingleDocument(
+        pExpCtx, nss, *resumeTokenData.uuid, documentKey, std::move(readConcern));
 }
 
 Value DocumentSourceChangeStreamAddPostImage::doSerialize(const SerializationOptions& opts) const {

src/mongo/db/pipeline/document_source_change_stream_add_post_image.cpp

@@ -326,7 +326,7 @@ TEST_F(DocumentSourceChangeStreamAddPostImageTest, ShouldErrorIfDocumentKeyIsNot
         std::make_unique<MockMongoInterface>(std::move(foreignCollection));
 
     ASSERT_THROWS_CODE(
-        lookupChangeStage->getNext(), AssertionException, ErrorCodes::ChangeStreamFatalError);
+        lookupChangeStage->getNext(), AssertionException, ErrorCodes::TooManyMatchingDocuments);
 }
 
 TEST_F(DocumentSourceChangeStreamAddPostImageTest, ShouldPropagatePauses) {

src/mongo/db/pipeline/document_source_change_stream_add_post_image_test.cpp

@@ -171,7 +171,7 @@ struct MockMongoInterface final : public ExecutableStubMongoProcessInterface {
     boost::optional<Document> lookupSingleDocument(
         const boost::intrusive_ptr<ExpressionContext>& expCtx,
         const NamespaceString& nss,
-        boost::optional<UUID> collectionUUID,
+        UUID collectionUUID,
         const Document& documentKey,
         boost::optional<BSONObj> readConcern) final {
         Matcher matcher(documentKey.toBson(), expCtx);