Revert "fix(compaction): fix compatible for vnode partition (#14489)"

This reverts commit 4b229af.

proto/hummock.proto

@@ -144,6 +144,7 @@ message HummockVersion {
     uint64 group_id = 3;
     uint64 parent_group_id = 4;
     repeated uint32 member_table_ids = 5;
+    uint32 vnode_partition_count = 6;
   }
   uint64 id = 1;
   // Levels of each compaction group

src/meta/src/hummock/compaction/picker/base_level_compaction_picker.rs

@@ -66,15 +66,15 @@ impl CompactionPicker for LevelCompactionPicker {
             level_handlers,
             stats,
         ) {
-            ret.vnode_partition_count = self.config.split_weight_by_vnode;
+            ret.vnode_partition_count = levels.vnode_partition_count;
             return Some(ret);
         }
 
         debug_assert!(self.target_level == levels.get_level(self.target_level).level_idx as usize);
         if let Some(ret) = self.pick_multi_level_to_base(
             l0,
             levels.get_level(self.target_level),
-            self.config.split_weight_by_vnode,
+            levels.vnode_partition_count,
             level_handlers,
             stats,
         ) {

src/meta/src/hummock/compaction/picker/intra_compaction_picker.rs

@@ -57,7 +57,7 @@ impl CompactionPicker for IntraCompactionPicker {
             return None;
         }
 
-        let vnode_partition_count = self.config.split_weight_by_vnode;
+        let vnode_partition_count = levels.vnode_partition_count;
 
         if let Some(ret) =
             self.pick_whole_level(l0, &level_handlers[0], vnode_partition_count, stats)

src/meta/src/hummock/compaction/picker/min_overlap_compaction_picker.rs

@@ -28,7 +28,6 @@ pub struct MinOverlappingPicker {
     level: usize,
     target_level: usize,
     max_select_bytes: u64,
-    vnode_partition_count: u32,
     overlap_strategy: Arc<dyn OverlapStrategy>,
 }
 
@@ -37,14 +36,12 @@ impl MinOverlappingPicker {
         level: usize,
         target_level: usize,
         max_select_bytes: u64,
-        vnode_partition_count: u32,
         overlap_strategy: Arc<dyn OverlapStrategy>,
     ) -> MinOverlappingPicker {
         MinOverlappingPicker {
             level,
             target_level,
             max_select_bytes,
-            vnode_partition_count,
             overlap_strategy,
         }
     }
@@ -166,7 +163,7 @@ impl CompactionPicker for MinOverlappingPicker {
                 },
             ],
             target_level: self.target_level,
-            vnode_partition_count: self.vnode_partition_count,
+            vnode_partition_count: levels.vnode_partition_count,
             ..Default::default()
         })
     }
@@ -428,7 +425,7 @@ pub mod tests {
     #[test]
     fn test_compact_l1() {
         let mut picker =
-            MinOverlappingPicker::new(1, 2, 10000, 0, Arc::new(RangeOverlapStrategy::default()));
+            MinOverlappingPicker::new(1, 2, 10000, Arc::new(RangeOverlapStrategy::default()));
         let levels = vec![
             Level {
                 level_idx: 1,
@@ -500,7 +497,7 @@ pub mod tests {
     #[test]
     fn test_expand_l1_files() {
         let mut picker =
-            MinOverlappingPicker::new(1, 2, 10000, 0, Arc::new(RangeOverlapStrategy::default()));
+            MinOverlappingPicker::new(1, 2, 10000, Arc::new(RangeOverlapStrategy::default()));
         let levels = vec![
             Level {
                 level_idx: 1,
@@ -825,7 +822,7 @@ pub mod tests {
         ];
         // no limit
         let picker =
-            MinOverlappingPicker::new(2, 3, 1000, 0, Arc::new(RangeOverlapStrategy::default()));
+            MinOverlappingPicker::new(2, 3, 1000, Arc::new(RangeOverlapStrategy::default()));
         let (select_files, target_files) = picker.pick_tables(
             &levels[1].table_infos,
             &levels[2].table_infos,

src/meta/src/hummock/compaction/picker/tier_compaction_picker.rs

@@ -155,12 +155,7 @@ impl CompactionPicker for TierCompactionPicker {
             return None;
         }
 
-        self.pick_overlapping_level(
-            l0,
-            &level_handlers[0],
-            self.config.split_weight_by_vnode,
-            stats,
-        )
+        self.pick_overlapping_level(l0, &level_handlers[0], levels.vnode_partition_count, stats)
     }
 }
 

src/meta/src/hummock/compaction/selector/level_selector.rs

@@ -121,7 +121,6 @@ impl DynamicLevelSelectorCore {
                     picker_info.select_level,
                     picker_info.target_level,
                     self.config.max_bytes_for_level_base / 2,
-                    self.config.split_weight_by_vnode,
                     overlap_strategy,
                 ))
             }
@@ -246,7 +245,7 @@ impl DynamicLevelSelectorCore {
                 .sub_levels
                 .iter()
                 .filter(|level| {
-                    level.vnode_partition_count == self.config.split_weight_by_vnode
+                    level.vnode_partition_count == levels.vnode_partition_count
                         && level.level_type() == LevelType::Nonoverlapping
                 })
                 .map(|level| level.total_file_size)

src/meta/src/hummock/manager/mod.rs

@@ -1062,7 +1062,11 @@ impl HummockManager {
         } else {
             table_to_vnode_partition
                 .retain(|table_id, _| compact_task.existing_table_ids.contains(table_id));
-            if group_config.compaction_config.split_weight_by_vnode > 0 {
+            if current_version
+                .get_compaction_group_levels(compaction_group_id)
+                .vnode_partition_count
+                > 0
+            {
                 for table_id in &compact_task.existing_table_ids {
                     table_to_vnode_partition
                         .entry(*table_id)

src/storage/hummock_sdk/src/compaction_group/hummock_version_ext.rs

@@ -831,6 +831,7 @@ pub fn build_initial_compaction_group_levels(
         group_id,
         parent_group_id: StaticCompactionGroupId::NewCompactionGroup as _,
         member_table_ids: vec![],
+        vnode_partition_count: compaction_config.split_weight_by_vnode,
     }
 }