This is an automated email from the ASF dual-hosted git repository.
yiguolei pushed a commit to branch branch-2.0
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-2.0 by this push:
new 7f76e0337a9 [fix](stacktrace) ignore stacktrace for error code
INVALID_ARGUMENT INVERTED_INDEX_NOT_IMPLEMENTED (#27898)
7f76e0337a9 is described below
commit 7f76e0337a9f40a6afc04c8d12d073e5a1d08530
Author: Kang <kxiao.ti...@gmail.com>
AuthorDate: Sat Dec 2 07:42:07 2023 +0800
[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 | 9 ++++++---
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, 9 insertions(+), 6 deletions(-)
diff --git a/be/src/common/status.h b/be/src/common/status.h
index 88981fe808b..e0c413db6f8 100644
--- a/be/src/common/status.h
+++ b/be/src/common/status.h
@@ -272,9 +272,10 @@ E(INVERTED_INDEX_NO_TERMS, -6005);
E(INVERTED_INDEX_RENAME_FILE_FAILED, -6006);
E(INVERTED_INDEX_EVALUATE_SKIPPED, -6007);
E(INVERTED_INDEX_BUILD_WAITTING, -6008);
-E(KEY_NOT_FOUND, -6009);
-E(KEY_ALREADY_EXISTS, -6010);
-E(ENTRY_NOT_FOUND, -6011);
+E(INVERTED_INDEX_NOT_IMPLEMENTED, -6009);
+E(KEY_NOT_FOUND, -7000);
+E(KEY_ALREADY_EXISTS, -7001);
+E(ENTRY_NOT_FOUND, -7002);
#undef E
} // namespace ErrorCode
@@ -300,6 +301,7 @@ constexpr bool capture_stacktrace(int code) {
&& code != ErrorCode::SEGCOMPACTION_INIT_READER
&& code != ErrorCode::SEGCOMPACTION_INIT_WRITER
&& code != ErrorCode::SEGCOMPACTION_FAILED
+ && code != ErrorCode::INVALID_ARGUMENT
&& code != ErrorCode::INVERTED_INDEX_INVALID_PARAMETERS
&& code != ErrorCode::INVERTED_INDEX_NOT_SUPPORTED
&& code != ErrorCode::INVERTED_INDEX_CLUCENE_ERROR
@@ -308,6 +310,7 @@ constexpr bool capture_stacktrace(int code) {
&& code != ErrorCode::INVERTED_INDEX_NO_TERMS
&& code != ErrorCode::INVERTED_INDEX_EVALUATE_SKIPPED
&& code != ErrorCode::INVERTED_INDEX_BUILD_WAITTING
+ && code != ErrorCode::INVERTED_INDEX_NOT_IMPLEMENTED
&& code != ErrorCode::META_KEY_NOT_FOUND
&& code != ErrorCode::PUSH_VERSION_ALREADY_EXIST
&& code != ErrorCode::VERSION_NOT_EXIST
diff --git a/be/src/olap/block_column_predicate.cpp
b/be/src/olap/block_column_predicate.cpp
index 8cfb89363cd..13e7da1a6f9 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<ErrorCode::INVERTED_INDEX_NOT_IMPLEMENTED>(
"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 c91dc0c3678..3b3bba1ee06 100644
--- a/be/src/olap/block_column_predicate.h
+++ b/be/src/olap/block_column_predicate.h
@@ -92,7 +92,7 @@ public:
//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<ErrorCode::INVERTED_INDEX_NOT_IMPLEMENTED>(
"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 fecaa92031e..a168d12599c 100644
--- a/be/src/olap/rowset/segment_v2/segment_iterator.cpp
+++ b/be/src/olap/rowset/segment_v2/segment_iterator.cpp
@@ -952,7 +952,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"
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
