diff options
author | James Wahlin <james.wahlin@10gen.com> | 2015-04-21 08:50:52 -0400 |
---|---|---|
committer | James Wahlin <james.wahlin@10gen.com> | 2015-06-09 13:41:37 -0400 |
commit | d690653daadef98652e58131ade8b34114f86ab2 (patch) | |
tree | fd38454b9d4bc8d8d64c61334885e40d1644a235 /src/mongo/db/exec/count.cpp | |
parent | 6f9285ba8e37aee90acb9069cfe477db626281c2 (diff) | |
download | mongo-d690653daadef98652e58131ade8b34114f86ab2.tar.gz |
SERVER-2454 Improve PlanExecutor::DEAD handling
Diffstat (limited to 'src/mongo/db/exec/count.cpp')
-rw-r--r-- | src/mongo/db/exec/count.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mongo/db/exec/count.cpp b/src/mongo/db/exec/count.cpp index 5fbcc28a40b..5b3eb904647 100644 --- a/src/mongo/db/exec/count.cpp +++ b/src/mongo/db/exec/count.cpp @@ -128,10 +128,10 @@ namespace mongo { else if (PlanStage::DEAD == state) { return state; } - else if (PlanStage::FAILURE == state) { + else if (PlanStage::FAILURE == state || PlanStage::DEAD == state) { *out = id; - // If a stage fails, it may create a status WSM to indicate why it failed, in which cas - // 'id' is valid. If ID is invalid, we create our own error message. + // If a stage fails, it may create a status WSM to indicate why it failed, in which + // case 'id' is valid. If ID is invalid, we create our own error message. if (WorkingSet::INVALID_ID == id) { const std::string errmsg = "count stage failed to read result from child"; Status status = Status(ErrorCodes::InternalError, errmsg); |