diff options
| author | Gregory Wlodarek <gregory.wlodarek@mongodb.com> | 2019-05-06 13:27:10 -0400 |
|---|---|---|
| committer | Gregory Wlodarek <gregory.wlodarek@mongodb.com> | 2019-05-07 07:58:41 -0400 |
| commit | 28de51de6adb41ce4cdb678812d37b726ff3a3f9 (patch) | |
| tree | e4c0aa58ebf68ed9a097eb129a54a3f7d29c220d /src/mongo/db/repl/oplog.cpp | |
| parent | 400e0500147836ba11ab611bdac2675d65cb7b48 (diff) | |
| download | mongo-28de51de6adb41ce4cdb678812d37b726ff3a3f9.tar.gz | |
SERVER-40964 Change lookupNSSByUUID to return boost::optional<NamespaceString> instead of NamespaceString
Diffstat (limited to 'src/mongo/db/repl/oplog.cpp')
| -rw-r--r-- | src/mongo/db/repl/oplog.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
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<OptionalCollectionUUID, NamespaceString> parseCollModUUIDAndNss(Operat str::stream() << "Failed to apply operation due to missing collection (" << uuid << "): " << redact(cmd.toString()), - !nsByUUID.isEmpty()); - return std::pair<OptionalCollectionUUID, NamespaceString>(uuid, nsByUUID); + nsByUUID); + return std::pair<OptionalCollectionUUID, NamespaceString>(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, |