diff options
author | Geert Bosch <geert@mongodb.com> | 2019-04-16 17:33:20 -0400 |
---|---|---|
committer | Geert Bosch <geert@mongodb.com> | 2019-04-17 15:40:11 -0400 |
commit | e0cafae280e508ef887bd08978dcbc5630c08a34 (patch) | |
tree | 225fea823d49fcbe836a0f64d3afdfd7573ebfc5 /src/mongo/db/concurrency/d_concurrency_test.cpp | |
parent | bf774fb0a5e9bed81bc475585deb70812a2c9c41 (diff) | |
download | mongo-e0cafae280e508ef887bd08978dcbc5630c08a34.tar.gz |
SERVER-40688 Make CollectionLock take NamespaceString
Diffstat (limited to 'src/mongo/db/concurrency/d_concurrency_test.cpp')
-rw-r--r-- | src/mongo/db/concurrency/d_concurrency_test.cpp | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/src/mongo/db/concurrency/d_concurrency_test.cpp b/src/mongo/db/concurrency/d_concurrency_test.cpp index 7e2b70472bd..cbe7d62bf35 100644 --- a/src/mongo/db/concurrency/d_concurrency_test.cpp +++ b/src/mongo/db/concurrency/d_concurrency_test.cpp @@ -1176,7 +1176,7 @@ TEST_F(DConcurrencyTestFixture, IsCollectionLocked_DB_Locked_IS) { Lock::DBLock dbLock(opCtx.get(), "db1", MODE_IS); { - Lock::CollectionLock collLock(opCtx.get(), ns.ns(), MODE_IS); + Lock::CollectionLock collLock(opCtx.get(), ns, MODE_IS); ASSERT(lockState->isCollectionLockedForMode(ns, MODE_IS)); ASSERT(!lockState->isCollectionLockedForMode(ns, MODE_IX)); @@ -1188,7 +1188,7 @@ TEST_F(DConcurrencyTestFixture, IsCollectionLocked_DB_Locked_IS) { } { - Lock::CollectionLock collLock(opCtx.get(), ns.ns(), MODE_S); + Lock::CollectionLock collLock(opCtx.get(), ns, MODE_S); ASSERT(lockState->isCollectionLockedForMode(ns, MODE_IS)); ASSERT(!lockState->isCollectionLockedForMode(ns, MODE_IX)); @@ -1207,7 +1207,7 @@ TEST_F(DConcurrencyTestFixture, IsCollectionLocked_DB_Locked_IX) { Lock::DBLock dbLock(opCtx.get(), "db1", MODE_IX); { - Lock::CollectionLock collLock(opCtx.get(), ns.ns(), MODE_IX); + Lock::CollectionLock collLock(opCtx.get(), ns, MODE_IX); // TODO: This is TRUE because Lock::CollectionLock converts IX lock to X ASSERT(lockState->isCollectionLockedForMode(ns, MODE_IS)); @@ -1218,7 +1218,7 @@ TEST_F(DConcurrencyTestFixture, IsCollectionLocked_DB_Locked_IX) { } { - Lock::CollectionLock collLock(opCtx.get(), ns.ns(), MODE_X); + Lock::CollectionLock collLock(opCtx.get(), ns, MODE_X); ASSERT(lockState->isCollectionLockedForMode(ns, MODE_IS)); ASSERT(lockState->isCollectionLockedForMode(ns, MODE_IX)); @@ -1749,7 +1749,7 @@ TEST_F(DConcurrencyTestFixture, CollectionLockInInterruptedContextThrowsEvenWhen { boost::optional<Lock::CollectionLock> collLock; - ASSERT_THROWS_CODE(collLock.emplace(opCtx, "db.coll", MODE_IX), + ASSERT_THROWS_CODE(collLock.emplace(opCtx, NamespaceString("db.coll"), MODE_IX), AssertionException, ErrorCodes::Interrupted); } @@ -1761,13 +1761,13 @@ TEST_F(DConcurrencyTestFixture, auto opCtx = clients[0].second.get(); Lock::DBLock dbLock(opCtx, "db", MODE_IX); - Lock::CollectionLock collLock(opCtx, "db.coll", MODE_IX); + Lock::CollectionLock collLock(opCtx, NamespaceString("db.coll"), MODE_IX); opCtx->markKilled(); { boost::optional<Lock::CollectionLock> recursiveCollLock; - ASSERT_THROWS_CODE(recursiveCollLock.emplace(opCtx, "db.coll", MODE_X), + ASSERT_THROWS_CODE(recursiveCollLock.emplace(opCtx, NamespaceString("db.coll"), MODE_X), AssertionException, ErrorCodes::Interrupted); } @@ -1782,7 +1782,7 @@ TEST_F(DConcurrencyTestFixture, CollectionLockInInterruptedContextRespectsUninte opCtx->markKilled(); UninterruptibleLockGuard noInterrupt(opCtx->lockState()); - Lock::CollectionLock collLock(opCtx, "db.coll", MODE_IX); // Does not throw. + Lock::CollectionLock collLock(opCtx, NamespaceString("db.coll"), MODE_IX); // Does not throw. } TEST_F(DConcurrencyTestFixture, CollectionLockTimeout) { @@ -1794,14 +1794,15 @@ TEST_F(DConcurrencyTestFixture, CollectionLockTimeout) { Lock::DBLock DBL1(opctx1, "testdb"_sd, MODE_IX, Date_t::max()); ASSERT(opctx1->lockState()->isDbLockedForMode("testdb"_sd, MODE_IX)); - Lock::CollectionLock CL1(opctx1, "testdb.test"_sd, MODE_X, Date_t::max()); + Lock::CollectionLock CL1(opctx1, NamespaceString("testdb.test"), MODE_X, Date_t::max()); ASSERT(opctx1->lockState()->isCollectionLockedForMode(NamespaceString("testdb.test"), MODE_X)); Date_t t1 = Date_t::now(); Lock::DBLock DBL2(opctx2, "testdb"_sd, MODE_IX, Date_t::max()); ASSERT(opctx2->lockState()->isDbLockedForMode("testdb"_sd, MODE_IX)); ASSERT_THROWS_CODE( - Lock::CollectionLock(opctx2, "testdb.test"_sd, MODE_X, Date_t::now() + timeoutMillis), + Lock::CollectionLock( + opctx2, NamespaceString("testdb.test"), MODE_X, Date_t::now() + timeoutMillis), AssertionException, ErrorCodes::LockTimeout); Date_t t2 = Date_t::now(); |