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
The following commit(s) were added to refs/heads/branch-3.0 by this push:
new 6afecea06da [Bug](compatibility) fix window funnel function coredump
when upgrade (#39648)
6afecea06da is described below
commit 6afecea06da312b0bf3c05d3c640cb08454e9e16
Author: zhangstar333 <87313068+zhangstar...@users.noreply.github.com>
AuthorDate: Wed Aug 21 14:57:52 2024 +0800
[Bug](compatibility) fix window funnel function coredump when upgrade
(#39648)
## Proposed changes
as the branch-2.1 is used the new impl of window funnel, and the
be_exec_version is 5
but in branch-3.0 this be_exec_version have update to 7, so when upgrade
from branch-2.1 to branch-3.0
maybe have error send the branch-3.0 version of version 7 to
branch-2.1([0---version--5])
<!--Describe your changes.-->
---
.../vec/aggregate_functions/aggregate_function_window_funnel.h | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
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 3368be9ecb0..5a31b88a69b 100644
--- a/be/src/vec/aggregate_functions/aggregate_function_window_funnel.h
+++ b/be/src/vec/aggregate_functions/aggregate_function_window_funnel.h
@@ -329,9 +329,11 @@ struct WindowFunnelState {
Status status;
std::string buff;
if (is_merge) {
+ // as the branch-2.1 is used the new impl of window funnel, and
the be_exec_version is 5
+ // but in branch-3.0 this be_exec_version have update to 7, so
when upgrade from branch-2.1 to branch-3.0
+ // maybe have error send the branch-3.0 version of version 7 to
branch-2.1([0---version--5])
status = block.serialize(
- BeExecVersionManager::get_newest_version(), &pblock,
&uncompressed_bytes,
- &compressed_bytes,
+ 5, &pblock, &uncompressed_bytes, &compressed_bytes,
segment_v2::CompressionTypePB::ZSTD); // ZSTD for better
compression ratio
} else {
Block tmp_block;
@@ -344,8 +346,7 @@ struct WindowFunnelState {
"event_" + std::to_string(i)});
}
status = tmp_block.serialize(
- BeExecVersionManager::get_newest_version(), &pblock,
&uncompressed_bytes,
- &compressed_bytes,
+ 5, &pblock, &uncompressed_bytes, &compressed_bytes,
segment_v2::CompressionTypePB::ZSTD); // ZSTD for better
compression ratio
}
if (!status.ok()) {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
