This is an automated email from the ASF dual-hosted git repository.
panxiaolei pushed a commit to branch cp_0114
in repository https://gitbox.apache.org/repos/asf/doris.git
commit f3f7e9fe6262261a26333d07ffe27e3c8eaec7b7
Author: BiteTheDDDDt <pxl...@qq.com>
AuthorDate: Tue Jan 14 00:39:35 2025 +0800
fix
---
be/src/exprs/runtime_filter.cpp | 5 -----
be/src/pipeline/exec/hashjoin_build_sink.cpp | 2 +-
be/src/vec/exec/join/vhash_join_node.h | 2 +-
gensrc/thrift/PaloInternalService.thrift | 9 +++------
4 files changed, 5 insertions(+), 13 deletions(-)
diff --git a/be/src/exprs/runtime_filter.cpp b/be/src/exprs/runtime_filter.cpp
index 348bea00a01..d0eedc8a061 100644
--- a/be/src/exprs/runtime_filter.cpp
+++ b/be/src/exprs/runtime_filter.cpp
@@ -1378,11 +1378,6 @@ PrimitiveType IRuntimeFilter::column_type() const {
void IRuntimeFilter::signal() {
DCHECK(is_consumer());
- if (!_wrapper->is_ignored() && !_wrapper->is_disabled() &&
_wrapper->is_bloomfilter() &&
- !_wrapper->get_bloomfilter()->inited()) {
- throw Exception(ErrorCode::INTERNAL_ERROR, "bf not inited and not
ignored/disabled, rf: {}",
- debug_string());
- }
_rf_state_atomic.store(RuntimeFilterState::READY);
if (!_filter_timer.empty()) {
diff --git a/be/src/pipeline/exec/hashjoin_build_sink.cpp
b/be/src/pipeline/exec/hashjoin_build_sink.cpp
index a61d6162b79..c764b8d1a73 100644
--- a/be/src/pipeline/exec/hashjoin_build_sink.cpp
+++ b/be/src/pipeline/exec/hashjoin_build_sink.cpp
@@ -216,7 +216,7 @@ Status
HashJoinBuildSinkLocalState::disable_runtime_filters(RuntimeState* state)
RETURN_IF_ERROR(_runtime_filter_slots->disable_all_filters());
SCOPED_TIMER(_publish_runtime_filter_timer);
- return _runtime_filter_slots->publish(state, !_should_build_hash_table);
+ return _runtime_filter_slots->publish(!_should_build_hash_table);
}
bool HashJoinBuildSinkLocalState::build_unique() const {
diff --git a/be/src/vec/exec/join/vhash_join_node.h
b/be/src/vec/exec/join/vhash_join_node.h
index f23a992049f..5cfac9f9aba 100644
--- a/be/src/vec/exec/join/vhash_join_node.h
+++ b/be/src/vec/exec/join/vhash_join_node.h
@@ -82,7 +82,7 @@ Status process_runtime_filter_build(RuntimeState* state,
Block* block, Parent* p
{
SCOPED_TIMER(parent->_runtime_filter_init_timer);
RETURN_IF_ERROR(parent->_runtime_filter_slots->init_filters(state,
rows));
- RETURN_IF_ERROR(parent->_runtime_filter_slots->ignore_filters(state));
+
RETURN_IF_ERROR(parent->_runtime_filter_slots->disable_meaningless_filters(state));
}
if (!parent->_runtime_filter_slots->empty() && rows > 1) {
diff --git a/gensrc/thrift/PaloInternalService.thrift
b/gensrc/thrift/PaloInternalService.thrift
index 074619258f1..c612826836e 100644
--- a/gensrc/thrift/PaloInternalService.thrift
+++ b/gensrc/thrift/PaloInternalService.thrift
@@ -339,14 +339,11 @@ struct TQueryOptions {
139: optional i64 orc_once_max_read_bytes = 8388608;
140: optional i64 orc_max_merge_distance_bytes = 1048576;
- 141: optional bool ignore_runtime_filter_error = false;
- 142: optional bool enable_fixed_len_to_uint32_v2 = false;
- 143: optional bool enable_shared_exchange_sink_buffer = true;
-
- 144: optional bool enable_inverted_index_searcher_cache = true;
- 145: optional bool enable_inverted_index_query_cache = true;
146: optional bool fuzzy_disable_runtime_filter_in_be = false;
+ // upgrade options. keep them same in every branch.
+ 200: optional bool new_is_ip_address_in_range = false;
+
// For cloud, to control if the content would be written into file cache
1000: optional bool disable_file_cache = false
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
