diff options
author | Xiangyu Yao <xiangyu.yao@mongodb.com> | 2019-04-08 10:46:00 -0400 |
---|---|---|
committer | Xiangyu Yao <xiangyu.yao@mongodb.com> | 2019-04-10 03:45:53 -0400 |
commit | 8cb23dbe2fac05ee28542fc24befc13c222ea006 (patch) | |
tree | 89d46ff18ff1c3aace4b9d190393264da27183e8 /src/mongo/dbtests | |
parent | 28a6425d9e773c3a0d6879f65b4e2ee47c96fd21 (diff) | |
download | mongo-8cb23dbe2fac05ee28542fc24befc13c222ea006.tar.gz |
SERVER-39515 Remove DatabaseCatalogEntry
Diffstat (limited to 'src/mongo/dbtests')
-rw-r--r-- | src/mongo/dbtests/rollbacktests.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/mongo/dbtests/rollbacktests.cpp b/src/mongo/dbtests/rollbacktests.cpp index 40809bea68c..d114992fb13 100644 --- a/src/mongo/dbtests/rollbacktests.cpp +++ b/src/mongo/dbtests/rollbacktests.cpp @@ -31,7 +31,6 @@ #include "mongo/bson/bsonobj.h" #include "mongo/db/catalog/collection.h" -#include "mongo/db/catalog/database_catalog_entry.h" #include "mongo/db/catalog/database_holder.h" #include "mongo/db/catalog/drop_collection.h" #include "mongo/db/catalog/head_manager.h" @@ -63,11 +62,12 @@ void dropDatabase(OperationContext* opCtx, const NamespaceString& nss) { } } bool collectionExists(OldClientContext* ctx, const string& ns) { - const DatabaseCatalogEntry* dbEntry = ctx->db()->getDatabaseCatalogEntry(); - list<string> names; - dbEntry->getCollectionNamespaces(&names); - return std::find(names.begin(), names.end(), ns) != names.end(); + auto nss = NamespaceString(ns); + std::vector<NamespaceString> collections = + UUIDCatalog::get(getGlobalServiceContext()).getAllCollectionNamesFromDb(nss.db()); + return std::count(collections.begin(), collections.end(), nss) > 0; } + void createCollection(OperationContext* opCtx, const NamespaceString& nss) { Lock::DBLock dbXLock(opCtx, nss.db(), MODE_X); OldClientContext ctx(opCtx, nss.ns()); |