diff options
| author | jannaerin <golden.janna@gmail.com> | 2022-07-27 20:23:30 +0000 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2022-07-27 22:45:03 +0000 |
| commit | 586135f8159f72b2f42b1cbd96c93fbfbc84c13b (patch) | |
| tree | 0622269bfa1b3e279b3cb98ffef92128802840ee /src/mongo/db/concurrency/lock_state.cpp | |
| parent | 04a4548a4a3a819ea62f7930a5fe8d32f3ec0f75 (diff) | |
| download | mongo-586135f8159f72b2f42b1cbd96c93fbfbc84c13b.tar.gz | |
SERVER-67994 Add ResourceId constructors that take NamespaceString and DatabaseName as parameters
Diffstat (limited to 'src/mongo/db/concurrency/lock_state.cpp')
| -rw-r--r-- | src/mongo/db/concurrency/lock_state.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mongo/db/concurrency/lock_state.cpp b/src/mongo/db/concurrency/lock_state.cpp index 8d78ae48581..24d95dc0355 100644 --- a/src/mongo/db/concurrency/lock_state.cpp +++ b/src/mongo/db/concurrency/lock_state.cpp @@ -633,7 +633,7 @@ bool LockerImpl::isDbLockedForMode(const DatabaseName& dbName, LockMode mode) co if (isR() && isSharedLockMode(mode)) return true; - const ResourceId resIdDb(RESOURCE_DATABASE, dbName.toStringWithTenantId()); + const ResourceId resIdDb(RESOURCE_DATABASE, dbName); return isLockHeldForMode(resIdDb, mode); } @@ -645,7 +645,7 @@ bool LockerImpl::isCollectionLockedForMode(const NamespaceString& nss, LockMode if (isR() && isSharedLockMode(mode)) return true; - const ResourceId resIdDb(RESOURCE_DATABASE, nss.dbName().toStringWithTenantId()); + const ResourceId resIdDb(RESOURCE_DATABASE, nss.dbName()); LockMode dbMode = getLockMode(resIdDb); if (!shouldConflictWithSecondaryBatchApplication()) @@ -660,7 +660,7 @@ bool LockerImpl::isCollectionLockedForMode(const NamespaceString& nss, LockMode return isSharedLockMode(mode); case MODE_IX: case MODE_IS: { - const ResourceId resIdColl(RESOURCE_COLLECTION, nss.ns()); + const ResourceId resIdColl(RESOURCE_COLLECTION, nss); return isLockHeldForMode(resIdColl, mode); } break; case LockModesCount: |