From db04c18f8af212306571e6f2cb43027a42c10862 Mon Sep 17 00:00:00 2001
From: Little-Wallace <bupt2013211450@gmail.com>
Date: Thu, 18 Jan 2024 16:37:59 +0800
Subject: [PATCH] do not compact just compacted result

Signed-off-by: Little-Wallace <bupt2013211450@gmail.com>
---
 proto/hummock.proto                                    |  2 ++
 src/common/src/config.rs                               |  4 ++++
 src/meta/src/hummock/compaction/compaction_config.rs   |  1 +
 .../picker/tombstone_reclaim_compaction_picker.rs      | 10 +++++++++-
 src/meta/src/hummock/manager/mod.rs                    |  4 ++++
 src/storage/src/hummock/sstable/builder.rs             |  1 +
 6 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/proto/hummock.proto b/proto/hummock.proto
index 1ff11077645d9..e0d3921440e60 100644
--- a/proto/hummock.proto
+++ b/proto/hummock.proto
@@ -28,6 +28,7 @@ message SstableInfo {
   uint64 uncompressed_file_size = 11;
   uint64 range_tombstone_count = 12;
   BloomFilterType bloom_filter_kind = 13;
+  uint64 create_time = 14;
 }
 
 enum LevelType {
@@ -831,6 +832,7 @@ message CompactionConfig {
   uint32 level0_overlapping_sub_level_compact_level_count = 18;
   uint32 tombstone_reclaim_ratio = 19;
   bool enable_emergency_picker = 20;
+  uint64 min_keep_alive_time_secs = 21;
 }
 
 message TableStats {
diff --git a/src/common/src/config.rs b/src/common/src/config.rs
index 1358105659b78..3eaa0a7251cfe 100644
--- a/src/common/src/config.rs
+++ b/src/common/src/config.rs
@@ -1459,6 +1459,10 @@ pub mod default {
         pub fn enable_emergency_picker() -> bool {
             DEFAULT_EMERGENCY_PICKER
         }
+
+        pub fn min_keep_alive_time_secs() -> u64 {
+            1200 // 20min
+        }
     }
 
     pub mod object_store_config {
diff --git a/src/meta/src/hummock/compaction/compaction_config.rs b/src/meta/src/hummock/compaction/compaction_config.rs
index 6048e301c97d6..05fb3c9a30283 100644
--- a/src/meta/src/hummock/compaction/compaction_config.rs
+++ b/src/meta/src/hummock/compaction/compaction_config.rs
@@ -66,6 +66,7 @@ impl CompactionConfigBuilder {
                     compaction_config::level0_overlapping_sub_level_compact_level_count(),
                 tombstone_reclaim_ratio: compaction_config::tombstone_reclaim_ratio(),
                 enable_emergency_picker: compaction_config::enable_emergency_picker(),
+                min_keep_alive_time_secs: compaction_config::min_keep_alive_time_secs(),
             },
         }
     }
diff --git a/src/meta/src/hummock/compaction/picker/tombstone_reclaim_compaction_picker.rs b/src/meta/src/hummock/compaction/picker/tombstone_reclaim_compaction_picker.rs
index f07a8872c9b03..bdd090c202853 100644
--- a/src/meta/src/hummock/compaction/picker/tombstone_reclaim_compaction_picker.rs
+++ b/src/meta/src/hummock/compaction/picker/tombstone_reclaim_compaction_picker.rs
@@ -14,6 +14,7 @@
 
 use std::sync::Arc;
 
+use risingwave_common::util::epoch::Epoch;
 use risingwave_pb::hummock::hummock_version::Levels;
 use risingwave_pb::hummock::InputLevel;
 
@@ -25,6 +26,7 @@ pub struct TombstoneReclaimCompactionPicker {
     overlap_strategy: Arc<dyn OverlapStrategy>,
     delete_ratio: u64,
     range_delete_ratio: u64,
+    min_keep_alive_time_secs: u64,
 }
 
 #[derive(Default)]
@@ -37,11 +39,13 @@ impl TombstoneReclaimCompactionPicker {
         overlap_strategy: Arc<dyn OverlapStrategy>,
         delete_ratio: u64,
         range_delete_ratio: u64,
+        min_keep_alive_time_secs: u64,
     ) -> Self {
         Self {
             overlap_strategy,
             delete_ratio,
             range_delete_ratio,
+            min_keep_alive_time_secs,
         }
     }
 
@@ -55,6 +59,7 @@ impl TombstoneReclaimCompactionPicker {
         if state.last_level == 0 {
             state.last_level = 1;
         }
+        let current_time = Epoch::physical_now() / 1000;
 
         while state.last_level <= levels.levels.len() {
             let mut select_input_ssts = vec![];
@@ -62,7 +67,10 @@ impl TombstoneReclaimCompactionPicker {
                 let need_reclaim = (sst.range_tombstone_count * 100
                     >= sst.total_key_count * self.range_delete_ratio)
                     || (sst.stale_key_count * 100 >= sst.total_key_count * self.delete_ratio);
-                if !need_reclaim || level_handlers[state.last_level].is_pending_compact(&sst.sst_id)
+                let shall_keep = sst.create_time + self.min_keep_alive_time_secs > current_time;
+                if !need_reclaim
+                    || shall_keep
+                    || level_handlers[state.last_level].is_pending_compact(&sst.sst_id)
                 {
                     continue;
                 }
diff --git a/src/meta/src/hummock/manager/mod.rs b/src/meta/src/hummock/manager/mod.rs
index 57903711ec957..702df2b2ae693 100644
--- a/src/meta/src/hummock/manager/mod.rs
+++ b/src/meta/src/hummock/manager/mod.rs
@@ -1341,10 +1341,14 @@ impl HummockManager {
             }
         };
 
+        let task_end_time = Epoch::physical_now() / 1000;
         {
             // apply result
             compact_task.set_task_status(task_status);
             compact_task.sorted_output_ssts = sorted_output_ssts;
+            for sst in &mut compact_task.sorted_output_ssts {
+                sst.create_time = task_end_time;
+            }
         }
 
         let is_trivial_reclaim = CompactStatus::is_trivial_reclaim(&compact_task);
diff --git a/src/storage/src/hummock/sstable/builder.rs b/src/storage/src/hummock/sstable/builder.rs
index 9202b3ec28788..aada4af72b246 100644
--- a/src/storage/src/hummock/sstable/builder.rs
+++ b/src/storage/src/hummock/sstable/builder.rs
@@ -639,6 +639,7 @@ impl<W: SstableWriter, F: FilterBuilder> SstableBuilder<W, F> {
             uncompressed_file_size: uncompressed_file_size + meta.encoded_size() as u64,
             min_epoch: cmp::min(min_epoch, tombstone_min_epoch),
             max_epoch: cmp::max(max_epoch, tombstone_max_epoch),
+            create_time: 0,
             range_tombstone_count: meta.monotonic_tombstone_events.len() as u64,
         };
         tracing::trace!(