choer: more fix

Signed-off-by: discord9 <[email protected]>

Author: discord9

src/meta-srv/src/gc/handler.rs

@@ -441,14 +441,13 @@ impl GcScheduler {
         retry_round: usize,
     ) -> Result<(Region2Peers, Peer2Regions)> {
         let all_related_regions = self
-            .find_related_regions(&regions)
+            .find_related_regions(regions)
             .await?
             .into_iter()
-            .map(|(k, mut v)| {
+            .flat_map(|(k, mut v)| {
                 v.push(k);
                 v
             })
-            .flatten()
             .collect_vec();
         let mut region_to_peer = HashMap::new();
         let mut peer_to_regions = HashMap::new();
@@ -503,19 +502,19 @@ impl GcScheduler {
 
             // Find the region in the table route
             for region_route in &table_route.region_routes {
-                if region_route.region.id == region_id {
-                    if let Some(leader_peer) = &region_route.leader_peer {
-                        region_to_peer.insert(
-                            region_id,
-                            (leader_peer.clone(), region_route.follower_peers.clone()),
-                        );
-                        peer_to_regions
-                            .entry(leader_peer.clone())
-                            .or_default()
-                            .insert(region_id);
-                        found = true;
-                        break;
-                    }
+                if region_route.region.id == region_id
+                    && let Some(leader_peer) = &region_route.leader_peer
+                {
+                    region_to_peer.insert(
+                        region_id,
+                        (leader_peer.clone(), region_route.follower_peers.clone()),
+                    );
+                    peer_to_regions
+                        .entry(leader_peer.clone())
+                        .or_default()
+                        .insert(region_id);
+                    found = true;
+                    break;
                 }
             }
 

src/meta-srv/src/gc/mock/err_handle.rs

@@ -269,7 +269,7 @@ async fn test_get_table_route_failure() {
     let report = scheduler
         .process_datanodes_with_retry(datanode_to_candidates)
         .await;
-    dbg!(&report);
+
     // Should process the datanode but handle route error gracefully
     assert_eq!(
         report.per_datanode_reports.len(),

src/meta-srv/src/gc/mock/retry.rs

@@ -440,7 +440,6 @@ async fn test_need_retry_regions_exponential_backoff() {
     // Extract the datanode report from the job report
     let report = job_report.per_datanode_reports.get(&peer.id).unwrap();
 
-    dbg!(&report);
     // Verify results
     assert!(report.deleted_files.contains_key(&region_id));
     assert!(report.need_retry_regions.is_empty());