diff options
| author | Gregory Noma <gregory.noma@gmail.com> | 2022-02-11 14:54:48 +0000 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2022-02-11 15:32:28 +0000 |
| commit | 037b22172c54d5652298203077c16cc0ee7f26a1 (patch) | |
| tree | cd6628d5497f93bd74d617b79652593c5e1ca5e8 /src/mongo/db/catalog/collection_uuid_mismatch.cpp | |
| parent | 2d92ff7fe9a774746e5e34023256b71a5a95a722 (diff) | |
| download | mongo-037b22172c54d5652298203077c16cc0ee7f26a1.tar.gz | |
SERVER-62861 Use `null` instead of empty string for `actualNamespace` in `CollectionUUIDMismatch` error response
Diffstat (limited to 'src/mongo/db/catalog/collection_uuid_mismatch.cpp')
| -rw-r--r-- | src/mongo/db/catalog/collection_uuid_mismatch.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/mongo/db/catalog/collection_uuid_mismatch.cpp b/src/mongo/db/catalog/collection_uuid_mismatch.cpp index 1eb6d30c931..ad79a15f02e 100644 --- a/src/mongo/db/catalog/collection_uuid_mismatch.cpp +++ b/src/mongo/db/catalog/collection_uuid_mismatch.cpp @@ -49,11 +49,8 @@ void checkCollectionUUIDMismatch(OperationContext* opCtx, feature_flags::gCommandsAcceptCollectionUUID.isEnabled( serverGlobalParams.featureCompatibility)); - uassert((CollectionUUIDMismatchInfo{*uuid, - ns, - CollectionCatalog::get(opCtx) - ->lookupNSSByUUID(opCtx, *uuid) - .value_or(NamespaceString{})}), + uassert((CollectionUUIDMismatchInfo{ + *uuid, ns, CollectionCatalog::get(opCtx)->lookupNSSByUUID(opCtx, *uuid)}), "Collection UUID does not match that specified", coll && coll->uuid() == *uuid); } |