diff options
| author | Geert Bosch <geert@mongodb.com> | 2019-04-29 14:11:12 -0400 |
|---|---|---|
| committer | Geert Bosch <geert@mongodb.com> | 2019-05-07 13:17:24 -0400 |
| commit | ab689c15777a5c2f7d35f602d125fdc7f2fb344c (patch) | |
| tree | f10a2d6bfad8cc009e722ed366e635dfecbb7ee1 /src/mongo/db/concurrency | |
| parent | 042f4e1f2164f3a801acfd379fafc217817b392c (diff) | |
| download | mongo-ab689c15777a5c2f7d35f602d125fdc7f2fb344c.tar.gz | |
SERVER-40892 Rename UUIDCatalog to CollectionCatalog
Diffstat (limited to 'src/mongo/db/concurrency')
| -rw-r--r-- | src/mongo/db/concurrency/SConscript | 2 | ||||
| -rw-r--r-- | src/mongo/db/concurrency/lock_manager.cpp | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/mongo/db/concurrency/SConscript b/src/mongo/db/concurrency/SConscript index f8e5c142eec..558dff39364 100644 --- a/src/mongo/db/concurrency/SConscript +++ b/src/mongo/db/concurrency/SConscript @@ -54,7 +54,7 @@ env.Library( '$BUILD_DIR/third_party/shim_boost', ], LIBDEPS_PRIVATE=[ - '$BUILD_DIR/mongo/db/catalog/uuid_catalog', + '$BUILD_DIR/mongo/db/catalog/collection_catalog', '$BUILD_DIR/mongo/db/concurrency/flow_control_ticketholder', ], ) diff --git a/src/mongo/db/concurrency/lock_manager.cpp b/src/mongo/db/concurrency/lock_manager.cpp index 6b80b3b9aca..e3c7fc77809 100644 --- a/src/mongo/db/concurrency/lock_manager.cpp +++ b/src/mongo/db/concurrency/lock_manager.cpp @@ -38,7 +38,7 @@ #include "mongo/base/static_assert.h" #include "mongo/bson/bsonobjbuilder.h" #include "mongo/config.h" -#include "mongo/db/catalog/uuid_catalog.h" +#include "mongo/db/catalog/collection_catalog.h" #include "mongo/db/concurrency/d_concurrency.h" #include "mongo/db/concurrency/locker.h" #include "mongo/util/assert_util.h" @@ -965,8 +965,8 @@ std::string ResourceId::toString() const { } if (getType() == RESOURCE_DATABASE || getType() == RESOURCE_COLLECTION) { - UUIDCatalog& uuidCatalog = UUIDCatalog::get(getGlobalServiceContext()); - boost::optional<std::string> resourceName = uuidCatalog.lookupResourceName(*this); + CollectionCatalog& catalog = CollectionCatalog::get(getGlobalServiceContext()); + boost::optional<std::string> resourceName = catalog.lookupResourceName(*this); if (resourceName) { ss << ", " << *resourceName; } |