SERVER-72948 Change DBClient runCommand function to use DatabaseName object

3 files changed, 29 insertions, 31 deletions

diff --git a/src/mongo/db/session/sessions_collection.cpp b/src/mongo/db/session/sessions_collection.cpp
index 4fc79189206..78492298140 100644
--- a/src/mongo/db/session/sessions_collection.cpp
+++ b/src/mongo/db/session/sessions_collection.cpp
@@ -156,7 +156,7 @@ SessionsCollection::SendBatchFn SessionsCollection::makeSendFnForBatchWrite(
     const NamespaceString& ns, DBClientBase* client) {
     auto send = [client, ns](BSONObj batch) {
         BSONObj res;
-        if (!client->runCommand(ns.db().toString(), batch, res)) {
+        if (!client->runCommand(ns.dbName(), batch, res)) {
             uassertStatusOK(getStatusFromCommandResult(res));
         }
     };
@@ -168,7 +168,7 @@ SessionsCollection::SendBatchFn SessionsCollection::makeSendFnForCommand(const N
                                                                          DBClientBase* client) {
     auto send = [client, ns](BSONObj cmd) {
         BSONObj res;
-        if (!client->runCommand(ns.db().toString(), cmd, res)) {
+        if (!client->runCommand(ns.dbName(), cmd, res)) {
             uassertStatusOK(getStatusFromCommandResult(res));
         }
     };
@@ -180,7 +180,7 @@ SessionsCollection::FindBatchFn SessionsCollection::makeFindFnForCommand(const N
                                                                          DBClientBase* client) {
     auto send = [client, ns](BSONObj cmd) -> BSONObj {
         BSONObj res;
-        if (!client->runCommand(ns.db().toString(), cmd, res)) {
+        if (!client->runCommand(ns.dbName(), cmd, res)) {
             uassertStatusOK(getStatusFromCommandResult(res));
         }
 
diff --git a/src/mongo/db/session/sessions_collection_rs.cpp b/src/mongo/db/session/sessions_collection_rs.cpp
index 865f0b825e9..5483466eaa7 100644
--- a/src/mongo/db/session/sessions_collection_rs.cpp
+++ b/src/mongo/db/session/sessions_collection_rs.cpp
@@ -117,32 +117,31 @@ auto SessionsCollectionRS::_dispatch(const NamespaceString& ns,
 }
 
 void SessionsCollectionRS::setupSessionsCollection(OperationContext* opCtx) {
-    _dispatch(
-        NamespaceString::kLogicalSessionsNamespace,
-        opCtx,
-        [&] {
-            try {
-                checkSessionsCollectionExists(opCtx);
-            } catch (const DBException& ex) {
-
-                DBDirectClient client(opCtx);
-                BSONObj cmd;
-
-                if (ex.code() == ErrorCodes::IndexOptionsConflict) {
-                    cmd = generateCollModCmd();
-                } else {
-                    // Creating the TTL index will auto-generate the collection.
-                    cmd = generateCreateIndexesCmd();
-                }
-
-                BSONObj info;
-                if (!client.runCommand(
-                        NamespaceString::kLogicalSessionsNamespace.db().toString(), cmd, info)) {
-                    uassertStatusOK(getStatusFromCommandResult(info));
-                }
-            }
-        },
-        [&](DBClientBase*) { checkSessionsCollectionExists(opCtx); });
+    _dispatch(NamespaceString::kLogicalSessionsNamespace,
+              opCtx,
+              [&] {
+                  try {
+                      checkSessionsCollectionExists(opCtx);
+                  } catch (const DBException& ex) {
+
+                      DBDirectClient client(opCtx);
+                      BSONObj cmd;
+
+                      if (ex.code() == ErrorCodes::IndexOptionsConflict) {
+                          cmd = generateCollModCmd();
+                      } else {
+                          // Creating the TTL index will auto-generate the collection.
+                          cmd = generateCreateIndexesCmd();
+                      }
+
+                      BSONObj info;
+                      if (!client.runCommand(
+                              NamespaceString::kLogicalSessionsNamespace.dbName(), cmd, info)) {
+                          uassertStatusOK(getStatusFromCommandResult(info));
+                      }
+                  }
+              },
+              [&](DBClientBase*) { checkSessionsCollectionExists(opCtx); });
 }
 
 void SessionsCollectionRS::checkSessionsCollectionExists(OperationContext* opCtx) {
diff --git a/src/mongo/db/session/sessions_collection_standalone.cpp b/src/mongo/db/session/sessions_collection_standalone.cpp
index 94fb61cfc75..ef63bd4b2e0 100644
--- a/src/mongo/db/session/sessions_collection_standalone.cpp
+++ b/src/mongo/db/session/sessions_collection_standalone.cpp
@@ -59,8 +59,7 @@ void SessionsCollectionStandalone::setupSessionsCollection(OperationContext* opC
         }
 
         BSONObj info;
-        if (!client.runCommand(
-                NamespaceString::kLogicalSessionsNamespace.db().toString(), cmd, info)) {
+        if (!client.runCommand(NamespaceString::kLogicalSessionsNamespace.dbName(), cmd, info)) {
             uassertStatusOKWithContext(getStatusFromCommandResult(info),
                                        str::stream() << "Failed to create "
                                                      << NamespaceString::kLogicalSessionsNamespace);