diff options
| author | jannaerin <golden.janna@gmail.com> | 2022-06-27 15:38:12 +0000 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2022-06-27 16:42:48 +0000 |
| commit | ab5428c183b85d97c8c7016de4aefa34d055adcb (patch) | |
| tree | 52e8851aae3c3264949282413db5dd0ce6527dea /src/mongo/db/db_raii_test.cpp | |
| parent | 4fb1e801cc10f3cb588cc1867466267fd26366bf (diff) | |
| download | mongo-ab5428c183b85d97c8c7016de4aefa34d055adcb.tar.gz | |
SERVER-62918 Change DBLock to use DatabaseName
Diffstat (limited to 'src/mongo/db/db_raii_test.cpp')
| -rw-r--r-- | src/mongo/db/db_raii_test.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/mongo/db/db_raii_test.cpp b/src/mongo/db/db_raii_test.cpp index 905cba46446..4a8e8f8f361 100644 --- a/src/mongo/db/db_raii_test.cpp +++ b/src/mongo/db/db_raii_test.cpp @@ -114,7 +114,7 @@ void failsWithLockTimeout(std::function<void()> func, Milliseconds timeoutMillis } TEST_F(DBRAIITestFixture, AutoGetCollectionForReadCollLockDeadline) { - Lock::DBLock dbLock1(client1.second.get(), nss.db(), MODE_IX); + Lock::DBLock dbLock1(client1.second.get(), nss.dbName(), MODE_IX); ASSERT(client1.second->lockState()->isDbLockedForMode(nss.db(), MODE_IX)); Lock::CollectionLock collLock1(client1.second.get(), nss, MODE_X); ASSERT(client1.second->lockState()->isCollectionLockedForMode(nss, MODE_X)); @@ -129,7 +129,7 @@ TEST_F(DBRAIITestFixture, AutoGetCollectionForReadCollLockDeadline) { } TEST_F(DBRAIITestFixture, AutoGetCollectionForReadDBLockDeadline) { - Lock::DBLock dbLock1(client1.second.get(), nss.db(), MODE_X); + Lock::DBLock dbLock1(client1.second.get(), nss.dbName(), MODE_X); ASSERT(client1.second->lockState()->isDbLockedForMode(nss.db(), MODE_X)); failsWithLockTimeout( [&] { @@ -155,7 +155,7 @@ TEST_F(DBRAIITestFixture, AutoGetCollectionForReadGlobalLockDeadline) { } TEST_F(DBRAIITestFixture, AutoGetCollectionForReadDeadlineNow) { - Lock::DBLock dbLock1(client1.second.get(), nss.db(), MODE_IX); + Lock::DBLock dbLock1(client1.second.get(), nss.dbName(), MODE_IX); ASSERT(client1.second->lockState()->isDbLockedForMode(nss.db(), MODE_IX)); Lock::CollectionLock collLock1(client1.second.get(), nss, MODE_X); ASSERT(client1.second->lockState()->isCollectionLockedForMode(nss, MODE_X)); @@ -171,7 +171,7 @@ TEST_F(DBRAIITestFixture, AutoGetCollectionForReadDeadlineNow) { } TEST_F(DBRAIITestFixture, AutoGetCollectionForReadDeadlineMin) { - Lock::DBLock dbLock1(client1.second.get(), nss.db(), MODE_IX); + Lock::DBLock dbLock1(client1.second.get(), nss.dbName(), MODE_IX); ASSERT(client1.second->lockState()->isDbLockedForMode(nss.db(), MODE_IX)); Lock::CollectionLock collLock1(client1.second.get(), nss, MODE_X); ASSERT(client1.second->lockState()->isCollectionLockedForMode(nss, MODE_X)); @@ -185,7 +185,7 @@ TEST_F(DBRAIITestFixture, AutoGetCollectionForReadDeadlineMin) { } TEST_F(DBRAIITestFixture, AutoGetCollectionForReadDBLockCompatibleXNoCollection) { - Lock::DBLock dbLock1(client1.second.get(), nss.db(), MODE_IX); + Lock::DBLock dbLock1(client1.second.get(), nss.dbName(), MODE_IX); ASSERT(client1.second->lockState()->isDbLockedForMode(nss.db(), MODE_IX)); AutoGetCollectionForRead coll(client2.second.get(), nss); @@ -196,7 +196,7 @@ TEST_F(DBRAIITestFixture, AutoGetCollectionForReadDBLockCompatibleXCollectionExi ASSERT_OK( storageInterface()->createCollection(client1.second.get(), nss, defaultCollectionOptions)); - Lock::DBLock dbLock1(client1.second.get(), nss.db(), MODE_IX); + Lock::DBLock dbLock1(client1.second.get(), nss.dbName(), MODE_IX); ASSERT(client1.second->lockState()->isDbLockedForMode(nss.db(), MODE_IX)); AutoGetCollectionForRead coll(client2.second.get(), nss); @@ -207,7 +207,7 @@ TEST_F(DBRAIITestFixture, AutoGetCollectionForReadDBLockCompatibleXCollectionExi ASSERT_OK( storageInterface()->createCollection(client1.second.get(), nss, defaultCollectionOptions)); - Lock::DBLock dbLock1(client1.second.get(), nss.db(), MODE_IX); + Lock::DBLock dbLock1(client1.second.get(), nss.dbName(), MODE_IX); ASSERT(client1.second->lockState()->isDbLockedForMode(nss.db(), MODE_IX)); auto opCtx = client2.second.get(); opCtx->recoveryUnit()->setTimestampReadSource(RecoveryUnit::ReadSource::kProvided, @@ -224,7 +224,7 @@ TEST_F(DBRAIITestFixture, storageInterface()->createCollection(client1.second.get(), nss, defaultCollectionOptions)); ASSERT_OK(repl::ReplicationCoordinator::get(client1.second.get()) ->setFollowerMode(repl::MemberState::RS_SECONDARY)); - Lock::DBLock dbLock1(client1.second.get(), nss.db(), MODE_IX); + Lock::DBLock dbLock1(client1.second.get(), nss.dbName(), MODE_IX); ASSERT(client1.second->lockState()->isDbLockedForMode(nss.db(), MODE_IX)); // Simulate using a DBDirectClient to test this behavior for user reads. @@ -245,7 +245,7 @@ TEST_F(DBRAIITestFixture, auto snapshotManager = client1.second.get()->getServiceContext()->getStorageEngine()->getSnapshotManager(); snapshotManager->setLastApplied(replCoord->getMyLastAppliedOpTime().getTimestamp()); - Lock::DBLock dbLock1(client1.second.get(), nss.db(), MODE_IX); + Lock::DBLock dbLock1(client1.second.get(), nss.dbName(), MODE_IX); ASSERT(client1.second->lockState()->isDbLockedForMode(nss.db(), MODE_IX)); // Simulate using a DBDirectClient to test this behavior for user reads. @@ -274,7 +274,7 @@ TEST_F(DBRAIITestFixture, client1.second.get()->getServiceContext()->getStorageEngine()->getSnapshotManager(); snapshotManager->setLastApplied(opTime.getTimestamp()); - Lock::DBLock dbLock1(client1.second.get(), nss.db(), MODE_IX); + Lock::DBLock dbLock1(client1.second.get(), nss.dbName(), MODE_IX); ASSERT(client1.second->lockState()->isDbLockedForMode(nss.db(), MODE_IX)); // Simulate using a DBDirectClient to test this behavior for user reads. |