(doris) 10/23: fix UT (#48591)

[panxiaolei]

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

panxiaolei pushed a commit to branch refactor_rf
in repository https://gitbox.apache.org/repos/asf/doris.git

commit a1be0a664878ddaf507550894d1ade2123686150
Author: Gabriel <liwenqi...@selectdb.com>
AuthorDate: Tue Mar 4 09:19:45 2025 +0800

    fix UT (#48591)
---
 be/src/runtime_filter/runtime_filter_merger.h    | 5 -----
 be/src/runtime_filter/runtime_filter_wrapper.cpp | 3 +++
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/be/src/runtime_filter/runtime_filter_merger.h 
b/be/src/runtime_filter/runtime_filter_merger.h
index 200215908b5..7c4f3ac639c 100644
--- a/be/src/runtime_filter/runtime_filter_merger.h
+++ b/be/src/runtime_filter/runtime_filter_merger.h
@@ -41,11 +41,6 @@ public:
                 new RuntimeFilterMerger(state, desc, parent_profile));
         vectorized::VExprContextSPtr build_ctx;
         RETURN_IF_ERROR(vectorized::VExpr::create_expr_tree(desc->src_expr, 
build_ctx));
-        if ((*res)->_runtime_filter_type == RuntimeFilterType::UNKNOWN_FILTER 
||
-            (*res)->_runtime_filter_type == RuntimeFilterType::BITMAP_FILTER) {
-            return Status::InternalError("RuntimeFilterMerger is not supported 
by filter type {}",
-                                         int((*res)->_runtime_filter_type));
-        }
         (*res)->_wrapper = std::make_shared<RuntimeFilterWrapper>(
                 build_ctx->root()->type().type, (*res)->_runtime_filter_type, 
desc->filter_id,
                 RuntimeFilterWrapper::State::IGNORED);
diff --git a/be/src/runtime_filter/runtime_filter_wrapper.cpp 
b/be/src/runtime_filter/runtime_filter_wrapper.cpp
index 96ab9bf5fcb..9aa054c0ec9 100644
--- a/be/src/runtime_filter/runtime_filter_wrapper.cpp
+++ b/be/src/runtime_filter/runtime_filter_wrapper.cpp
@@ -157,6 +157,9 @@ Status RuntimeFilterWrapper::merge(const 
RuntimeFilterWrapper* other) {
         return Status::OK();
     }
     if (other->_state == State::DISABLED) {
+        if (_hybrid_set) {
+            _hybrid_set->clear();
+        }
         set_state(State::DISABLED, other->_disabled_reason);
         return Status::OK();
     }


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org