This is an automated email from the ASF dual-hosted git repository.
yiguolei 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 ba7baa7e6b5 [fix](window_funnel) fix upgrading problem caused by
behaviour change of window_funnel (#39766)
ba7baa7e6b5 is described below
commit ba7baa7e6b5a8243aabbde7d2e030fdd7b2e17e1
Author: TengJianPing <18241664+jackte...@users.noreply.github.com>
AuthorDate: Thu Aug 22 17:26:51 2024 +0800
[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`.
---
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 b879f829ea9..2fab057f70a 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=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<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-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
