diff options
| author | Kyle Suarez <kyle.suarez@mongodb.com> | 2018-04-30 10:25:12 -0400 |
|---|---|---|
| committer | Kyle Suarez <kyle.suarez@mongodb.com> | 2018-04-30 11:14:59 -0400 |
| commit | a9b53ada0db65e6ee341260c3256e960bac56a94 (patch) | |
| tree | 17f359614f594c9427e982faa665578a05bd8728 /src/mongo/db/db_raii.cpp | |
| parent | 69b6d9846e3fae2fea9313757c7563b1061cf585 (diff) | |
| download | mongo-a9b53ada0db65e6ee341260c3256e960bac56a94.tar.gz | |
Revert "SERVER-32645 Create a shim helper framework."
This reverts commit 2227f272a7a0a3e43625cb2d4a2704e1ccb6f893.
Diffstat (limited to 'src/mongo/db/db_raii.cpp')
| -rw-r--r-- | src/mongo/db/db_raii.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/mongo/db/db_raii.cpp b/src/mongo/db/db_raii.cpp index 3ff4649584a..36c61edb4c9 100644 --- a/src/mongo/db/db_raii.cpp +++ b/src/mongo/db/db_raii.cpp @@ -269,8 +269,7 @@ AutoGetCollectionForReadCommand::AutoGetCollectionForReadCommand( } OldClientContext::OldClientContext(OperationContext* opCtx, const std::string& ns, bool doVersion) - : OldClientContext( - opCtx, ns, doVersion, DatabaseHolder::getDatabaseHolder().get(opCtx, ns), false) {} + : OldClientContext(opCtx, ns, doVersion, dbHolder().get(opCtx, ns), false) {} OldClientContext::OldClientContext( OperationContext* opCtx, const std::string& ns, bool doVersion, Database* db, bool justCreated) @@ -278,7 +277,7 @@ OldClientContext::OldClientContext( if (!_db) { const auto dbName = nsToDatabaseSubstring(ns); invariant(_opCtx->lockState()->isDbLockedForMode(dbName, MODE_X)); - _db = DatabaseHolder::getDatabaseHolder().openDb(_opCtx, dbName, &_justCreated); + _db = dbHolder().openDb(_opCtx, dbName, &_justCreated); invariant(_db); } |