This is an automated email from the ASF dual-hosted git repository.
lihaopeng pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/master by this push:
new 9876312830e [Fix](Rf) fix in_or_bloom filter merge error in broadcast
join remote target tpcds q78 (#30492)
9876312830e is described below
commit 9876312830e1c341f782c2917fb637335de4772a
Author: HappenLee <[email protected]>
AuthorDate: Mon Jan 29 17:33:58 2024 +0800
[Fix](Rf) fix in_or_bloom filter merge error in broadcast join remote
target tpcds q78 (#30492)
---
be/src/exprs/runtime_filter.cpp | 3 +--
be/src/runtime/fragment_mgr.cpp | 5 +++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/be/src/exprs/runtime_filter.cpp b/be/src/exprs/runtime_filter.cpp
index eef1e6a5245..bf1db5ff867 100644
--- a/be/src/exprs/runtime_filter.cpp
+++ b/be/src/exprs/runtime_filter.cpp
@@ -540,7 +540,7 @@ public:
} else {
VLOG_DEBUG << " change runtime filter to bloom filter(id="
<< _filter_id
<< ") because: already exist a bloom filter";
- change_to_bloom_filter(true);
+ change_to_bloom_filter();
RETURN_IF_ERROR(_context.bloom_filter_func->merge(
wrapper->_context.bloom_filter_func.get()));
}
@@ -1319,7 +1319,6 @@ Status
IRuntimeFilter::_create_wrapper(RuntimeFilterParamsContext* state, const
}
wrapper->reset(new RuntimePredicateWrapper(state, pool, column_type,
get_type(filter_type),
param->request->filter_id()));
-
switch (filter_type) {
case PFilterType::IN_FILTER: {
DCHECK(param->request->has_in_filter());
diff --git a/be/src/runtime/fragment_mgr.cpp b/be/src/runtime/fragment_mgr.cpp
index c38365d6a0c..43c01edf449 100644
--- a/be/src/runtime/fragment_mgr.cpp
+++ b/be/src/runtime/fragment_mgr.cpp
@@ -1482,8 +1482,9 @@ Status FragmentMgr::merge_filter(const
PMergeFilterRequest* request,
// when filter_controller->merge is still in progress
fragment_executor = iter->second;
}
- RETURN_IF_ERROR(filter_controller->merge(request, attach_data,
opt_remote_rf));
- return Status::OK();
+ auto merge_status = filter_controller->merge(request, attach_data,
opt_remote_rf);
+ DCHECK(merge_status.ok());
+ return merge_status;
}
void FragmentMgr::_setup_shared_hashtable_for_broadcast_join(const
TExecPlanFragmentParams& params,
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
