diff options
author | Eliot Horowitz <eliot@10gen.com> | 2014-04-17 02:42:34 -0400 |
---|---|---|
committer | Eliot Horowitz <eliot@10gen.com> | 2014-04-17 13:14:04 -0400 |
commit | 92748f2572fd6492bfccd56e339b7255017d15ee (patch) | |
tree | b1b40e383042ca10fc52b72e678765bb22e67fcf /src/mongo/db/pipeline | |
parent | ce52f313ca52759d606886641f44541bd7baf5bd (diff) | |
download | mongo-92748f2572fd6492bfccd56e339b7255017d15ee.tar.gz |
SERVER-13084: remove many cc() calls from query/exec world
Diffstat (limited to 'src/mongo/db/pipeline')
-rw-r--r-- | src/mongo/db/pipeline/pipeline_d.cpp | 5 | ||||
-rw-r--r-- | src/mongo/db/pipeline/pipeline_d.h | 1 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/mongo/db/pipeline/pipeline_d.cpp b/src/mongo/db/pipeline/pipeline_d.cpp index 15615a4cbe5..73e011e7065 100644 --- a/src/mongo/db/pipeline/pipeline_d.cpp +++ b/src/mongo/db/pipeline/pipeline_d.cpp @@ -65,6 +65,7 @@ namespace { } boost::shared_ptr<Runner> PipelineD::prepareCursorSource( + Collection* collection, const intrusive_ptr<Pipeline>& pPipeline, const intrusive_ptr<ExpressionContext>& pExpCtx) { // get the full "namespace" name @@ -162,7 +163,7 @@ namespace { projectionForQuery, &cq); Runner* rawRunner; - if (status.isOK() && getRunner(cq, &rawRunner, runnerOptions).isOK()) { + if (status.isOK() && getRunner(collection, cq, &rawRunner, runnerOptions).isOK()) { // success: The Runner will handle sorting for us using an index. runner.reset(rawRunner); sortInRunner = true; @@ -186,7 +187,7 @@ namespace { &cq)); Runner* rawRunner; - uassertStatusOK(getRunner(cq, &rawRunner, runnerOptions)); + uassertStatusOK(getRunner(collection, cq, &rawRunner, runnerOptions)); runner.reset(rawRunner); } diff --git a/src/mongo/db/pipeline/pipeline_d.h b/src/mongo/db/pipeline/pipeline_d.h index 98ea7537be3..b6b34e6f378 100644 --- a/src/mongo/db/pipeline/pipeline_d.h +++ b/src/mongo/db/pipeline/pipeline_d.h @@ -71,6 +71,7 @@ namespace mongo { * @param pExpCtx the expression context for this pipeline */ static boost::shared_ptr<Runner> prepareCursorSource( + Collection* collection, const intrusive_ptr<Pipeline> &pPipeline, const intrusive_ptr<ExpressionContext> &pExpCtx); |