This is an automated email from the ASF dual-hosted git repository.
lihaopeng pushed a commit to branch branch-2.1
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-2.1 by this push:
new cb80ae906f2 [Bug](runtime-filter) disable sync filter when pipeline
engine is off (#36994)
cb80ae906f2 is described below
commit cb80ae906f2a0e7e4a57b77ba645a81e238b3fcf
Author: Pxl <[email protected]>
AuthorDate: Fri Jun 28 16:59:26 2024 +0800
[Bug](runtime-filter) disable sync filter when pipeline engine is off
(#36994)
## Proposed changes
1. disable sync filter when pipeline engine is off
2. reduce some warning log
---
be/src/exprs/runtime_filter.cpp | 2 +-
be/src/runtime/runtime_state.cpp | 6 ------
be/src/vec/runtime/vdata_stream_mgr.cpp | 4 ++--
3 files changed, 3 insertions(+), 9 deletions(-)
diff --git a/be/src/exprs/runtime_filter.cpp b/be/src/exprs/runtime_filter.cpp
index 39eb814bbea..1271ec39156 100644
--- a/be/src/exprs/runtime_filter.cpp
+++ b/be/src/exprs/runtime_filter.cpp
@@ -1852,7 +1852,7 @@ RuntimeFilterType IRuntimeFilter::get_real_type() {
bool IRuntimeFilter::need_sync_filter_size() {
return (type() == RuntimeFilterType::IN_OR_BLOOM_FILTER ||
type() == RuntimeFilterType::BLOOM_FILTER) &&
- _wrapper->get_build_bf_cardinality() && !_is_broadcast_join;
+ _wrapper->get_build_bf_cardinality() && !_is_broadcast_join &&
_enable_pipeline_exec;
}
Status IRuntimeFilter::update_filter(const UpdateRuntimeFilterParams* param) {
diff --git a/be/src/runtime/runtime_state.cpp b/be/src/runtime/runtime_state.cpp
index 75d06adc561..2713ee441dd 100644
--- a/be/src/runtime/runtime_state.cpp
+++ b/be/src/runtime/runtime_state.cpp
@@ -544,15 +544,9 @@ Status
RuntimeState::register_consumer_runtime_filter(const doris::TRuntimeFilte
bool need_local_merge,
int node_id,
doris::IRuntimeFilter**
consumer_filter) {
if (desc.has_remote_targets || need_local_merge) {
- LOG(WARNING) << "registe global ins:" << _profile.name()
- << " ,mgr: " << global_runtime_filter_mgr()
- << " ,filter id:" << desc.filter_id;
return global_runtime_filter_mgr()->register_consumer_filter(desc,
query_options(), node_id,
consumer_filter, false, true);
} else {
- LOG(WARNING) << "registe local ins:" << _profile.name()
- << " ,mgr: " << global_runtime_filter_mgr()
- << " ,filter id:" << desc.filter_id;
return local_runtime_filter_mgr()->register_consumer_filter(desc,
query_options(), node_id,
consumer_filter, false, false);
}
diff --git a/be/src/vec/runtime/vdata_stream_mgr.cpp
b/be/src/vec/runtime/vdata_stream_mgr.cpp
index 46d335fbf00..4e48effb566 100644
--- a/be/src/vec/runtime/vdata_stream_mgr.cpp
+++ b/be/src/vec/runtime/vdata_stream_mgr.cpp
@@ -97,8 +97,8 @@ Status VDataStreamMgr::find_recvr(const TUniqueId&
fragment_instance_id, PlanNod
}
++range.first;
}
- return Status::InternalError("Could not find local receiver for node {}
with instance {}",
- node_id, print_id(fragment_instance_id));
+ return Status::InvalidArgument("Could not find local receiver for node {}
with instance {}",
+ node_id, print_id(fragment_instance_id));
}
Status VDataStreamMgr::transmit_block(const PTransmitDataParams* request,
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]