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

gabriellee pushed a commit to branch branch-2.1
in repository https://gitbox.apache.org/repos/asf/doris.git


The following commit(s) were added to refs/heads/branch-2.1 by this push:
     new 7d99d5fcc48 [fix](analytic) Fix data distribution after analytic 
operator (#41902) (#41949)
7d99d5fcc48 is described below

commit 7d99d5fcc482c84efe9ad6236baa8dc49241dee5
Author: Gabriel <gabrielleeb...@gmail.com>
AuthorDate: Wed Oct 16 18:41:56 2024 +0800

    [fix](analytic) Fix data distribution after analytic operator (#41902) 
(#41949)
    
    Fix data distribution after analytic operator
    
    pick #41902
---
 be/src/pipeline/exec/analytic_sink_operator.h | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/be/src/pipeline/exec/analytic_sink_operator.h 
b/be/src/pipeline/exec/analytic_sink_operator.h
index 0269ba15be0..8fb3645daa8 100644
--- a/be/src/pipeline/exec/analytic_sink_operator.h
+++ b/be/src/pipeline/exec/analytic_sink_operator.h
@@ -101,17 +101,16 @@ public:
     DataDistribution required_data_distribution() const override {
         if (_partition_by_eq_expr_ctxs.empty()) {
             return {ExchangeType::PASSTHROUGH};
-        } else if (_order_by_eq_expr_ctxs.empty()) {
+        } else {
             return _is_colocate && _require_bucket_distribution && 
!_followed_by_shuffled_operator
                            ? 
DataDistribution(ExchangeType::BUCKET_HASH_SHUFFLE, _partition_exprs)
                            : DataDistribution(ExchangeType::HASH_SHUFFLE, 
_partition_exprs);
         }
-        return 
DataSinkOperatorX<AnalyticSinkLocalState>::required_data_distribution();
     }
 
     bool require_data_distribution() const override { return true; }
     bool require_shuffled_data_distribution() const override {
-        return !_partition_by_eq_expr_ctxs.empty() && 
_order_by_eq_expr_ctxs.empty();
+        return !_partition_by_eq_expr_ctxs.empty();
     }
 
 private:


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

Reply via email to