SERVER-62918 Change DBLock to use DatabaseName

13 files changed, 27 insertions, 28 deletions

diff --git a/src/mongo/dbtests/catalogtests.cpp b/src/mongo/dbtests/catalogtests.cpp
index 685ff8e66db..929805a58a2 100644
--- a/src/mongo/dbtests/catalogtests.cpp
+++ b/src/mongo/dbtests/catalogtests.cpp
@@ -61,9 +61,9 @@ public:
         auto op1 = client1->makeOperationContext();
         auto op2 = client2->makeOperationContext();
 
-        Lock::DBLock dbLk1(op1.get(), competingNss.db(), LockMode::MODE_IX);
+        Lock::DBLock dbLk1(op1.get(), competingNss.dbName(), LockMode::MODE_IX);
         Lock::CollectionLock collLk1(op1.get(), competingNss, LockMode::MODE_IX);
-        Lock::DBLock dbLk2(op2.get(), competingNss.db(), LockMode::MODE_IX);
+        Lock::DBLock dbLk2(op2.get(), competingNss.dbName(), LockMode::MODE_IX);
         Lock::CollectionLock collLk2(op2.get(), competingNss, LockMode::MODE_IX);
 
         Database* db =
diff --git a/src/mongo/dbtests/counttests.cpp b/src/mongo/dbtests/counttests.cpp
index 3cdec3af294..3ce5d0ece06 100644
--- a/src/mongo/dbtests/counttests.cpp
+++ b/src/mongo/dbtests/counttests.cpp
@@ -42,10 +42,7 @@ namespace CountTests {
 
 class Base {
 public:
-    Base()
-        : _lk(&_opCtx, nsToDatabaseSubstring(ns()), MODE_X),
-          _context(&_opCtx, ns()),
-          _client(&_opCtx) {
+    Base() : _lk(&_opCtx, nss().dbName(), MODE_X), _context(&_opCtx, ns()), _client(&_opCtx) {
         _database = _context.db();
 
         {
diff --git a/src/mongo/dbtests/dbhelper_tests.cpp b/src/mongo/dbtests/dbhelper_tests.cpp
index b7cf3eeec93..5b4dfc552c7 100644
--- a/src/mongo/dbtests/dbhelper_tests.cpp
+++ b/src/mongo/dbtests/dbhelper_tests.cpp
@@ -124,10 +124,10 @@ public:
         opCtx1.get()->getServiceContext()->setOpObserver(std::move(registry));
         repl::createOplog(opCtx1.get());
 
-        Lock::DBLock dbLk1(opCtx1.get(), nss.db(), LockMode::MODE_IX);
+        Lock::DBLock dbLk1(opCtx1.get(), nss.dbName(), LockMode::MODE_IX);
         Lock::CollectionLock collLk1(opCtx1.get(), nss, LockMode::MODE_IX);
 
-        Lock::DBLock dbLk2(opCtx2.get(), nss.db(), LockMode::MODE_IX);
+        Lock::DBLock dbLk2(opCtx2.get(), nss.dbName(), LockMode::MODE_IX);
         Lock::CollectionLock collLk2(opCtx2.get(), nss, LockMode::MODE_IX);
 
         Database* db =
diff --git a/src/mongo/dbtests/indexcatalogtests.cpp b/src/mongo/dbtests/indexcatalogtests.cpp
index a0fac2327fc..b4876849c3a 100644
--- a/src/mongo/dbtests/indexcatalogtests.cpp
+++ b/src/mongo/dbtests/indexcatalogtests.cpp
@@ -59,7 +59,7 @@ public:
     IndexIteratorTests() {
         const ServiceContext::UniqueOperationContext opCtxPtr = cc().makeOperationContext();
         OperationContext& opCtx = *opCtxPtr;
-        Lock::DBLock lk(&opCtx, _nss.db(), MODE_X);
+        Lock::DBLock lk(&opCtx, _nss.dbName(), MODE_X);
         OldClientContext ctx(&opCtx, _nss.ns());
         WriteUnitOfWork wuow(&opCtx);
 
@@ -70,7 +70,7 @@ public:
     ~IndexIteratorTests() {
         const ServiceContext::UniqueOperationContext opCtxPtr = cc().makeOperationContext();
         OperationContext& opCtx = *opCtxPtr;
-        Lock::DBLock lk(&opCtx, _nss.db(), MODE_X);
+        Lock::DBLock lk(&opCtx, _nss.dbName(), MODE_X);
         OldClientContext ctx(&opCtx, _nss.ns());
         WriteUnitOfWork wuow(&opCtx);
 
@@ -117,7 +117,7 @@ public:
     IndexCatalogEntryDroppedTest() {
         const ServiceContext::UniqueOperationContext opCtxPtr = cc().makeOperationContext();
         OperationContext& opCtx = *opCtxPtr;
-        Lock::DBLock lk(&opCtx, _nss.db(), MODE_X);
+        Lock::DBLock lk(&opCtx, _nss.dbName(), MODE_X);
         OldClientContext ctx(&opCtx, _nss.ns());
         WriteUnitOfWork wuow(&opCtx);
 
@@ -163,7 +163,7 @@ public:
     RefreshEntry() {
         const ServiceContext::UniqueOperationContext opCtxPtr = cc().makeOperationContext();
         OperationContext& opCtx = *opCtxPtr;
-        Lock::DBLock lk(&opCtx, _nss.db(), MODE_X);
+        Lock::DBLock lk(&opCtx, _nss.dbName(), MODE_X);
         OldClientContext ctx(&opCtx, _nss.ns());
         WriteUnitOfWork wuow(&opCtx);
 
@@ -174,7 +174,7 @@ public:
     ~RefreshEntry() {
         const ServiceContext::UniqueOperationContext opCtxPtr = cc().makeOperationContext();
         OperationContext& opCtx = *opCtxPtr;
-        Lock::DBLock lk(&opCtx, _nss.db(), MODE_X);
+        Lock::DBLock lk(&opCtx, _nss.dbName(), MODE_X);
         OldClientContext ctx(&opCtx, _nss.ns());
         WriteUnitOfWork wuow(&opCtx);
 
diff --git a/src/mongo/dbtests/indexupdatetests.cpp b/src/mongo/dbtests/indexupdatetests.cpp
index ea7389acaee..be7a8dab483 100644
--- a/src/mongo/dbtests/indexupdatetests.cpp
+++ b/src/mongo/dbtests/indexupdatetests.cpp
@@ -328,7 +328,7 @@ public:
 };  // namespace IndexUpdateTests
 
 Status IndexBuildBase::createIndex(const BSONObj& indexSpec) {
-    Lock::DBLock dbLk(_opCtx, _nss.db(), MODE_IX);
+    Lock::DBLock dbLk(_opCtx, _nss.dbName(), MODE_IX);
     Lock::CollectionLock collLk(_opCtx, _nss, MODE_X);
 
     MultiIndexBlock indexer;
diff --git a/src/mongo/dbtests/query_stage_batched_delete.cpp b/src/mongo/dbtests/query_stage_batched_delete.cpp
index 10af5242fca..605c886d84d 100644
--- a/src/mongo/dbtests/query_stage_batched_delete.cpp
+++ b/src/mongo/dbtests/query_stage_batched_delete.cpp
@@ -331,7 +331,7 @@ TEST_F(QueryStageBatchedDeleteTest, BatchedDeleteStagedDocIsDeletedWriteConflict
         make_intrusive<ExpressionContext>(batchedDeleteOpCtx.get(), nullptr, nss);
 
     // Acquire locks for the batched delete.
-    Lock::DBLock dbLk1(batchedDeleteOpCtx.get(), nss.db(), LockMode::MODE_IX);
+    Lock::DBLock dbLk1(batchedDeleteOpCtx.get(), nss.dbName(), LockMode::MODE_IX);
     Lock::CollectionLock collLk1(batchedDeleteOpCtx.get(), nss, LockMode::MODE_IX);
 
     auto nDocs = 11;
@@ -460,7 +460,7 @@ TEST_F(QueryStageBatchedDeleteTest, BatchedDeleteStagedDocIsUpdatedToNotMatchCli
         make_intrusive<ExpressionContext>(batchedDeleteOpCtx.get(), nullptr, nss);
 
     // Acquire locks for the batched delete.
-    Lock::DBLock dbLk1(batchedDeleteOpCtx.get(), nss.db(), LockMode::MODE_IX);
+    Lock::DBLock dbLk1(batchedDeleteOpCtx.get(), nss.dbName(), LockMode::MODE_IX);
     Lock::CollectionLock collLk1(batchedDeleteOpCtx.get(), nss, LockMode::MODE_IX);
 
     auto nDocs = 11;
diff --git a/src/mongo/dbtests/query_stage_cached_plan.cpp b/src/mongo/dbtests/query_stage_cached_plan.cpp
index f459fe49b9d..5db53b05b8d 100644
--- a/src/mongo/dbtests/query_stage_cached_plan.cpp
+++ b/src/mongo/dbtests/query_stage_cached_plan.cpp
@@ -100,7 +100,7 @@ public:
     }
 
     void dropCollection() {
-        Lock::DBLock dbLock(&_opCtx, nss.db(), MODE_X);
+        Lock::DBLock dbLock(&_opCtx, nss.dbName(), MODE_X);
         auto databaseHolder = DatabaseHolder::get(&_opCtx);
         auto database = databaseHolder->getDb(&_opCtx, nss.dbName());
         if (!database) {
diff --git a/src/mongo/dbtests/query_stage_count.cpp b/src/mongo/dbtests/query_stage_count.cpp
index 275d9939a50..ddaf1dcca5c 100644
--- a/src/mongo/dbtests/query_stage_count.cpp
+++ b/src/mongo/dbtests/query_stage_count.cpp
@@ -58,7 +58,7 @@ const NamespaceString kTestNss = NamespaceString("db.dummy");
 class CountStageTest {
 public:
     CountStageTest()
-        : _dbLock(&_opCtx, nsToDatabaseSubstring(ns()), MODE_X),
+        : _dbLock(&_opCtx, nss().dbName(), MODE_X),
           _ctx(&_opCtx, ns()),
           _expCtx(make_intrusive<ExpressionContext>(&_opCtx, nullptr, kTestNss)),
           _coll(nullptr) {}
diff --git a/src/mongo/dbtests/query_stage_fetch.cpp b/src/mongo/dbtests/query_stage_fetch.cpp
index 7d09edc25a1..85fffb7f917 100644
--- a/src/mongo/dbtests/query_stage_fetch.cpp
+++ b/src/mongo/dbtests/query_stage_fetch.cpp
@@ -166,7 +166,7 @@ public:
 class FetchStageFilter : public QueryStageFetchBase {
 public:
     void run() {
-        Lock::DBLock lk(&_opCtx, nss().db(), MODE_X);
+        Lock::DBLock lk(&_opCtx, nss().dbName(), MODE_X);
         OldClientContext ctx(&_opCtx, ns());
         Database* db = ctx.db();
         CollectionPtr coll =
diff --git a/src/mongo/dbtests/query_stage_ixscan.cpp b/src/mongo/dbtests/query_stage_ixscan.cpp
index d8a2454b259..197dc45a7f3 100644
--- a/src/mongo/dbtests/query_stage_ixscan.cpp
+++ b/src/mongo/dbtests/query_stage_ixscan.cpp
@@ -47,7 +47,7 @@ const auto kIndexVersion = IndexDescriptor::IndexVersion::kV2;
 class IndexScanTest {
 public:
     IndexScanTest()
-        : _dbLock(&_opCtx, nsToDatabaseSubstring(ns()), MODE_X),
+        : _dbLock(&_opCtx, nss().dbName(), MODE_X),
           _ctx(&_opCtx, ns()),
           _coll(nullptr),
           _expCtx(make_intrusive<ExpressionContext>(&_opCtx, nullptr, nss())) {}
diff --git a/src/mongo/dbtests/querytests.cpp b/src/mongo/dbtests/querytests.cpp
index 24dca8deaed..13437626b2a 100644
--- a/src/mongo/dbtests/querytests.cpp
+++ b/src/mongo/dbtests/querytests.cpp
@@ -1827,7 +1827,9 @@ public:
 class CollectionInternalBase : public CollectionBase {
 public:
     CollectionInternalBase(const char* nsLeaf)
-        : CollectionBase(nsLeaf), _lk(&_opCtx, "unittests", MODE_X), _ctx(&_opCtx, ns()) {}
+        : CollectionBase(nsLeaf),
+          _lk(&_opCtx, DatabaseName(boost::none, "unittests"), MODE_X),
+          _ctx(&_opCtx, ns()) {}
 
 private:
     Lock::DBLock _lk;
diff --git a/src/mongo/dbtests/rollbacktests.cpp b/src/mongo/dbtests/rollbacktests.cpp
index 368f3d4884e..f639b05a722 100644
--- a/src/mongo/dbtests/rollbacktests.cpp
+++ b/src/mongo/dbtests/rollbacktests.cpp
@@ -67,7 +67,7 @@ bool collectionExists(OperationContext* opCtx, OldClientContext* ctx, const stri
 }
 
 void createCollection(OperationContext* opCtx, const NamespaceString& nss) {
-    Lock::DBLock dbXLock(opCtx, nss.db(), MODE_X);
+    Lock::DBLock dbXLock(opCtx, nss.dbName(), MODE_X);
     OldClientContext ctx(opCtx, nss.ns());
     {
         WriteUnitOfWork uow(opCtx);
@@ -169,7 +169,7 @@ public:
         NamespaceString nss(ns);
         dropDatabase(&opCtx, nss);
 
-        Lock::DBLock dbXLock(&opCtx, nss.db(), MODE_X);
+        Lock::DBLock dbXLock(&opCtx, nss.dbName(), MODE_X);
         OldClientContext ctx(&opCtx, ns);
         {
             WriteUnitOfWork uow(&opCtx);
@@ -206,7 +206,7 @@ public:
         NamespaceString nss(ns);
         dropDatabase(&opCtx, nss);
 
-        Lock::DBLock dbXLock(&opCtx, nss.db(), MODE_X);
+        Lock::DBLock dbXLock(&opCtx, nss.dbName(), MODE_X);
         OldClientContext ctx(&opCtx, ns);
         {
             WriteUnitOfWork uow(&opCtx);
@@ -377,7 +377,7 @@ public:
         OperationContext& opCtx = *opCtxPtr;
         dropDatabase(&opCtx, nss);
 
-        Lock::DBLock dbXLock(&opCtx, nss.db(), MODE_X);
+        Lock::DBLock dbXLock(&opCtx, nss.dbName(), MODE_X);
         OldClientContext ctx(&opCtx, nss.ns());
 
         BSONObj oldDoc = BSON("_id"
@@ -435,7 +435,7 @@ public:
         OperationContext& opCtx = *opCtxPtr;
         dropDatabase(&opCtx, nss);
 
-        Lock::DBLock dbXLock(&opCtx, nss.db(), MODE_X);
+        Lock::DBLock dbXLock(&opCtx, nss.dbName(), MODE_X);
         OldClientContext ctx(&opCtx, nss.ns());
 
         BSONObj doc = BSON("_id"
@@ -627,7 +627,7 @@ public:
         NamespaceString nss(ns);
         dropDatabase(&opCtx, nss);
 
-        Lock::DBLock dbXLock(&opCtx, nss.db(), MODE_X);
+        Lock::DBLock dbXLock(&opCtx, nss.dbName(), MODE_X);
         OldClientContext ctx(&opCtx, nss.ns());
 
         string idxNameA = "indexA";
diff --git a/src/mongo/dbtests/wildcard_multikey_persistence_test.cpp b/src/mongo/dbtests/wildcard_multikey_persistence_test.cpp
index 0f706367de3..a605123ec1b 100644
--- a/src/mongo/dbtests/wildcard_multikey_persistence_test.cpp
+++ b/src/mongo/dbtests/wildcard_multikey_persistence_test.cpp
@@ -203,7 +203,7 @@ protected:
 
         auto indexSpec = (bob << "v" << kIndexVersion << "background" << background).obj();
 
-        Lock::DBLock dbLock(opCtx(), nss.db(), MODE_X);
+        Lock::DBLock dbLock(opCtx(), nss.dbName(), MODE_X);
         AutoGetCollection autoColl(opCtx(), nss, MODE_X);
         CollectionWriter coll(opCtx(), autoColl);