diff options
author | David Storch <david.storch@mongodb.com> | 2020-05-18 18:20:48 -0400 |
---|---|---|
committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2020-05-29 18:44:40 +0000 |
commit | d295b6646fcc815e73ad3085b212ad14c8c6de01 (patch) | |
tree | 3b17d6dcf49643018e5c1220fe61cb5808978ef0 /src/mongo/db/exec/text_or.cpp | |
parent | 84a7b81a73c7abfff42823b87612c9d50ea50e67 (diff) | |
download | mongo-d295b6646fcc815e73ad3085b212ad14c8c6de01.tar.gz |
SERVER-43821 Make PlanStage and PlanExecutor return errors by throwing
This eliminates the need for the FAILURE status codes in
PlanStage and PlanExecutor, and brings query execution's
error reporting more in line with that of the rest of the
server. It also makes it easier for future implementations
of PlanExecutor to comply with the interface.
Diffstat (limited to 'src/mongo/db/exec/text_or.cpp')
-rw-r--r-- | src/mongo/db/exec/text_or.cpp | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/src/mongo/db/exec/text_or.cpp b/src/mongo/db/exec/text_or.cpp index 4f92025575a..75e90e278cc 100644 --- a/src/mongo/db/exec/text_or.cpp +++ b/src/mongo/db/exec/text_or.cpp @@ -197,19 +197,6 @@ PlanStage::StageState TextOrStage::readFromChildren(WorkingSetID* out) { _internalState = State::kReturningResults; return PlanStage::NEED_TIME; - } else if (PlanStage::FAILURE == childState) { - // 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) { - str::stream ss; - ss << "TEXT_OR stage failed to read in results from child"; - Status status(ErrorCodes::InternalError, ss); - *out = WorkingSetCommon::allocateStatusMember(_ws, status); - } else { - *out = id; - } - return PlanStage::FAILURE; } else { // Propagate WSID from below. *out = id; |