From 16ae244fd015ae101edee8dd652928793fab9a20 Mon Sep 17 00:00:00 2001 From: Kang Date: Sat, 2 Dec 2023 07:42:07 +0800 Subject: [PATCH] [fix](stacktrace) ignore stacktrace for error code INVALID_ARGUMENT INVERTED_INDEX_NOT_IMPLEMENTED (#27898) * ignore stacktrace for error INVALID_ARGUMENT INVERTED_INDEX_NOT_IMPLEMENTED * AndBlockColumnPredicate::evaluate --- be/src/common/status.h | 7 ++++--- be/src/olap/block_column_predicate.cpp | 2 +- be/src/olap/block_column_predicate.h | 2 +- be/src/olap/rowset/segment_v2/segment_iterator.cpp | 2 +- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/be/src/common/status.h b/be/src/common/status.h index d0bbda66325b03..e854cda360df12 100644 --- a/be/src/common/status.h +++ b/be/src/common/status.h @@ -269,9 +269,10 @@ namespace ErrorCode { E(INVERTED_INDEX_RENAME_FILE_FAILED, -6006, true); \ E(INVERTED_INDEX_EVALUATE_SKIPPED, -6007, false); \ E(INVERTED_INDEX_BUILD_WAITTING, -6008, false); \ - E(KEY_NOT_FOUND, -6009, false); \ - E(KEY_ALREADY_EXISTS, -6010, false); \ - E(ENTRY_NOT_FOUND, -6011, false); + E(INVERTED_INDEX_NOT_IMPLEMENTED, -6009, false); \ + E(KEY_NOT_FOUND, -7000, false); \ + E(KEY_ALREADY_EXISTS, -7001, false); \ + E(ENTRY_NOT_FOUND, -7002, false); // Define constexpr int error_code_name = error_code_value #define M(NAME, ERRORCODE, ENABLESTACKTRACE) constexpr int NAME = ERRORCODE; diff --git a/be/src/olap/block_column_predicate.cpp b/be/src/olap/block_column_predicate.cpp index 8cfb89363cdd24..13e7da1a6f9f90 100644 --- a/be/src/olap/block_column_predicate.cpp +++ b/be/src/olap/block_column_predicate.cpp @@ -216,7 +216,7 @@ void AndBlockColumnPredicate::evaluate_vec(vectorized::MutableColumns& block, ui Status AndBlockColumnPredicate::evaluate(const std::string& column_name, InvertedIndexIterator* iterator, uint32_t num_rows, roaring::Roaring* bitmap) const { - return Status::NotSupported( + return Status::Error( "Not Implemented evaluate with inverted index, please check the predicate"); } diff --git a/be/src/olap/block_column_predicate.h b/be/src/olap/block_column_predicate.h index cde2a5680aa553..c2583e042a6eae 100644 --- a/be/src/olap/block_column_predicate.h +++ b/be/src/olap/block_column_predicate.h @@ -97,7 +97,7 @@ class BlockColumnPredicate { //evaluate predicate on inverted virtual Status evaluate(const std::string& column_name, InvertedIndexIterator* iterator, uint32_t num_rows, roaring::Roaring* bitmap) const { - return Status::NotSupported( + return Status::Error( "Not Implemented evaluate with inverted index, please check the predicate"); } }; diff --git a/be/src/olap/rowset/segment_v2/segment_iterator.cpp b/be/src/olap/rowset/segment_v2/segment_iterator.cpp index 58477986374805..5b45f0d79fd20b 100644 --- a/be/src/olap/rowset/segment_v2/segment_iterator.cpp +++ b/be/src/olap/rowset/segment_v2/segment_iterator.cpp @@ -1056,7 +1056,7 @@ Status SegmentIterator::_apply_inverted_index_on_block_column_predicate( return res; } else { //TODO:mock until AndBlockColumnPredicate evaluate is ok. - if (res.code() == ErrorCode::NOT_IMPLEMENTED_ERROR) { + if (res.code() == ErrorCode::INVERTED_INDEX_NOT_IMPLEMENTED) { return Status::OK(); } LOG(WARNING) << "failed to evaluate index"