You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@doris.apache.org by kx...@apache.org on 2023/10/12 14:53:24 UTC

[doris] 03/14: [Improve](status) avoid print too may stack log for `DATA_QUALITY_ERROR` code (#25292)

This is an automated email from the ASF dual-hosted git repository.

kxiao pushed a commit to branch branch-2.0
in repository https://gitbox.apache.org/repos/asf/doris.git

commit 981115867a6c7f234b7a51d854ebde6dce7eb64f
Author: lihangyu <15...@163.com>
AuthorDate: Thu Oct 12 09:58:51 2023 +0800

    [Improve](status) avoid print too may stack log for `DATA_QUALITY_ERROR` code (#25292)
---
 be/src/common/status.h                          |  1 +
 be/src/exprs/json_functions.cpp                 | 25 +++++++++++++------------
 be/src/vec/exec/format/json/new_json_reader.cpp |  9 ++++-----
 3 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/be/src/common/status.h b/be/src/common/status.h
index b15876f7168..a5dfccd01dd 100644
--- a/be/src/common/status.h
+++ b/be/src/common/status.h
@@ -283,6 +283,7 @@ E(ENTRY_NOT_FOUND, -6011);
 constexpr bool capture_stacktrace(int code) {
     return code != ErrorCode::OK
         && code != ErrorCode::END_OF_FILE
+        && code != ErrorCode::DATA_QUALITY_ERROR
         && code != ErrorCode::MEM_LIMIT_EXCEEDED
         && code != ErrorCode::TRY_LOCK_FAILED
         && code != ErrorCode::TOO_MANY_SEGMENTS
diff --git a/be/src/exprs/json_functions.cpp b/be/src/exprs/json_functions.cpp
index 1dce452e343..30608adeb25 100644
--- a/be/src/exprs/json_functions.cpp
+++ b/be/src/exprs/json_functions.cpp
@@ -254,18 +254,19 @@ Status JsonFunctions::extract_from_object(simdjson::ondemand::object& obj,
                                           simdjson::ondemand::value* value) noexcept {
 // Return DataQualityError when it's a malformed json.
 // Otherwise the path was not found, due to array out of bound or not exist
-#define HANDLE_SIMDJSON_ERROR(err, msg)                                                        \
-    do {                                                                                       \
-        const simdjson::error_code& _err = err;                                                \
-        const std::string& _msg = msg;                                                         \
-        if (UNLIKELY(_err)) {                                                                  \
-            if (_err == simdjson::NO_SUCH_FIELD || _err == simdjson::INDEX_OUT_OF_BOUNDS) {    \
-                return Status::NotFound(                                                       \
-                        fmt::format("err: {}, msg: {}", simdjson::error_message(_err), _msg)); \
-            }                                                                                  \
-            return Status::DataQualityError(                                                   \
-                    fmt::format("err: {}, msg: {}", simdjson::error_message(_err), _msg));     \
-        }                                                                                      \
+#define HANDLE_SIMDJSON_ERROR(err, msg)                                                     \
+    do {                                                                                    \
+        const simdjson::error_code& _err = err;                                             \
+        const std::string& _msg = msg;                                                      \
+        if (UNLIKELY(_err)) {                                                               \
+            if (_err == simdjson::NO_SUCH_FIELD || _err == simdjson::INDEX_OUT_OF_BOUNDS) { \
+                return Status::DataQualityError(                                            \
+                        fmt::format("Not found target filed, err: {}, msg: {}",             \
+                                    simdjson::error_message(_err), _msg));                  \
+            }                                                                               \
+            return Status::DataQualityError(                                                \
+                    fmt::format("err: {}, msg: {}", simdjson::error_message(_err), _msg));  \
+        }                                                                                   \
     } while (false);
 
     if (jsonpath.size() <= 1) {
diff --git a/be/src/vec/exec/format/json/new_json_reader.cpp b/be/src/vec/exec/format/json/new_json_reader.cpp
index fdaf228b3d0..ff5057eedc2 100644
--- a/be/src/vec/exec/format/json/new_json_reader.cpp
+++ b/be/src/vec/exec/format/json/new_json_reader.cpp
@@ -1253,9 +1253,8 @@ Status NewJsonReader::_simdjson_handle_flat_array_complex_json(
                 simdjson::ondemand::value val;
                 Status st = JsonFunctions::extract_from_object(cur, _parsed_json_root, &val);
                 if (UNLIKELY(!st.ok())) {
-                    if (st.is_not_found()) {
-                        RETURN_IF_ERROR(
-                                _append_error_msg(nullptr, "JsonPath not found", "", nullptr));
+                    if (st.is<DATA_QUALITY_ERROR>()) {
+                        RETURN_IF_ERROR(_append_error_msg(nullptr, st.to_string(), "", nullptr));
                         ADVANCE_ROW();
                         continue;
                     }
@@ -1699,11 +1698,11 @@ Status NewJsonReader::_simdjson_write_columns_by_jsonpath(
         Status st;
         if (i < _parsed_jsonpaths.size()) {
             st = JsonFunctions::extract_from_object(*value, _parsed_jsonpaths[i], &json_value);
-            if (!st.ok() && !st.is<NOT_FOUND>()) {
+            if (!st.ok() && !st.is<DATA_QUALITY_ERROR>()) {
                 return st;
             }
         }
-        if (i >= _parsed_jsonpaths.size() || st.is<NOT_FOUND>()) {
+        if (i >= _parsed_jsonpaths.size() || st.is<DATA_QUALITY_ERROR>()) {
             // not match in jsondata, filling with default value
             RETURN_IF_ERROR(_fill_missing_column(slot_desc, column_ptr, valid));
             if (!(*valid)) {


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For additional commands, e-mail: commits-help@doris.apache.org