diff options
| author | Pawel Terlecki <pawel.terlecki@mongodb.com> | 2019-02-01 18:43:03 -0500 |
|---|---|---|
| committer | Pawel Terlecki <pawel.terlecki@mongodb.com> | 2019-02-04 12:12:18 -0500 |
| commit | bd6d9a07a669891f18d0fb6a0f9b1535a6f13524 (patch) | |
| tree | 0aa2e637f688584edf5d38536135c9ceddcf81b7 /src/mongo/db/query/plan_executor_impl.cpp | |
| parent | 2d242bb2fd988496cbbe01ad17304778b441319a (diff) | |
| download | mongo-SERVER-38316.tar.gz | |
SERVER-38316 Consolidate PlanExecutor::DEAD and PlanExecutor::FAILURESERVER-38316
Takes care of PlanExecutor states. In some cases we log more
information for former DEAD state scenarios now.
Diffstat (limited to 'src/mongo/db/query/plan_executor_impl.cpp')
| -rw-r--r-- | src/mongo/db/query/plan_executor_impl.cpp | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/mongo/db/query/plan_executor_impl.cpp b/src/mongo/db/query/plan_executor_impl.cpp index d9641bc540c..88b0da30c31 100644 --- a/src/mongo/db/query/plan_executor_impl.cpp +++ b/src/mongo/db/query/plan_executor_impl.cpp @@ -293,8 +293,6 @@ string PlanExecutor::statestr(ExecState s) { return "ADVANCED"; } else if (PlanExecutor::IS_EOF == s) { return "IS_EOF"; - } else if (PlanExecutor::DEAD == s) { - return "DEAD"; } else { verify(PlanExecutor::FAILURE == s); return "FAILURE"; @@ -493,7 +491,7 @@ PlanExecutor::ExecState PlanExecutorImpl::_waitForInserts(CappedInsertNotifierDa *errorObj = Snapshotted<BSONObj>(SnapshotId(), WorkingSetCommon::buildMemberStatusObject(yieldResult)); } - return DEAD; + return FAILURE; } PlanExecutor::ExecState PlanExecutorImpl::_getNextImpl(Snapshotted<BSONObj>* objOut, @@ -513,7 +511,7 @@ PlanExecutor::ExecState PlanExecutorImpl::_getNextImpl(Snapshotted<BSONObj>* obj *objOut = Snapshotted<BSONObj>(SnapshotId(), WorkingSetCommon::buildMemberStatusObject(_killStatus)); } - return PlanExecutor::DEAD; + return PlanExecutor::FAILURE; } if (!_stash.empty()) { @@ -547,7 +545,7 @@ PlanExecutor::ExecState PlanExecutorImpl::_getNextImpl(Snapshotted<BSONObj>* obj *objOut = Snapshotted<BSONObj>( SnapshotId(), WorkingSetCommon::buildMemberStatusObject(yieldStatus)); } - return PlanExecutor::DEAD; + return PlanExecutor::FAILURE; } } @@ -670,7 +668,7 @@ Status PlanExecutorImpl::executePlan() { state = this->getNext(&obj, NULL); } - if (PlanExecutor::DEAD == state || PlanExecutor::FAILURE == state) { + if (PlanExecutor::FAILURE == state) { if (isMarkedAsKilled()) { return _killStatus; } |