diff options
| author | Geert Bosch <geert@mongodb.com> | 2019-04-29 14:11:12 -0400 |
|---|---|---|
| committer | Geert Bosch <geert@mongodb.com> | 2019-05-07 13:17:24 -0400 |
| commit | ab689c15777a5c2f7d35f602d125fdc7f2fb344c (patch) | |
| tree | f10a2d6bfad8cc009e722ed366e635dfecbb7ee1 /src/mongo/db/catalog/database_test.cpp | |
| parent | 042f4e1f2164f3a801acfd379fafc217817b392c (diff) | |
| download | mongo-ab689c15777a5c2f7d35f602d125fdc7f2fb344c.tar.gz | |
SERVER-40892 Rename UUIDCatalog to CollectionCatalog
Diffstat (limited to 'src/mongo/db/catalog/database_test.cpp')
| -rw-r--r-- | src/mongo/db/catalog/database_test.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/mongo/db/catalog/database_test.cpp b/src/mongo/db/catalog/database_test.cpp index fdf80e6b1f8..4a9d08b678b 100644 --- a/src/mongo/db/catalog/database_test.cpp +++ b/src/mongo/db/catalog/database_test.cpp @@ -33,9 +33,9 @@ #include <pcrecpp.h> #include "mongo/bson/util/builder.h" +#include "mongo/db/catalog/collection_catalog.h" #include "mongo/db/catalog/collection_catalog_entry.h" #include "mongo/db/catalog/index_catalog.h" -#include "mongo/db/catalog/uuid_catalog.h" #include "mongo/db/client.h" #include "mongo/db/concurrency/d_concurrency.h" #include "mongo/db/concurrency/write_conflict_exception.h" @@ -352,14 +352,14 @@ TEST_F(DatabaseTest, RenameCollectionPreservesUuidOfSourceCollectionAndUpdatesUu auto fromUuid = UUID::gen(); - auto&& uuidCatalog = UUIDCatalog::get(opCtx); - ASSERT_EQUALS(boost::none, uuidCatalog.lookupNSSByUUID(fromUuid)); + auto&& catalog = CollectionCatalog::get(opCtx); + ASSERT_EQUALS(boost::none, catalog.lookupNSSByUUID(fromUuid)); WriteUnitOfWork wuow(opCtx); CollectionOptions fromCollectionOptions; fromCollectionOptions.uuid = fromUuid; ASSERT_TRUE(db->createCollection(opCtx, fromNss, fromCollectionOptions)); - ASSERT_EQUALS(fromNss, *uuidCatalog.lookupNSSByUUID(fromUuid)); + ASSERT_EQUALS(fromNss, *catalog.lookupNSSByUUID(fromUuid)); auto stayTemp = false; ASSERT_OK(db->renameCollection(opCtx, fromNss, toNss, stayTemp)); @@ -375,7 +375,7 @@ TEST_F(DatabaseTest, RenameCollectionPreservesUuidOfSourceCollectionAndUpdatesUu ASSERT_TRUE(toUuid); ASSERT_EQUALS(fromUuid, *toUuid); - ASSERT_EQUALS(toNss, *uuidCatalog.lookupNSSByUUID(*toUuid)); + ASSERT_EQUALS(toNss, *catalog.lookupNSSByUUID(*toUuid)); wuow.commit(); }); |