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 a7fef00334c [enhance](compaction) limit time series table max version
using maximum of current backend (#53244) (#53561)
a7fef00334c is described below
commit a7fef00334c97ab493132d8b81a3a50a5e5c2405
Author: Luwei <[email protected]>
AuthorDate: Mon Jul 21 16:52:22 2025 +0800
[enhance](compaction) limit time series table max version using maximum of
current backend (#53244) (#53561)
pick master #53244
---
be/src/olap/base_tablet.cpp | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/be/src/olap/base_tablet.cpp b/be/src/olap/base_tablet.cpp
index 9c5cbb9b184..bcb1e4baec9 100644
--- a/be/src/olap/base_tablet.cpp
+++ b/be/src/olap/base_tablet.cpp
@@ -19,6 +19,8 @@
#include <fmt/format.h>
+#include <algorithm>
+
#include "olap/cumulative_compaction_time_series_policy.h"
#include "olap/tablet_fwd.h"
#include "olap/tablet_schema_cache.h"
@@ -94,7 +96,8 @@ uint32_t BaseTablet::get_real_compaction_score() const {
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]
