This is an automated email from the ASF dual-hosted git repository.

dataroaring pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris.git


The following commit(s) were added to refs/heads/master by this push:
     new f30ee0ff8b3 [enhance](compaction) limit time series table max version 
using maximum of current backend (#53244)
f30ee0ff8b3 is described below

commit f30ee0ff8b308ffeda7d883e979e2225373c2170
Author: Luwei <[email protected]>
AuthorDate: Thu Jul 17 12:09:15 2025 +0800

    [enhance](compaction) limit time series table max version using maximum of 
current backend (#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 36d4d62a323..a78bc400ba0 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 <cstdint>
 #include <iterator>
 #include <random>
@@ -2113,7 +2114,8 @@ void BaseTablet::get_base_rowset_delete_bitmap_count(
 
 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]

Reply via email to