From e1001f4dee5095c71154593814ada3be294b7ba9 Mon Sep 17 00:00:00 2001 From: vamsi-amazon Date: Thu, 3 Mar 2022 15:29:42 -0800 Subject: [PATCH] Fixed https://github.com/opensearch-project/sql/issues/423. Treating ExpressionEvaluationException as client Error Signed-off-by: vamsi-amazon --- .../java/org/opensearch/sql/legacy/plugin/RestSqlAction.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/plugin/RestSqlAction.java b/legacy/src/main/java/org/opensearch/sql/legacy/plugin/RestSqlAction.java index 880a0231dd..10d9dab0fa 100644 --- a/legacy/src/main/java/org/opensearch/sql/legacy/plugin/RestSqlAction.java +++ b/legacy/src/main/java/org/opensearch/sql/legacy/plugin/RestSqlAction.java @@ -35,6 +35,7 @@ import org.opensearch.rest.RestRequest; import org.opensearch.rest.RestStatus; import org.opensearch.sql.common.antlr.SyntaxCheckException; +import org.opensearch.sql.exception.ExpressionEvaluationException; import org.opensearch.sql.exception.SemanticCheckException; import org.opensearch.sql.legacy.antlr.OpenSearchLegacySqlAnalyzer; import org.opensearch.sql.legacy.antlr.SqlAnalysisConfig; @@ -244,7 +245,8 @@ private static boolean isClientError(Exception e) { || e instanceof VerificationException || e instanceof SqlAnalysisException || e instanceof SyntaxCheckException - || e instanceof SemanticCheckException; + || e instanceof SemanticCheckException + || e instanceof ExpressionEvaluationException; } private void sendResponse(final RestChannel channel, final String message, final RestStatus status) {