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 e4d6460b3c4 branch-2.1-pick: [Fix](SC) Prevent the values of
`__DORIS_VERSION_COL__` be wrongly replaced by fake version when merging tmp
rowset in sort SC #49193 (#49222)
e4d6460b3c4 is described below
commit e4d6460b3c400e7fb55cec76896cd7fc61d0707d
Author: bobhan1 <[email protected]>
AuthorDate: Wed Mar 19 17:33:25 2025 +0800
branch-2.1-pick: [Fix](SC) Prevent the values of `__DORIS_VERSION_COL__` be
wrongly replaced by fake version when merging tmp rowset in sort SC #49193
(#49222)
pick https://github.com/apache/doris/pull/49193
---
be/src/olap/schema_change.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/be/src/olap/schema_change.cpp b/be/src/olap/schema_change.cpp
index 969a287e993..351ca5e8a2f 100644
--- a/be/src/olap/schema_change.cpp
+++ b/be/src/olap/schema_change.cpp
@@ -586,7 +586,7 @@ Status
VSchemaChangeWithSorting::_inner_process(RowsetReaderSharedPtr rowset_rea
}
auto [rowset, guard] = DORIS_TRY(_internal_sorting(
- blocks, Version(_temp_delta_versions.second,
_temp_delta_versions.second),
+ blocks, Version(_temp_delta_versions.second,
_temp_delta_versions.second + 1),
newest_write_timestamp, new_tablet, BETA_ROWSET,
segments_overlap,
new_tablet_schema));
src_rowsets.push_back(std::move(rowset));
@@ -597,7 +597,7 @@ Status
VSchemaChangeWithSorting::_inner_process(RowsetReaderSharedPtr rowset_rea
blocks.clear();
// increase temp version
- _temp_delta_versions.second++;
+ _temp_delta_versions.second += 2;
return Status::OK();
};
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
