diff options
| author | Daniel Gómez Ferro <daniel.gomezferro@mongodb.com> | 2021-11-26 14:39:47 +0000 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2021-12-02 09:08:59 +0000 |
| commit | a51938f6f77a6c4934c0cc91bca31cebb6af62e5 (patch) | |
| tree | c6ad3f87cc216930c8707fdb9c7d3d2cfaf084cb /src/mongo/db/storage/durable_catalog_impl.cpp | |
| parent | c5f47b7a04ce688b088c1373805e876b0debae66 (diff) | |
| download | mongo-a51938f6f77a6c4934c0cc91bca31cebb6af62e5.tar.gz | |
SERVER-60837 Remove CollectionUUID and OptionalCollectionUUID aliases
Diffstat (limited to 'src/mongo/db/storage/durable_catalog_impl.cpp')
| -rw-r--r-- | src/mongo/db/storage/durable_catalog_impl.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mongo/db/storage/durable_catalog_impl.cpp b/src/mongo/db/storage/durable_catalog_impl.cpp index 6d2b3535f6d..bfb9aa8b009 100644 --- a/src/mongo/db/storage/durable_catalog_impl.cpp +++ b/src/mongo/db/storage/durable_catalog_impl.cpp @@ -599,7 +599,7 @@ StatusWith<std::string> DurableCatalogImpl::newOrphanedIdent(OperationContext* o // Generate a new UUID for the orphaned collection. CollectionOptions optionsWithUUID; - optionsWithUUID.uuid.emplace(CollectionUUID::gen()); + optionsWithUUID.uuid.emplace(UUID::gen()); BSONObj obj; { BSONObjBuilder b; @@ -661,7 +661,7 @@ StatusWith<std::pair<RecordId, std::unique_ptr<RecordStore>>> DurableCatalogImpl return status; auto ru = opCtx->recoveryUnit(); - CollectionUUID uuid = options.uuid.get(); + UUID uuid = options.uuid.get(); opCtx->recoveryUnit()->onRollback([ru, catalog = this, nss, ident = entry.ident, uuid]() { // Intentionally ignoring failure catalog->_engine->getEngine()->dropIdent(ru, ident).ignore(); @@ -716,7 +716,7 @@ StatusWith<DurableCatalog::ImportResult> DurableCatalogImpl::importCollection( const auto& catalogEntry = [&] { if (uuidOption == ImportCollectionUUIDOption::kGenerateNew) { // Generate a new UUID for the collection. - md.options.uuid = CollectionUUID::gen(); + md.options.uuid = UUID::gen(); BSONObjBuilder catalogEntryBuilder; // Generate a new "md" field after setting the new UUID. catalogEntryBuilder.append("md", md.toBSON()); |