fix(storage): cherry-pick fix duplicated sst_id generated by split_ss…

…t function (#18432)
risingwavelabs · Sep 6, 2024 · a9ed85a · a9ed85a
1 parent 727ac73
commit a9ed85a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/meta/src/hummock/manager/commit_epoch.rs b/src/meta/src/hummock/manager/commit_epoch.rs
@@ -402,7 +402,7 @@ impl HummockManager {
                 }
             }
 
-            new_sst_id_number += group_table_ids.len();
+            new_sst_id_number += group_table_ids.len() * 2;
             sst_to_cg_vec.push((commit_sst, group_table_ids));
         }
 

diff --git a/src/storage/hummock_sdk/src/compaction_group/hummock_version_ext.rs b/src/storage/hummock_sdk/src/compaction_group/hummock_version_ext.rs
@@ -1330,7 +1330,8 @@ pub fn validate_version(version: &HummockVersion) -> Vec<String> {
 pub fn split_sst(sst_info: &mut SstableInfo, new_sst_id: &mut u64) -> SstableInfo {
     let mut branch_table_info = sst_info.clone();
     branch_table_info.sst_id = *new_sst_id;
-    sst_info.sst_id = *new_sst_id + 1;
+    *new_sst_id += 1;
+    sst_info.sst_id = *new_sst_id;
     *new_sst_id += 1;
 
     branch_table_info
-Original file line number
+Diff line change
@@ Expand Up / @@ -402,7 +402,7 @@ impl HummockManager { @@
                     }
                 }
-                new_sst_id_number += group_table_ids.len();
+                new_sst_id_number += group_table_ids.len() * 2;
                 sst_to_cg_vec.push((commit_sst, group_table_ids));
             }
@@ Expand Down @@