fix

Author: lxy-9602

include/paimon/defs.h

@@ -291,13 +291,13 @@ struct PAIMON_EXPORT Options {
     static const char SCAN_TAG_NAME[];
     /// "compaction.optimization-interval" - Implying how often to perform an optimization
     /// compaction, this configuration is used to ensure the query timeliness of the read-optimized
-    /// system table.
+    /// system table. No default value.
     static const char COMPACTION_OPTIMIZATION_INTERVAL[];
     /// "compaction.total-size-threshold" - When total size is smaller than this threshold, force a
-    /// full compaction.
+    /// full compaction. No default value.
     static const char COMPACTION_TOTAL_SIZE_THRESHOLD[];
     /// "compaction.incremental-size-threshold" - When incremental size is bigger than this
-    /// threshold, force a full compaction.
+    /// threshold, force a full compaction. No default value.
     static const char COMPACTION_INCREMENTAL_SIZE_THRESHOLD[];
     /// "compaction.offpeak.start.hour" - The start of off-peak hours, expressed as an integer
     /// between 0 and 23, inclusive. Set to -1 to disable off-peak. Default is -1.

src/paimon/core/mergetree/compact/early_full_compaction.cpp

@@ -64,6 +64,7 @@ std::optional<CompactUnit> EarlyFullCompaction::TryFullCompact(
             total_size += run.run.TotalSize();
         }
         if (total_size < total_size_threshold_.value()) {
+            UpdateLastFullCompaction();
             return CompactUnit::FromLevelRuns(max_level, runs);
         }
     }
@@ -75,6 +76,7 @@ std::optional<CompactUnit> EarlyFullCompaction::TryFullCompact(
             }
         }
         if (incremental_size > incremental_size_threshold_.value()) {
+            UpdateLastFullCompaction();
             return CompactUnit::FromLevelRuns(max_level, runs);
         }
     }

src/paimon/core/mergetree/compact/early_full_compaction_test.cpp

@@ -208,4 +208,58 @@ TEST_F(EarlyFullCompactionTest, TestThresholdTriggersWhenIntervalFails) {
     ASSERT_FALSE(early_full_compaction.TryFullCompact(/*num_levels=*/5, runs));
 }
 
+TEST_F(EarlyFullCompactionTest, TestUpdateLastWhenFullCompactIsTriggeredByTotalSize) {
+    int64_t current_time = 10000l;
+
+    TestableEarlyFullCompaction early_full_compaction(/*full_compaction_interval=*/1000l,
+                                                      /*total_size_threshold=*/500l,
+                                                      /*incremental_size_threshold=*/std::nullopt,
+                                                      &current_time);
+    // First time, interval should trigger even if size (600) > threshold (500)
+    auto runs = CreateRuns({300l, 300l});
+    auto compact_unit = early_full_compaction.TryFullCompact(/*num_levels=*/5, runs);
+    ASSERT_TRUE(compact_unit);
+    ASSERT_EQ(compact_unit->output_level, 4);
+
+    current_time = 10100l;
+    // Second time, compaction triggered by total_size_threshold
+    runs = CreateRuns({300l, 100l});
+    compact_unit = early_full_compaction.TryFullCompact(/*num_levels=*/5, runs);
+    ASSERT_TRUE(compact_unit);
+    ASSERT_EQ(compact_unit->output_level, 4);
+
+    current_time = 11001l;
+    // Third time, compaction cannot be triggered as 11001 - 10100 < 1000 full_compaction_interval
+    runs = CreateRuns({300l, 300l});
+    compact_unit = early_full_compaction.TryFullCompact(/*num_levels=*/5, runs);
+    ASSERT_FALSE(compact_unit);
+}
+
+TEST_F(EarlyFullCompactionTest, TestUpdateLastWhenFullCompactIsTriggeredByIncSize) {
+    int64_t current_time = 10000l;
+
+    TestableEarlyFullCompaction early_full_compaction(/*full_compaction_interval=*/1000l,
+                                                      /*total_size_threshold=*/std::nullopt,
+                                                      /*incremental_size_threshold=*/500,
+                                                      &current_time);
+    // First time, interval should trigger even if size (400) < threshold (500)
+    std::vector<LevelSortedRun> runs = {CreateLevelSortedRun(0, 300), CreateLevelSortedRun(0, 100)};
+    auto compact_unit = early_full_compaction.TryFullCompact(/*num_levels=*/5, runs);
+    ASSERT_TRUE(compact_unit);
+    ASSERT_EQ(compact_unit->output_level, 4);
+
+    current_time = 10100l;
+    // Second time, compaction triggered by total_size_threshold
+    runs = {CreateLevelSortedRun(0, 300), CreateLevelSortedRun(0, 300)};
+    compact_unit = early_full_compaction.TryFullCompact(/*num_levels=*/5, runs);
+    ASSERT_TRUE(compact_unit);
+    ASSERT_EQ(compact_unit->output_level, 4);
+
+    current_time = 11001l;
+    // Third time, compaction cannot be triggered as 11001 - 10100 < 1000 full_compaction_interval
+    runs = {CreateLevelSortedRun(0, 300), CreateLevelSortedRun(0, 100)};
+    compact_unit = early_full_compaction.TryFullCompact(/*num_levels=*/5, runs);
+    ASSERT_FALSE(compact_unit);
+}
+
 }  // namespace paimon::test