From 770400d98360f38a0163ecfc57a1de1a0bc12e34 Mon Sep 17 00:00:00 2001 From: Alex Chi Date: Tue, 30 Jan 2024 18:18:55 +0800 Subject: [PATCH] improve compaction concat iterator tests Signed-off-by: Alex Chi --- mini-lsm-mvcc/src/compact/leveled.rs | 14 -------------- mini-lsm/src/tests/harness.rs | 6 +++--- 2 files changed, 3 insertions(+), 17 deletions(-) diff --git a/mini-lsm-mvcc/src/compact/leveled.rs b/mini-lsm-mvcc/src/compact/leveled.rs index ac3097f..043bc92 100644 --- a/mini-lsm-mvcc/src/compact/leveled.rs +++ b/mini-lsm-mvcc/src/compact/leveled.rs @@ -119,20 +119,6 @@ impl LeveledCompactionController { } priorities.sort_by(|a, b| a.partial_cmp(b).unwrap().reverse()); - println!( - "target level sizes: {:?}, real level sizes: {:?}, base_level: {}", - target_level_size - .iter() - .map(|x| format!("{:.3}MB", *x as f64 / 1024.0 / 1024.0)) - .collect::>(), - real_level_size - .iter() - .map(|x| format!("{:.3}MB", *x as f64 / 1024.0 / 1024.0)) - .collect::>(), - base_level, - ); - println!("compaction triggered by priority: {:?}", priorities); - let priority = priorities.first(); if let Some((_, level)) = priority { println!( diff --git a/mini-lsm/src/tests/harness.rs b/mini-lsm/src/tests/harness.rs index a0e68aa..7987666 100644 --- a/mini-lsm/src/tests/harness.rs +++ b/mini-lsm/src/tests/harness.rs @@ -327,7 +327,7 @@ pub fn check_compaction_ratio(storage: Arc) { } assert!( num_iters <= l0_sst_num + num_memtables + max_levels, - "did you use concat iterators?" + "we found {num_iters} iterators in your implementation, (l0_sst_num={l0_sst_num}, num_memtables={num_memtables}, max_levels={max_levels}) did you use concat iterators?" ); } CompactionOptions::Leveled(LeveledCompactionOptions { @@ -355,7 +355,7 @@ pub fn check_compaction_ratio(storage: Arc) { } assert!( num_iters <= l0_sst_num + num_memtables + max_levels, - "did you use concat iterators?" + "we found {num_iters} iterators in your implementation, (l0_sst_num={l0_sst_num}, num_memtables={num_memtables}, max_levels={max_levels}) did you use concat iterators?" ); } CompactionOptions::Tiered(TieredCompactionOptions { @@ -397,7 +397,7 @@ pub fn check_compaction_ratio(storage: Arc) { } assert!( num_iters <= num_memtables + num_tiers, - "did you use concat iterators?" + "we found {num_iters} iterators in your implementation, (num_memtables={num_memtables}, num_tiers={num_tiers}) did you use concat iterators?" ); } }