diff options
| author | Mathias Stearn <mathias@10gen.com> | 2014-05-16 14:05:22 -0400 |
|---|---|---|
| committer | Mathias Stearn <mathias@10gen.com> | 2014-05-20 19:02:25 -0400 |
| commit | dbe6f0a60f5cef69eb02ab3d97fc4db208aa6190 (patch) | |
| tree | f6b715cb725f6f87c02ca2f9902cafc046e6338e /src/mongo/dbtests/pipelinetests.cpp | |
| parent | e15c084245fcd1262c55b6c8bc7e0bc979d302ec (diff) | |
| download | mongo-dbe6f0a60f5cef69eb02ab3d97fc4db208aa6190.tar.gz | |
SERVER-13641 Replace InterruptStatus with OperationContext in agg
Diffstat (limited to 'src/mongo/dbtests/pipelinetests.cpp')
| -rw-r--r-- | src/mongo/dbtests/pipelinetests.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/mongo/dbtests/pipelinetests.cpp b/src/mongo/dbtests/pipelinetests.cpp index e88b80912a8..4d68d40611d 100644 --- a/src/mongo/dbtests/pipelinetests.cpp +++ b/src/mongo/dbtests/pipelinetests.cpp @@ -30,12 +30,11 @@ #include "mongo/pch.h" -#include "mongo/db/interrupt_status.h" -#include "mongo/db/interrupt_status_mongod.h" #include "mongo/db/pipeline/document.h" #include "mongo/db/pipeline/expression_context.h" #include "mongo/db/pipeline/field_path.h" #include "mongo/db/pipeline/pipeline.h" +#include "mongo/db/operation_context_impl.h" #include "mongo/dbtests/dbtests.h" namespace PipelineTests { @@ -252,8 +251,7 @@ namespace PipelineTests { const BSONObj mergePipeExpected = pipelineFromJsonArray(mergePipeJson()); intrusive_ptr<ExpressionContext> ctx = - new ExpressionContext(InterruptStatusMongod::status, - NamespaceString("a.collection")); + new ExpressionContext(&_opCtx, NamespaceString("a.collection")); string errmsg; intrusive_ptr<Pipeline> mergePipe = Pipeline::parseCommand(errmsg, inputBson, ctx); @@ -270,6 +268,9 @@ namespace PipelineTests { } virtual ~Base() {}; + + private: + OperationContextImpl _opCtx; }; // General test to make sure all optimizations support empty pipelines |