diff options
| author | Eric Milkie <milkie@10gen.com> | 2016-04-19 08:28:56 -0400 |
|---|---|---|
| committer | Eric Milkie <milkie@10gen.com> | 2016-04-19 08:28:56 -0400 |
| commit | 35ea899074d1bf93e78177cac1155b4471cbaa7d (patch) | |
| tree | fce52bf3d3b3fcd270d33ab228babf6ea6602e22 /src/mongo/dbtests/query_stage_subplan.cpp | |
| parent | 0ab34aa7b9c3c48ea6cf17888620fca455284d35 (diff) | |
| download | mongo-35ea899074d1bf93e78177cac1155b4471cbaa7d.tar.gz | |
Revert "SERVER-23779 Replace direct instantiation of OperationContextImpl with cc().makeOperationContext()."
This reverts commit 0ab34aa7b9c3c48ea6cf17888620fca455284d35.
Diffstat (limited to 'src/mongo/dbtests/query_stage_subplan.cpp')
| -rw-r--r-- | src/mongo/dbtests/query_stage_subplan.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/mongo/dbtests/query_stage_subplan.cpp b/src/mongo/dbtests/query_stage_subplan.cpp index a5253a5ee94..7a61f48a873 100644 --- a/src/mongo/dbtests/query_stage_subplan.cpp +++ b/src/mongo/dbtests/query_stage_subplan.cpp @@ -32,7 +32,6 @@ #include "mongo/db/catalog/collection.h" #include "mongo/db/catalog/database.h" -#include "mongo/db/client.h" #include "mongo/db/db_raii.h" #include "mongo/db/dbdirectclient.h" #include "mongo/db/exec/subplan.h" @@ -40,6 +39,7 @@ #include "mongo/db/json.h" #include "mongo/db/matcher/extensions_callback_disallow_extensions.h" #include "mongo/db/matcher/extensions_callback_noop.h" +#include "mongo/db/operation_context_impl.h" #include "mongo/db/query/canonical_query.h" #include "mongo/db/query/get_executor.h" #include "mongo/dbtests/dbtests.h" @@ -81,8 +81,7 @@ protected: return cq; } - const ServiceContext::UniqueOperationContext _txnPtr = cc().makeOperationContext(); - OperationContext& _txn = *_txnPtr; + OperationContextImpl _txn; private: DBDirectClient _client; |