Do not store exceptions under TRY (facebookincubator#9994)

Summary: Pull Request resolved: facebookincubator#9994 Do not store exceptions when EvalCtx::captureErrorDetails() is false. Reviewed By: xiaoxmeng, pedroerp Differential Revision: D58010139 fbshipit-source-id: b922def6bba7c40dbdfcd913789eedead2992216
zacw7 · Jun 1, 2024 · 3681638 · 3681638
1 parent baf6910
commit 3681638
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 7 deletions.
diff --git a/velox/expression/CastExpr.cpp b/velox/expression/CastExpr.cpp
@@ -234,7 +234,7 @@ VectorPtr CastExpr::castToDate(
                         makeErrorMessage(input, row, DATE()),
                         result.error().message()));
               } else {
-                context.setStatus(row, Status::UserError(""));
+                context.setStatus(row, Status::UserError());
               }
             }
           } else {

diff --git a/velox/expression/EvalCtx.cpp b/velox/expression/EvalCtx.cpp
@@ -222,7 +222,11 @@ void EvalCtx::setError(
     throwError(exceptionPtr);
   }
 
-  addError(index, toVeloxException(exceptionPtr), errors_);
+  if (captureErrorDetails_) {
+    addError(index, toVeloxException(exceptionPtr), errors_);
+  } else {
+    addError(index, errors_);
+  }
 }
 
 // This should be used onlly when exceptionPtr is guranteed to be a
@@ -234,7 +238,11 @@ void EvalCtx::setVeloxExceptionError(
     std::rethrow_exception(exceptionPtr);
   }
 
-  addError(index, exceptionPtr, errors_);
+  if (captureErrorDetails_) {
+    addError(index, exceptionPtr, errors_);
+  } else {
+    addError(index, errors_);
+  }
 }
 
 void EvalCtx::setErrors(
@@ -244,9 +252,13 @@ void EvalCtx::setErrors(
     throwError(exceptionPtr);
   }
 
-  auto veloxException = toVeloxException(exceptionPtr);
-  rows.applyToSelected(
-      [&](auto row) { addError(row, veloxException, errors_); });
+  if (captureErrorDetails_) {
+    auto veloxException = toVeloxException(exceptionPtr);
+    rows.applyToSelected(
+        [&](auto row) { addError(row, veloxException, errors_); });
+  } else {
+    rows.applyToSelected([&](auto row) { addError(row, errors_); });
+  }
 }
 
 void EvalCtx::addElementErrorsToTopLevel(

diff --git a/velox/type/Conversions.h b/velox/type/Conversions.h
@@ -71,7 +71,7 @@ Expected<T> callFollyTo(const F& v) {
   const auto result = folly::tryTo<T>(v);
   if (result.hasError()) {
     if (threadSkipErrorDetails()) {
-      return folly::makeUnexpected(Status::UserError(""));
+      return folly::makeUnexpected(Status::UserError());
     }
     return folly::makeUnexpected(Status::UserError(
         "{}", folly::makeConversionError(result.error(), "").what()));