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
commit 5ceccb5ba5dc01856ae6790d9f5762d40679fefe
Author: Jerry Hu <mrh...@gmail.com>
AuthorDate: Sat Mar 16 08:54:33 2024 +0800
[fix](compatibility) should enable windown funnel mode from 2.0 (#32284)
---
be/src/agent/be_exec_version_manager.h | 3 ++-
be/src/vec/aggregate_functions/aggregate_function_window_funnel.h | 4 ++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/be/src/agent/be_exec_version_manager.h
b/be/src/agent/be_exec_version_manager.h
index 0290e3bee32..470d78ee981 100644
--- a/be/src/agent/be_exec_version_manager.h
+++ b/be/src/agent/be_exec_version_manager.h
@@ -60,8 +60,9 @@ private:
* e. add repeat_max_num in repeat function
* 3: start from doris 2.0 (by some mistakes)
* a. aggregation function do not serialize bitmap to string.
+ * b. support window funnel mode.
* 4: start from doris 2.1
- * a. support window funnel mode from 2.0
+ * a. ignore this line, window funnel mode should be enabled from 2.0.
* b. array contains/position/countequal function return nullable in less
situations.
* c. cleared old version of Version 2.
* d. unix_timestamp function support timestamp with float for datetimev2,
and change nullable mode.
diff --git a/be/src/vec/aggregate_functions/aggregate_function_window_funnel.h
b/be/src/vec/aggregate_functions/aggregate_function_window_funnel.h
index ed4c9aed059..9356cfd4b68 100644
--- a/be/src/vec/aggregate_functions/aggregate_function_window_funnel.h
+++ b/be/src/vec/aggregate_functions/aggregate_function_window_funnel.h
@@ -270,8 +270,8 @@ public:
void create(AggregateDataPtr __restrict place) const override {
auto data = new (place) WindowFunnelState<DateValueType, NativeType>();
- /// support window funnel mode from 2.1. See
`BeExecVersionManager::max_be_exec_version`
- data->enable_mode = version >= USE_NEW_SERDE;
+ /// support window funnel mode from 2.0. See
`BeExecVersionManager::max_be_exec_version`
+ data->enable_mode = version >= 3;
}
String get_name() const override { return "window_funnel"; }
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
