(doris) 03/05: [fix](window_funnel) fix problem when upgrading from 3.0 caused by behaviour change of window_funnel (#39739)

[da...@apache.org]

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

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

commit b67901343746c7817f127aa3b043b323d14e0bf5
Author: TengJianPing <18...@users.noreply.github.com>
AuthorDate: Wed Aug 28 13:37:47 2024 +0800

    [fix](window_funnel) fix problem when upgrading from 3.0 caused by behaviour change of window_funnel (#39739)
    
    ## Proposed changes
    
    Issue Number: close #xxx
    
    For version `3.0.1`:
    ```
    max_be_exec_version=6;
    AGG_FUNCTION_NEW=5;
    ```
    and master:
    ```
    max_be_exec_version=7;
    AGG_FUNCTION_NEW=5;
    ```
    
    It will cause coreump when upgrading from 3.0 to master.
    This PR fix the problem.
---
 be/src/vec/aggregate_functions/aggregate_function_simple_factory.h | 2 +-
 regression-test/suites/nereids_p0/aggregate/window_funnel.groovy   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/be/src/vec/aggregate_functions/aggregate_function_simple_factory.h b/be/src/vec/aggregate_functions/aggregate_function_simple_factory.h
index fbdc06c0503..ae9bd070a47 100644
--- a/be/src/vec/aggregate_functions/aggregate_function_simple_factory.h
+++ b/be/src/vec/aggregate_functions/aggregate_function_simple_factory.h
@@ -61,7 +61,7 @@ private:
     std::unordered_map<std::string, std::string> function_alias;
     /// @TEMPORARY: for be_exec_version=4
     /// in order to solve agg of sum/count is not compatibility during the upgrade process
-    constexpr static int AGG_FUNCTION_NEW = 5;
+    constexpr static int AGG_FUNCTION_NEW = 7;
     /// @TEMPORARY: for be_exec_version < AGG_FUNCTION_NEW. replace function to old version.
     std::unordered_map<std::string, std::string> function_to_replace;
 
diff --git a/regression-test/suites/nereids_p0/aggregate/window_funnel.groovy b/regression-test/suites/nereids_p0/aggregate/window_funnel.groovy
index 5e4eeba7c14..7b551c28ac2 100644
--- a/regression-test/suites/nereids_p0/aggregate/window_funnel.groovy
+++ b/regression-test/suites/nereids_p0/aggregate/window_funnel.groovy
@@ -595,7 +595,7 @@ suite("window_funnel") {
             event_timestamp datetime,
             phone_brand varchar(64),
             tab_num int
-        ) distributed by hash(user_id) buckets 3 properties("replication_num"="1");
+        ) distributed by hash(event_timestamp) buckets 3 properties("replication_num"="1");
     """
     sql """
         INSERT INTO windowfunnel_test VALUES


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