SERVER-47635 do not import indexbuildentryhelpers namespace into index_builds_coordinator.cpp and index_builds_coordinator_mongod.cpp

(cherry picked from commit e2ccbbd922d42fc0f68608816c9a1265c6c87409)

2 files changed, 10 insertions, 12 deletions

diff --git a/src/mongo/db/index_builds_coordinator.cpp b/src/mongo/db/index_builds_coordinator.cpp
index bbceb78bdd2..f302b4ab125 100644
--- a/src/mongo/db/index_builds_coordinator.cpp
+++ b/src/mongo/db/index_builds_coordinator.cpp
@@ -64,8 +64,6 @@
 
 namespace mongo {
 
-using namespace indexbuildentryhelpers;
-
 MONGO_FAIL_POINT_DEFINE(hangAfterIndexBuildFirstDrain);
 MONGO_FAIL_POINT_DEFINE(hangAfterIndexBuildSecondDrain);
 MONGO_FAIL_POINT_DEFINE(hangAfterIndexBuildDumpsInsertsFromBulk);
@@ -1169,7 +1167,7 @@ void IndexBuildsCoordinator::onStepUp(OperationContext* opCtx) {
 
     // This would create an empty table even for FCV 4.2 to handle case where a primary node started
     // with FCV 4.2, and then upgraded FCV 4.4.
-    ensureIndexBuildEntriesNamespaceExists(opCtx);
+    indexbuildentryhelpers::ensureIndexBuildEntriesNamespaceExists(opCtx);
 
     auto indexBuilds = _getIndexBuilds();
     auto onIndexBuild = [this, opCtx](std::shared_ptr<ReplIndexBuildState> replState) {
@@ -1683,7 +1681,7 @@ IndexBuildsCoordinator::PostSetupAction IndexBuildsCoordinator::_setUpIndexBuild
                                             replState->collectionUUID,
                                             indexBuildOptions.commitQuorum.get(),
                                             replState->indexNames);
-            uassertStatusOK(addIndexBuildEntry(opCtx, indexBuildEntry));
+            uassertStatusOK(indexbuildentryhelpers::addIndexBuildEntry(opCtx, indexBuildEntry));
 
             opCtx->getServiceContext()->getOpObserver()->onStartIndexBuild(
                 opCtx,
diff --git a/src/mongo/db/index_builds_coordinator_mongod.cpp b/src/mongo/db/index_builds_coordinator_mongod.cpp
index e529f6d581f..8cd5bb21831 100644
--- a/src/mongo/db/index_builds_coordinator_mongod.cpp
+++ b/src/mongo/db/index_builds_coordinator_mongod.cpp
@@ -55,8 +55,6 @@
 
 namespace mongo {
 
-using namespace indexbuildentryhelpers;
-
 namespace {
 
 MONGO_FAIL_POINT_DEFINE(hangBeforeInitializingIndexBuild);
@@ -336,7 +334,7 @@ Status IndexBuildsCoordinatorMongod::voteCommitIndexBuild(OperationContext* opCt
         // Secondary nodes will always try to vote regardless of the commit quorum value. If the
         // commit quorum is disabled, do not record their entry into the commit ready nodes.
         Lock::SharedLock commitQuorumLk(opCtx->lockState(), replState->commitQuorumLock.get());
-        auto commitQuorum = invariant(getCommitQuorum(opCtx, buildUUID));
+        auto commitQuorum = invariant(indexbuildentryhelpers::getCommitQuorum(opCtx, buildUUID));
         if (commitQuorum.numNodes == CommitQuorumOptions::kDisabled) {
             return Status::OK();
         }
@@ -357,7 +355,7 @@ Status IndexBuildsCoordinatorMongod::voteCommitIndexBuild(OperationContext* opCt
     {
         // Upserts doesn't need to acquire pbwm lock.
         ShouldNotConflictWithSecondaryBatchApplicationBlock noPBWMBlock(opCtx->lockState());
-        upsertStatus = persistCommitReadyMemberInfo(opCtx, indexbuildEntry);
+        upsertStatus = indexbuildentryhelpers::persistCommitReadyMemberInfo(opCtx, indexbuildEntry);
     }
 
     if (upsertStatus.isOK()) {
@@ -410,7 +408,8 @@ void IndexBuildsCoordinatorMongod::_signalIfCommitQuorumIsSatisfied(
     Lock::SharedLock commitQuorumLk(opCtx->lockState(), replState->commitQuorumLock.get());
 
     // Read the index builds entry from config.system.indexBuilds collection.
-    auto swIndexBuildEntry = getIndexBuildEntry(opCtx, replState->buildUUID);
+    auto swIndexBuildEntry =
+        indexbuildentryhelpers::getIndexBuildEntry(opCtx, replState->buildUUID);
     auto indexBuildEntry = invariantStatusOK(swIndexBuildEntry);
 
     auto voteMemberList = indexBuildEntry.getCommitReadyMembers();
@@ -471,7 +470,7 @@ bool IndexBuildsCoordinatorMongod::_signalIfCommitQuorumNotEnabled(
     Lock::SharedLock commitQuorumLk(opCtx->lockState(), replState->commitQuorumLock.get());
 
     // Read the commit quorum value from config.system.indexBuilds collection.
-    auto swCommitQuorum = getCommitQuorum(opCtx, replState->buildUUID);
+    auto swCommitQuorum = indexbuildentryhelpers::getCommitQuorum(opCtx, replState->buildUUID);
     auto commitQuorum = invariantStatusOK(swCommitQuorum);
 
     // Check if the commit quorum is disabled for the index build.
@@ -791,7 +790,8 @@ Status IndexBuildsCoordinatorMongod::setCommitQuorum(OperationContext* opCtx,
     }
 
     // Read the index builds entry from config.system.indexBuilds collection.
-    auto swOnDiskCommitQuorum = getCommitQuorum(opCtx, replState->buildUUID);
+    auto swOnDiskCommitQuorum =
+        indexbuildentryhelpers::getCommitQuorum(opCtx, replState->buildUUID);
     // Index build has not yet started.
     if (swOnDiskCommitQuorum == ErrorCodes::NoMatchingDocument) {
         return Status(ErrorCodes::IndexNotFound,
@@ -827,7 +827,7 @@ Status IndexBuildsCoordinatorMongod::setCommitQuorum(OperationContext* opCtx,
 
     IndexBuildEntry indexbuildEntry(
         replState->buildUUID, replState->collectionUUID, newCommitQuorum, replState->indexNames);
-    status = persistIndexCommitQuorum(opCtx, indexbuildEntry);
+    status = indexbuildentryhelpers::persistIndexCommitQuorum(opCtx, indexbuildEntry);
 
     {
         // Check to see the index build hasn't received commit index build signal while updating