SERVER-59913 Move CollectionPtr yield logic out of the CollectionCatalog

CollectionPtr is no longer yieldable by default, to make them yieldable you must explicitly call 'makeYieldable'.

This removes some dependencies from the CollectionCatalog and allows us to set up how yielding should work in the AutoGet layer. This could also be a stepping stone to completely remove CollectionPtr from the interfaces of CollectionCatalog.

1 files changed, 10 insertions, 1 deletions

diff --git a/src/mongo/db/catalog/collection_catalog_test.cpp b/src/mongo/db/catalog/collection_catalog_test.cpp
index 5c3563e6b69..5d31306de97 100644
--- a/src/mongo/db/catalog/collection_catalog_test.cpp
+++ b/src/mongo/db/catalog/collection_catalog_test.cpp
@@ -34,6 +34,7 @@
 #include "mongo/db/catalog/catalog_test_fixture.h"
 #include "mongo/db/catalog/collection_catalog_helper.h"
 #include "mongo/db/catalog/collection_mock.h"
+#include "mongo/db/catalog/collection_yield_restore.h"
 #include "mongo/db/catalog/uncommitted_catalog_updates.h"
 #include "mongo/db/catalog_raii.h"
 #include "mongo/db/concurrency/lock_manager_defs.h"
@@ -75,7 +76,7 @@ public:
         globalLock.emplace(opCtx.get());
 
         std::shared_ptr<Collection> collection = std::make_shared<CollectionMock>(colUUID, nss);
-        col = CollectionPtr(collection.get(), CollectionPtr::NoYieldTag{});
+        col = CollectionPtr(collection.get());
         // Register dummy collection in catalog.
         catalog.registerCollection(opCtx.get(), colUUID, collection, boost::none);
 
@@ -354,6 +355,10 @@ TEST_F(CollectionCatalogTest, OnDropCollection) {
     ASSERT(yieldableColl);
     ASSERT_EQUALS(yieldableColl, col);
 
+    // Make the CollectionPtr yieldable by setting yield impl
+    yieldableColl.makeYieldable(opCtx.get(),
+                                LockedCollectionYieldRestore(opCtx.get(), yieldableColl));
+
     // Yielding resets a CollectionPtr's internal state to be restored later, provided
     // the collection has not been dropped or renamed.
     ASSERT_EQ(yieldableColl->uuid(), colUUID);  // Correct collection UUID is required for restore.
@@ -392,6 +397,10 @@ TEST_F(CollectionCatalogTest, RenameCollection) {
     ASSERT(yieldableColl);
     ASSERT_EQUALS(yieldableColl, collection);
 
+    // Make the CollectionPtr yieldable by setting yield impl
+    yieldableColl.makeYieldable(opCtx.get(),
+                                LockedCollectionYieldRestore(opCtx.get(), yieldableColl));
+
     // Yielding resets a CollectionPtr's internal state to be restored later, provided
     // the collection has not been dropped or renamed.
     ASSERT_EQ(yieldableColl->uuid(), uuid);  // Correct collection UUID is required for restore.