This is an automated email from the ASF dual-hosted git repository.
panxiaolei pushed a commit to branch cp_0116_2
in repository https://gitbox.apache.org/repos/asf/doris.git
commit 161116b0e8f86a18b529b6717da1227a8034533d
Author: BiteTheDDDDt <pxl...@qq.com>
AuthorDate: Thu Jan 16 10:43:16 2025 +0800
fix bloom_filter_func use after free on get_build_bf_cardinality
---
be/src/exprs/runtime_filter.cpp | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/be/src/exprs/runtime_filter.cpp b/be/src/exprs/runtime_filter.cpp
index b5675a5f968..866c1d098c8 100644
--- a/be/src/exprs/runtime_filter.cpp
+++ b/be/src/exprs/runtime_filter.cpp
@@ -371,11 +371,8 @@ public:
}
bool get_build_bf_cardinality() const {
- if (_filter_type == RuntimeFilterType::BLOOM_FILTER ||
- _filter_type == RuntimeFilterType::IN_OR_BLOOM_FILTER) {
- return _context->bloom_filter_func->get_build_bf_cardinality();
- }
- return false;
+ return _context->bloom_filter_func &&
+ _context->bloom_filter_func->get_build_bf_cardinality();
}
void insert_to_bloom_filter(BloomFilterFuncBase* bloom_filter) const {
@@ -1560,11 +1557,14 @@ void
IRuntimeFilter::update_runtime_filter_type_to_profile(uint64_t local_merge_
std::string IRuntimeFilter::debug_string() const {
return fmt::format(
- "RuntimeFilter: (id = {}, type = {}, is_broadcast: {}, "
- "build_bf_cardinality: {}, ignored: {}, error_msg: {}",
+ "RuntimeFilter: (id = {}, type = {}, is_broadcast: {}, ignored:
{}, disabled: {}, "
+ "build_bf_cardinality: {}, dependency: {}, synced_size: {},
has_local_target: {}, "
+ "has_remote_target: {}, error_msg: [{}]",
_filter_id, to_string(_runtime_filter_type), _is_broadcast_join,
- _wrapper->get_build_bf_cardinality(), _wrapper->is_ignored(),
- _wrapper->_context->err_msg);
+ _wrapper->_context->ignored, _wrapper->_context->disabled,
+ _wrapper->get_build_bf_cardinality(),
+ _dependency ? _dependency->debug_string() : "none", _synced_size,
_has_local_target,
+ _has_remote_target, _wrapper->_context->err_msg);
}
Status IRuntimeFilter::merge_from(const RuntimePredicateWrapper* wrapper) {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
