From 6bc3f317eeab1fc484142c9149483ff54a656788 Mon Sep 17 00:00:00 2001 From: Li0k Date: Tue, 20 Dec 2022 21:01:13 +0800 Subject: [PATCH] fix(storage): fix compile --- src/meta/src/hummock/compaction/level_selector.rs | 4 ++-- src/meta/src/hummock/compaction_schedule_policy.rs | 4 ++-- src/rpc_client/src/hummock_meta_client.rs | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/meta/src/hummock/compaction/level_selector.rs b/src/meta/src/hummock/compaction/level_selector.rs index de5d19576c089..8eb012961283c 100644 --- a/src/meta/src/hummock/compaction/level_selector.rs +++ b/src/meta/src/hummock/compaction/level_selector.rs @@ -299,8 +299,8 @@ impl LevelSelectorCore { / self.config.level0_tier_compact_file_number, ); - let total_size = levels.l0.as_ref().unwrap().total_file_size - - handlers[0].get_pending_output_file_size(ctx.base_level as u32); + let total_size = + levels.l0.as_ref().unwrap().total_file_size - handlers[0].get_pending_file_size(); if idle_file_count > 0 { // trigger intra-l0 compaction at first when the number of files is too large. let l0_score = diff --git a/src/meta/src/hummock/compaction_schedule_policy.rs b/src/meta/src/hummock/compaction_schedule_policy.rs index f5fb664c881c6..b6d45b7bbae7f 100644 --- a/src/meta/src/hummock/compaction_schedule_policy.rs +++ b/src/meta/src/hummock/compaction_schedule_policy.rs @@ -409,8 +409,8 @@ impl CompactionSchedulePolicy for ScoredPolicy { if last_idle_time.elapsed().as_secs() > MAX_IDLE_TIME { let decrease_core = self .score_to_compactor - .iter() - .map(|(_, compactor)| compactor.max_concurrent_task_number()) + .values() + .map(|compactor| compactor.max_concurrent_task_number()) .min() .unwrap_or(0); return ScalePolicy::ScaleIn(decrease_core); diff --git a/src/rpc_client/src/hummock_meta_client.rs b/src/rpc_client/src/hummock_meta_client.rs index ade3576ca6745..1af7c16eecb3b 100644 --- a/src/rpc_client/src/hummock_meta_client.rs +++ b/src/rpc_client/src/hummock_meta_client.rs @@ -20,7 +20,7 @@ use risingwave_hummock_sdk::{ }; use risingwave_pb::hummock::{ CompactTask, CompactTaskProgress, CompactionGroup, CompactorWorkload, HummockSnapshot, - HummockVersion, SubscribeCompactTasksResponse, VacuumTask, + HummockVersion, VacuumTask, }; use crate::error::Result;