This is an automated email from the ASF dual-hosted git repository.
panxiaolei 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 37fb32f7570 [Bug](runtime-filter) fix error of not found merge addr
(#49743)
37fb32f7570 is described below
commit 37fb32f75701ad61b34ae692e9fbe4a79057721b
Author: Pxl <x...@selectdb.com>
AuthorDate: Wed Apr 2 10:20:55 2025 +0800
[Bug](runtime-filter) fix error of not found merge addr (#49743)
### What problem does this PR solve?
related with #49622
### Check List (For Author)
- Test <!-- At least one of them must be included. -->
- [ ] Regression test
- [ ] Unit Test
- [ ] Manual test (add detailed scripts or steps below)
- [x] No need to test or manual test. Explain why:
- [ ] This is a refactor/code format and no logic has been changed.
- [x] Previous test can cover this change.
- [ ] No code files have been changed.
- [ ] Other reason <!-- Add your reason? -->
- Behavior changed:
- [x] No.
- [ ] Yes. <!-- Explain the behavior change -->
- Does this need documentation?
- [x] No.
- [ ] Yes. <!-- Add document PR link here. eg:
https://github.com/apache/doris-website/pull/1214 -->
### Check List (For Reviewer who merge this PR)
- [x] Confirm the release note
- [x] Confirm test cases
- [x] Confirm document
- [x] Add branch pick label <!-- Add branch pick label that this PR
should merge into -->
---
be/src/runtime/fragment_mgr.cpp | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/be/src/runtime/fragment_mgr.cpp b/be/src/runtime/fragment_mgr.cpp
index 35c4e6d4d8f..3d81bee17d5 100644
--- a/be/src/runtime/fragment_mgr.cpp
+++ b/be/src/runtime/fragment_mgr.cpp
@@ -852,12 +852,13 @@ Status FragmentMgr::exec_plan_fragment(const
TPipelineFragmentParams& params,
{ return
Status::Aborted("FragmentMgr.exec_plan_fragment.failed"); });
if (parent.__isset.runtime_filter_info) {
auto info = parent.runtime_filter_info;
- if (info.__isset.runtime_filter_params &&
- !info.runtime_filter_params.rid_to_runtime_filter.empty()) {
- auto handler =
std::make_shared<RuntimeFilterMergeControllerEntity>(
-
RuntimeFilterParamsContext::create(context->get_runtime_state()));
- RETURN_IF_ERROR(handler->init(params.query_id,
info.runtime_filter_params));
- query_ctx->set_merge_controller_handler(handler);
+ if (info.__isset.runtime_filter_params) {
+ if (!info.runtime_filter_params.rid_to_runtime_filter.empty()) {
+ auto handler =
std::make_shared<RuntimeFilterMergeControllerEntity>(
+
RuntimeFilterParamsContext::create(context->get_runtime_state()));
+ RETURN_IF_ERROR(handler->init(params.query_id,
info.runtime_filter_params));
+ query_ctx->set_merge_controller_handler(handler);
+ }
query_ctx->runtime_filter_mgr()->set_runtime_filter_params(info.runtime_filter_params);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
