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

[hellostephen]

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

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

commit d9fa59be4df5a1ee95d88faabe9e1eb3ec5a2526
Author: Pxl <pxl...@qq.com>
AuthorDate: Thu Sep 5 14:50:47 2024 +0800

    [Chore](runtime-filter) avoid dcheck fail when rf merge failed (#39172) 
(#40409)
    
    pick from #39172
---
 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 050f122e0a4..5b61cc87361 100644
--- a/be/src/runtime/runtime_filter_mgr.cpp
+++ b/be/src/runtime/runtime_filter_mgr.cpp
@@ -416,12 +416,7 @@ Status RuntimeFilterMergeControllerEntity::merge(const 
PMergeFilterRequest* requ
         RuntimeFilterWrapperHolder holder;
         RETURN_IF_ERROR(IRuntimeFilter::create_wrapper(&params, 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: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org