Revert "SERVER-32645 Create a shim helper framework."

This reverts commit 2227f272a7a0a3e43625cb2d4a2704e1ccb6f893.

1 files changed, 3 insertions, 4 deletions

diff --git a/src/mongo/db/commands/dbcommands.cpp b/src/mongo/db/commands/dbcommands.cpp
index ed753c7392a..34e2ed22f5b 100644
--- a/src/mongo/db/commands/dbcommands.cpp
+++ b/src/mongo/db/commands/dbcommands.cpp
@@ -210,7 +210,7 @@ public:
 
         // Closing a database requires a global lock.
         Lock::GlobalWrite lk(opCtx);
-        auto db = DatabaseHolder::getDatabaseHolder().get(opCtx, dbname);
+        auto db = dbHolder().get(opCtx, dbname);
         if (db) {
             if (db->isDropPending(opCtx)) {
                 return CommandHelpers::appendCommandStatus(
@@ -221,8 +221,7 @@ public:
             }
         } else {
             // If the name doesn't make an exact match, check for a case insensitive match.
-            std::set<std::string> otherCasing =
-                DatabaseHolder::getDatabaseHolder().getNamesWithConflictingCasing(dbname);
+            std::set<std::string> otherCasing = dbHolder().getNamesWithConflictingCasing(dbname);
             if (otherCasing.empty()) {
                 // Database doesn't exist. Treat this as a success (historical behavior).
                 return true;
@@ -256,7 +255,7 @@ public:
             opCtx, engine, dbname, preserveClonedFilesOnFailure, backupOriginalFiles);
 
         // Open database before returning
-        DatabaseHolder::getDatabaseHolder().openDb(opCtx, dbname);
+        dbHolder().openDb(opCtx, dbname);
         return CommandHelpers::appendCommandStatus(result, status);
     }
 } cmdRepairDatabase;