This is an automated email from the ASF dual-hosted git repository.
dataroaring pushed a commit to branch branch-3.0
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-3.0 by this push:
new 069f92c528a [Chore](runtime-filter) avoid dcheck fail when rf merge
failed (#39172)
069f92c528a is described below
commit 069f92c528a7d47d8a402e31e297bd5bdac78ca8
Author: Pxl <[email protected]>
AuthorDate: Sat Aug 10 13:49:54 2024 +0800
[Chore](runtime-filter) avoid dcheck fail when rf merge failed (#39172)
## Proposed changes
avoid dcheck fail when rf merge failed
there is a difference in the logic of calculating bf size between 2.1
and 3.0, so the merge will fail
this pr is to prevent core dump caused by dcheck failure during rolling
upgrade.
---
be/src/runtime/runtime_filter_mgr.cpp | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/be/src/runtime/runtime_filter_mgr.cpp
b/be/src/runtime/runtime_filter_mgr.cpp
index 0e5b37c8ffa..aad5e9b7197 100644
--- a/be/src/runtime/runtime_filter_mgr.cpp
+++ b/be/src/runtime/runtime_filter_mgr.cpp
@@ -401,12 +401,7 @@ Status RuntimeFilterMergeControllerEntity::merge(const
PMergeFilterRequest* requ
RuntimeFilterWrapperHolder holder;
RETURN_IF_ERROR(IRuntimeFilter::create_wrapper(¶ms, pool,
holder.getHandle()));
- auto st = cnt_val->filter->merge_from(holder.getHandle()->get());
- if (!st) {
- // prevent error ignored
- DCHECK(false) << st.msg();
- return st;
- }
+
RETURN_IF_ERROR(cnt_val->filter->merge_from(holder.getHandle()->get()));
cnt_val->arrive_id.insert(UniqueId(request->fragment_instance_id()));
merged_size = cnt_val->arrive_id.size();
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
