apply #8484

risingwavelabs · Mar 11, 2023 · 2aa8096 · 2aa8096
1 parent be833d3
commit 2aa8096
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/meta/src/hummock/manager/tests.rs b/src/meta/src/hummock/manager/tests.rs
@@ -1511,15 +1511,15 @@ async fn test_split_compaction_group_on_demand_basic() {
     assert_eq!(branched_ssts.len(), 2);
     for object_id in [10, 11] {
         assert_eq!(branched_ssts.get(&object_id).unwrap().len(), 1);
-        assert_eq!(
+        assert_ne!(
             branched_ssts
                 .get(&object_id)
                 .unwrap()
                 .get(&new_group_id)
                 .cloned()
                 .unwrap(),
             object_id,
-            "trivial adjust doesn't generate a new SST id"
+            "trivial adjust should also generate a new SST id"
         );
     }
 }

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
@@ -234,11 +234,11 @@ impl HummockVersionUpdateExt for HummockVersion {
                             .iter()
                             .all(|table_id| member_table_ids.contains(table_id));
                         let mut branch_table_info = sst_info.clone();
+                        branch_table_info.sst_id = new_sst_id;
+                        new_sst_id += 1;
                         if !is_trivial {
                             sst_info.sst_id = new_sst_id;
                             new_sst_id += 1;
-                            branch_table_info.sst_id = new_sst_id;
-                            new_sst_id += 1;
                         }
                         split_id_vers.push((
                             branch_table_info.get_object_id(),
@@ -285,11 +285,11 @@ impl HummockVersionUpdateExt for HummockVersion {
                         .iter()
                         .all(|table_id| member_table_ids.contains(table_id));
                     let mut branch_table_info = sst_info.clone();
+                    branch_table_info.sst_id = new_sst_id;
+                    new_sst_id += 1;
                     if !is_trivial {
                         sst_info.sst_id = new_sst_id;
                         new_sst_id += 1;
-                        branch_table_info.sst_id = new_sst_id;
-                        new_sst_id += 1;
                     }
                     split_id_vers.push((
                         branch_table_info.get_object_id(),