summaryrefslogtreecommitdiff
path: root/src/mongo/db/commands/pipeline_command.cpp
diff options
context:
space:
mode:
authorDavid Storch <david.storch@10gen.com>2014-07-29 13:58:50 -0400
committerDavid Storch <david.storch@10gen.com>2014-07-29 17:16:37 -0400
commit1488bc89c42c6a39c5fdbd2b0c2b15e3abbb4108 (patch)
treea770bc9c7b17fdeb26b66115bb98cf7ca99372a0 /src/mongo/db/commands/pipeline_command.cpp
parent81676bfa36c68b1247f0e08b666e33c3e3875755 (diff)
downloadmongo-1488bc89c42c6a39c5fdbd2b0c2b15e3abbb4108.tar.gz
SERVER-14633 rename prepareToYield() and recoverFromYield() to saveState() and restoreState()
Also renames PlanExecutor::getStages() to PlanExecutor::getRootStage()
Diffstat (limited to 'src/mongo/db/commands/pipeline_command.cpp')
-rw-r--r--src/mongo/db/commands/pipeline_command.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mongo/db/commands/pipeline_command.cpp b/src/mongo/db/commands/pipeline_command.cpp
index 36a9a7c75a8..20d05a86e90 100644
--- a/src/mongo/db/commands/pipeline_command.cpp
+++ b/src/mongo/db/commands/pipeline_command.cpp
@@ -116,10 +116,10 @@ namespace {
// Manage our OperationContext. We intentionally don't propagate to the child
// Runner as that is handled by DocumentSourceCursor as it needs to.
- virtual void prepareToYield() {
+ virtual void saveState() {
_pipeline->getContext()->opCtx = NULL;
}
- virtual void recoverFromYield(OperationContext* opCtx) {
+ virtual void restoreState(OperationContext* opCtx) {
_pipeline->getContext()->opCtx = opCtx;
}
@@ -234,7 +234,7 @@ namespace {
if (resultsArray.len() + next.objsize() > byteLimit) {
// Get the pipeline proxy stage wrapped by this PlanExecutor.
- PipelineProxyStage* proxy = static_cast<PipelineProxyStage*>(exec->getStages());
+ PipelineProxyStage* proxy = static_cast<PipelineProxyStage*>(exec->getRootStage());
// too big. next will be the first doc in the second batch
proxy->pushBack(next);
break;