This is an automated email from the ASF dual-hosted git repository.
morrysnow pushed a commit to branch branch-3.1
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-3.1 by this push:
new 178ce2d5e00 branch-3.1: [enhance](compaction) limit time series table
max version using maximum of current backend #53244 (#53564)
178ce2d5e00 is described below
commit 178ce2d5e0054a2cc9482952654736e070c71db1
Author: Luwei <[email protected]>
AuthorDate: Sat Jul 19 09:30:40 2025 +0800
branch-3.1: [enhance](compaction) limit time series table max version using
maximum of current backend #53244 (#53564)
pick master #53244
---
be/src/olap/base_tablet.cpp | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/be/src/olap/base_tablet.cpp b/be/src/olap/base_tablet.cpp
index febe489a033..ea588769342 100644
--- a/be/src/olap/base_tablet.cpp
+++ b/be/src/olap/base_tablet.cpp
@@ -21,6 +21,7 @@
#include <fmt/format.h>
#include <rapidjson/prettywriter.h>
+#include <algorithm>
#include <random>
#include <shared_mutex>
@@ -2059,7 +2060,8 @@ void TabletReadSource::fill_delete_predicates() {
int32_t BaseTablet::max_version_config() {
int32_t max_version = tablet_meta()->compaction_policy() ==
CUMULATIVE_TIME_SERIES_POLICY
- ? config::time_series_max_tablet_version_num
+ ?
std::max(config::time_series_max_tablet_version_num,
+ config::max_tablet_version_num)
: config::max_tablet_version_num;
return max_version;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
