From 28de51de6adb41ce4cdb678812d37b726ff3a3f9 Mon Sep 17 00:00:00 2001 From: Gregory Wlodarek Date: Mon, 6 May 2019 13:27:10 -0400 Subject: SERVER-40964 Change lookupNSSByUUID to return boost::optional instead of NamespaceString --- src/mongo/db/repl/oplog.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'src/mongo/db/repl/oplog.cpp') diff --git a/src/mongo/db/repl/oplog.cpp b/src/mongo/db/repl/oplog.cpp index 1a7e90075e0..9aa26b0bfc6 100644 --- a/src/mongo/db/repl/oplog.cpp +++ b/src/mongo/db/repl/oplog.cpp @@ -801,8 +801,8 @@ std::pair parseCollModUUIDAndNss(Operat str::stream() << "Failed to apply operation due to missing collection (" << uuid << "): " << redact(cmd.toString()), - !nsByUUID.isEmpty()); - return std::pair(uuid, nsByUUID); + nsByUUID); + return std::pair(uuid, *nsByUUID); } NamespaceString parseUUID(OperationContext* opCtx, const BSONElement& ui) { @@ -811,9 +811,8 @@ NamespaceString parseUUID(OperationContext* opCtx, const BSONElement& ui) { auto uuid = statusWithUUID.getValue(); auto& catalog = UUIDCatalog::get(opCtx); auto nss = catalog.lookupNSSByUUID(uuid); - uassert( - ErrorCodes::NamespaceNotFound, "No namespace with UUID " + uuid.toString(), !nss.isEmpty()); - return nss; + uassert(ErrorCodes::NamespaceNotFound, "No namespace with UUID " + uuid.toString(), nss); + return *nss; } NamespaceString parseUUIDorNs(OperationContext* opCtx, -- cgit v1.2.1