From 22491094cb5e7c7f050c6b4814bbbe31a3395782 Mon Sep 17 00:00:00 2001 From: Alex Chi Date: Thu, 18 Jan 2024 14:55:43 +0800 Subject: [PATCH] fix compaction task info header Signed-off-by: Alex Chi --- mini-lsm/src/bin/compaction_simulator.rs | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/mini-lsm/src/bin/compaction_simulator.rs b/mini-lsm/src/bin/compaction_simulator.rs index 328bf1e..c41bbb3 100644 --- a/mini-lsm/src/bin/compaction_simulator.rs +++ b/mini-lsm/src/bin/compaction_simulator.rs @@ -241,8 +241,10 @@ fn main() { storage.dump_original_id(true, false); } let mut num_compactions = 0; - while let Some(task) = controller.generate_compaction_task(&storage.snapshot) { + while let Some(task) = { println!("--- Compaction Task ---"); + controller.generate_compaction_task(&storage.snapshot) + } { let mut sst_ids = Vec::new(); for file in task .upper_level_sst_ids @@ -339,7 +341,10 @@ fn main() { } println!("--- Compaction Task ---"); let mut num_compactions = 0; - while let Some(task) = controller.generate_compaction_task(&storage.snapshot) { + while let Some(task) = { + println!("--- Compaction Task ---"); + controller.generate_compaction_task(&storage.snapshot) + } { let mut sst_ids = Vec::new(); for (tier_id, files) in &task.tiers { for file in files { @@ -440,7 +445,10 @@ fn main() { storage.dump_original_id(false, true); } let mut num_compactions = 0; - while let Some(task) = controller.generate_compaction_task(&storage.snapshot) { + while let Some(task) = { + println!("--- Compaction Task ---"); + controller.generate_compaction_task(&storage.snapshot) + } { let mut sst_ids = Vec::new(); let split_num = task.upper_level_sst_ids.len() + task.lower_level_sst_ids.len(); let mut first_keys = Vec::new(); @@ -529,7 +537,7 @@ fn main() { storage.dump_original_id(true, true); } num_compactions += 1; - if num_compactions >= storage.file_list.len() * max_levels { + if num_compactions >= level0_file_num_compaction_trigger * max_levels * 2 { panic!("compaction does not converge?"); } }