(doris) branch master updated: [fix](local shuffle) Fix wrong partitioned expr in local exchanger (#37017)

[gabriellee]

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 572c2b89883 [fix](local shuffle) Fix wrong partitioned expr in local 
exchanger (#37017)
572c2b89883 is described below

commit 572c2b89883f7dcb56053bb6473a4ddc25a2e14d
Author: Gabriel <gabrielleeb...@gmail.com>
AuthorDate: Mon Jul 1 10:02:03 2024 +0800

    [fix](local shuffle) Fix wrong partitioned expr in local exchanger (#37017)
    
    Now partitioned expressions in HASH-SHUFFLE local exchanger may be wrong. 
This PR fix it.
---
 be/src/pipeline/exec/hashjoin_build_sink.h     | 4 ++--
 be/src/pipeline/exec/hashjoin_probe_operator.h | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/be/src/pipeline/exec/hashjoin_build_sink.h 
b/be/src/pipeline/exec/hashjoin_build_sink.h
index d785c20ee7f..fad03f0a78d 100644
--- a/be/src/pipeline/exec/hashjoin_build_sink.h
+++ b/be/src/pipeline/exec/hashjoin_build_sink.h
@@ -148,8 +148,8 @@ public:
         return _join_distribution == TJoinDistributionType::PARTITIONED;
     }
     bool require_data_distribution() const override {
-        return _join_distribution == TJoinDistributionType::COLOCATE ||
-               _join_distribution == TJoinDistributionType::BUCKET_SHUFFLE;
+        return _join_distribution != TJoinDistributionType::BROADCAST &&
+               _join_distribution != TJoinDistributionType::NONE;
     }
 
 private:
diff --git a/be/src/pipeline/exec/hashjoin_probe_operator.h 
b/be/src/pipeline/exec/hashjoin_probe_operator.h
index b8bc892ef31..0b4298f55ff 100644
--- a/be/src/pipeline/exec/hashjoin_probe_operator.h
+++ b/be/src/pipeline/exec/hashjoin_probe_operator.h
@@ -159,8 +159,8 @@ public:
         return _join_distribution == TJoinDistributionType::PARTITIONED;
     }
     bool require_data_distribution() const override {
-        return _join_distribution == TJoinDistributionType::COLOCATE ||
-               _join_distribution == TJoinDistributionType::BUCKET_SHUFFLE;
+        return _join_distribution != TJoinDistributionType::BROADCAST &&
+               _join_distribution != TJoinDistributionType::NONE;
     }
 
 private:


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