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 d1953871c2e0444860761a25614d8ab56639b994 Author: BiteTheDDDDt <x...@selectdb.com> AuthorDate: Fri Mar 7 13:39:53 2025 +0800 resolve conflict --- be/src/runtime_filter/runtime_filter.cpp | 2 +- be/src/runtime_filter/runtime_filter_producer.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/be/src/runtime_filter/runtime_filter.cpp b/be/src/runtime_filter/runtime_filter.cpp index cb64fb43af0..d77e1fefb76 100644 --- a/be/src/runtime_filter/runtime_filter.cpp +++ b/be/src/runtime_filter/runtime_filter.cpp @@ -19,7 +19,7 @@ #include "common/status.h" #include "util/brpc_client_cache.h" -#include "util/ref_count_closure.h" +#include "util/brpc_closure.h" #include "vec/exprs/vexpr.h" #include "vec/exprs/vexpr_context.h" diff --git a/be/src/runtime_filter/runtime_filter_producer.cpp b/be/src/runtime_filter/runtime_filter_producer.cpp index fa988887641..5073994da59 100644 --- a/be/src/runtime_filter/runtime_filter_producer.cpp +++ b/be/src/runtime_filter/runtime_filter_producer.cpp @@ -23,7 +23,7 @@ #include "runtime_filter/runtime_filter_merger.h" #include "runtime_filter/runtime_filter_wrapper.h" #include "util/brpc_client_cache.h" -#include "util/ref_count_closure.h" +#include "util/brpc_closure.h" namespace doris { --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org For additional commands, e-mail: commits-h...@doris.apache.org