diff options
Diffstat (limited to 'src/mongo/db/repl/rs_rollback_test.cpp')
-rw-r--r-- | src/mongo/db/repl/rs_rollback_test.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/mongo/db/repl/rs_rollback_test.cpp b/src/mongo/db/repl/rs_rollback_test.cpp index b669cb65536..26262101061 100644 --- a/src/mongo/db/repl/rs_rollback_test.cpp +++ b/src/mongo/db/repl/rs_rollback_test.cpp @@ -57,6 +57,7 @@ #include "mongo/db/repl/rollback_test_fixture.h" #include "mongo/db/repl/rs_rollback.h" #include "mongo/db/s/shard_identity_rollback_notifier.h" +#include "mongo/db/storage/durable_catalog.h" #include "mongo/unittest/death_test.h" #include "mongo/unittest/unittest.h" #include "mongo/util/net/hostandport.h" @@ -1114,7 +1115,8 @@ TEST_F(RSRollbackTest, RollbackRenameCollectionInSameDatabaseCommand) { // Remote collection options should have been empty. auto collAfterRollbackOptions = - oldCollName.getCollection()->getCatalogEntry()->getCollectionOptions(_opCtx.get()); + DurableCatalog::get(_opCtx.get()) + ->getCollectionOptions(_opCtx.get(), oldCollName.getCollection()->ns()); ASSERT_BSONOBJ_EQ(BSON("uuid" << *options.uuid), collAfterRollbackOptions.toBSON()); } } @@ -1169,9 +1171,8 @@ TEST_F(RSRollbackTest, ASSERT_TRUE(rollbackSource.getCollectionInfoCalled); AutoGetCollectionForReadCommand autoColl(_opCtx.get(), NamespaceString(renameFromNss)); - auto collAfterRollback = autoColl.getCollection(); auto collAfterRollbackOptions = - collAfterRollback->getCatalogEntry()->getCollectionOptions(_opCtx.get()); + DurableCatalog::get(_opCtx.get())->getCollectionOptions(_opCtx.get(), renameFromNss); ASSERT_TRUE(collAfterRollbackOptions.temp); ASSERT_BSONOBJ_EQ(BSON("uuid" << *options.uuid << "temp" << true), collAfterRollbackOptions.toBSON()); @@ -1815,7 +1816,8 @@ TEST_F(RSRollbackTest, RollbackCollectionModificationCommand) { // Make sure the collection options are correct. AutoGetCollectionForReadCommand autoColl(_opCtx.get(), NamespaceString("test.t")); auto collAfterRollbackOptions = - autoColl.getCollection()->getCatalogEntry()->getCollectionOptions(_opCtx.get()); + DurableCatalog::get(_opCtx.get()) + ->getCollectionOptions(_opCtx.get(), NamespaceString("test.t")); ASSERT_BSONOBJ_EQ(BSON("uuid" << *options.uuid), collAfterRollbackOptions.toBSON()); } |