SERVER-42836 Fast path for sort key generation of WorkingSetMembers

Includes a small change to external_sort_find.js, which was failing
when this change was initially submitted.

This reverts commit 72d8bff5f619ebdcb9904f5978ac14b2f53ea686.

1 files changed, 7 insertions, 7 deletions

diff --git a/src/mongo/db/exec/sort_key_generator.cpp b/src/mongo/db/exec/sort_key_generator.cpp
index f8c81395b8a..0d18dc37d7b 100644
--- a/src/mongo/db/exec/sort_key_generator.cpp
+++ b/src/mongo/db/exec/sort_key_generator.cpp
@@ -68,16 +68,16 @@ PlanStage::StageState SortKeyGeneratorStage::doWork(WorkingSetID* out) {
     if (stageState == PlanStage::ADVANCED) {
         WorkingSetMember* member = _ws->get(*out);
 
-        auto sortKey = _sortKeyGen.computeSortKey(*member);
-        if (!sortKey.isOK()) {
-            *out = WorkingSetCommon::allocateStatusMember(_ws, sortKey.getStatus());
+        try {
+            auto sortKey = _sortKeyGen.computeSortKey(*member);
+
+            // Add the sort key to the WSM as metadata.
+            member->metadata().setSortKey(std::move(sortKey), _sortKeyGen.isSingleElementKey());
+        } catch (const DBException& computeSortKeyException) {
+            *out = WorkingSetCommon::allocateStatusMember(_ws, computeSortKeyException.toStatus());
             return PlanStage::FAILURE;
         }
 
-        // Add the sort key to the WSM as metadata.
-        member->metadata().setSortKey(std::move(sortKey.getValue()),
-                                      _sortKeyGen.isSingleElementKey());
-
         return PlanStage::ADVANCED;
     }