(doris) branch master updated: [Chore](runtime-filter) avoid dcheck fail when rf merge failed (#39172)

[dataroaring]

This is an automated email from the ASF dual-hosted git repository.

dataroaring 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 7bab58a7de0 [Chore](runtime-filter) avoid dcheck fail when rf merge 
failed (#39172)
7bab58a7de0 is described below

commit 7bab58a7de010297f11d9756c942f1dcced25c6c
Author: Pxl <pxl...@qq.com>
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 625b487d0ee..8eb3ab5eebf 100644
--- a/be/src/runtime/runtime_filter_mgr.cpp
+++ b/be/src/runtime/runtime_filter_mgr.cpp
@@ -396,12 +396,7 @@ Status RuntimeFilterMergeControllerEntity::merge(const 
PMergeFilterRequest* requ
         RuntimeFilterWrapperHolder holder;
         RETURN_IF_ERROR(IRuntimeFilter::create_wrapper(&params, 
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: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org