This is an automated email from the ASF dual-hosted git repository.
gabriellee 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 2887c286044 [fix](local shuffle) Fix local shuffle strategy (#61057)
2887c286044 is described below
commit 2887c2860442a07399fe45f06c69bca86dbef97d
Author: Gabriel <[email protected]>
AuthorDate: Tue Mar 17 16:23:16 2026 +0800
[fix](local shuffle) Fix local shuffle strategy (#61057)
Fix `followed_by_shuffled_operator` if operator is NOOP
---
be/src/exec/pipeline/pipeline_fragment_context.cpp | 20 ++++++++++++--------
1 file changed, 12 insertions(+), 8 deletions(-)
diff --git a/be/src/exec/pipeline/pipeline_fragment_context.cpp
b/be/src/exec/pipeline/pipeline_fragment_context.cpp
index aabfcb2961d..16634582398 100644
--- a/be/src/exec/pipeline/pipeline_fragment_context.cpp
+++ b/be/src/exec/pipeline/pipeline_fragment_context.cpp
@@ -707,16 +707,20 @@ Status PipelineFragmentContext::_create_tree_helper(
?
cur_pipe->sink()->required_data_distribution(_runtime_state.get())
: op->required_data_distribution(_runtime_state.get());
current_followed_by_shuffled_operator =
- (followed_by_shuffled_operator ||
- (cur_pipe->operators().empty() ?
cur_pipe->sink()->is_shuffled_operator()
- : op->is_shuffled_operator())) &&
-
Pipeline::is_hash_exchange(required_data_distribution.distribution_type);
+ ((followed_by_shuffled_operator ||
+ (cur_pipe->operators().empty() ?
cur_pipe->sink()->is_shuffled_operator()
+ : op->is_shuffled_operator())) &&
+
Pipeline::is_hash_exchange(required_data_distribution.distribution_type)) ||
+ (followed_by_shuffled_operator &&
+ required_data_distribution.distribution_type ==
ExchangeType::NOOP);
current_require_bucket_distribution =
- (require_bucket_distribution ||
- (cur_pipe->operators().empty() ?
cur_pipe->sink()->is_colocated_operator()
- : op->is_colocated_operator())) &&
-
Pipeline::is_hash_exchange(required_data_distribution.distribution_type);
+ ((require_bucket_distribution ||
+ (cur_pipe->operators().empty() ?
cur_pipe->sink()->is_colocated_operator()
+ : op->is_colocated_operator())) &&
+
Pipeline::is_hash_exchange(required_data_distribution.distribution_type)) ||
+ (require_bucket_distribution &&
+ required_data_distribution.distribution_type ==
ExchangeType::NOOP);
if (num_children == 0) {
_use_serial_source = op->is_serial_operator();
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
