Merge branch 'main' of https://github.com/risingwavelabs/risingwave i…

…nto li0k/storage_fix_correct_commit_ssts
risingwavelabs · Sep 5, 2024 · dd1c495 · dd1c495
2 parents 6ec7218 + f2f5827
commit dd1c495
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/src/storage/hummock_sdk/src/sstable_info.rs b/src/storage/hummock_sdk/src/sstable_info.rs
@@ -136,7 +136,7 @@ impl From<&PbSstableInfo> for SstableInfo {
 
 impl From<SstableInfo> for PbSstableInfo {
     fn from(sstable_info: SstableInfo) -> Self {
-        assert_ne!(0, sstable_info.sst_size);
+        assert!(sstable_info.sst_size > 0 || sstable_info.is_stripped());
         PbSstableInfo {
             object_id: sstable_info.object_id,
             sst_id: sstable_info.sst_id,
@@ -174,7 +174,7 @@ impl From<SstableInfo> for PbSstableInfo {
 
 impl From<&SstableInfo> for PbSstableInfo {
     fn from(sstable_info: &SstableInfo) -> Self {
-        assert_ne!(0, sstable_info.sst_size);
+        assert!(sstable_info.sst_size > 0 || sstable_info.is_stripped());
         PbSstableInfo {
             object_id: sstable_info.object_id,
             sst_id: sstable_info.sst_id,
@@ -212,3 +212,10 @@ impl SstableInfo {
         self.key_range = KeyRange::default();
     }
 }
+
+// Time travel
+impl SstableInfo {
+    pub fn is_stripped(&self) -> bool {
+        self.object_id == 0
+    }
+}