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 3f04357905e [enhance](compaction) limit time series table max version
using maximum of current backend (#53244) (#53562)
3f04357905e is described below
commit 3f04357905e156c1ff885688ca38db0220dddfce
Author: Luwei <[email protected]>
AuthorDate: Fri Jul 18 20:41:02 2025 +0800
[enhance](compaction) limit time series table max version using maximum of
current backend (#53244) (#53562)
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 56ffc2d100e..6738a9c41c2 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>
@@ -1718,7 +1719,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]
