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/repl/apply_ops.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/repl/apply_ops.cpp')
| -rw-r--r-- | src/mongo/db/repl/apply_ops.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mongo/db/repl/apply_ops.cpp b/src/mongo/db/repl/apply_ops.cpp index 81ebf365c62..3a732c407ec 100644 --- a/src/mongo/db/repl/apply_ops.cpp +++ b/src/mongo/db/repl/apply_ops.cpp @@ -137,7 +137,7 @@ Status _applyOps(OperationContext* opCtx, invariant(opCtx->lockState()->isW()); invariant(*opType != 'c'); - auto db = DatabaseHolder::getDatabaseHolder().get(opCtx, nss.ns()); + auto db = dbHolder().get(opCtx, nss.ns()); if (!db) { // Retry in non-atomic mode, since MMAP cannot implicitly create a new database // within an active WriteUnitOfWork. @@ -339,7 +339,7 @@ Status _checkPrecondition(OperationContext* opCtx, BSONObj realres = db.findOne(nss.ns(), preCondition["q"].Obj()); // Get collection default collation. - Database* database = DatabaseHolder::getDatabaseHolder().get(opCtx, nss.db()); + Database* database = dbHolder().get(opCtx, nss.db()); if (!database) { return {ErrorCodes::NamespaceNotFound, "database in ns does not exist: " + nss.ns()}; } |