From ba7baa7e6b5a8243aabbde7d2e030fdd7b2e17e1 Mon Sep 17 00:00:00 2001 From: TengJianPing <18241664+jacktengg@users.noreply.github.com> Date: Thu, 22 Aug 2024 17:26:51 +0800 Subject: [PATCH] [fix](window_funnel) fix upgrading problem caused by behaviour change of window_funnel (#39766) ## Proposed changes Issue Number: close #xxx For the latest published 2.1 version `2.1.5`: ``` max_be_exec_version=4; AGG_FUNCTION_NEW=2; ``` and `branch-2.1`: ``` max_be_exec_version=5; AGG_FUNCTION_NEW=2; ``` It will cause problem when upgrading. This PR fix the problem, set `AGG_FUNCTION_NEW` to `5`. --- .../vec/aggregate_functions/aggregate_function_simple_factory.h | 2 +- .../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 b879f829ea..2fab057f70 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 function_alias; /// @TEMPORARY: for be_exec_version=2 /// in order to solve agg of sum/count is not compatibility during the upgrade process - constexpr static int AGG_FUNCTION_NEW = 2; + constexpr static int AGG_FUNCTION_NEW = 5; /// @TEMPORARY: for be_exec_version < AGG_FUNCTION_NEW. replace function to old version. std::unordered_map 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 5e4eeba7c1..7b551c28ac 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