feat(version): impl Trait Display for Version (#36)

* feat(cli): add api for printing sst arrangement status * feat(version): impl Trait `Display` for `Version` --------- Co-authored-by: Xwg <[email protected]> Co-authored-by: Kould <[email protected]>
KipData · Jul 14, 2023 · 73271ae · 73271ae
1 parent 11c12e6
commit 73271ae
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 16 deletions.
diff --git a/src/kernel/lsm/compactor.rs b/src/kernel/lsm/compactor.rs
@@ -299,7 +299,6 @@ impl Compactor {
  }
 }
 
-/// TODO: Manual\Seek Compaction测试
 #[cfg(test)]
 mod tests {
  use crate::kernel::io::{FileExtension, IoFactory, IoType};
@@ -592,7 +591,7 @@ mod tests {
  let version_2 = version_status.current().await;
  let level_slice = &version_2.level_slice;
 
- println!("SeekCompaction Test: {:#?}", level_slice);
+ println!("SeekCompaction Test: {version_2}");
  assert!(!level_slice[1].is_empty());
  assert!(!level_slice[2].is_empty());
 

diff --git a/src/kernel/lsm/version/mod.rs b/src/kernel/lsm/version/mod.rs
@@ -11,6 +11,7 @@ use crate::kernel::lsm::version::edit::{EditType, VersionEdit};
 use crate::kernel::lsm::version::meta::VersionMeta;
 use crate::kernel::{sorted_gen_list, Result};
 use itertools::Itertools;
+use std::fmt;
 use std::sync::Arc;
 use tokio::sync::mpsc::UnboundedSender;
 use tracing::{error, info};
@@ -101,7 +102,7 @@ impl Version {
  };
 
  version.apply(vec_log)?;
- version_display(&version, "load_from_log");
+ info!("[Version][load_from_log]: {version}");
 
  Ok(version)
  }
@@ -297,6 +298,29 @@ impl Version {
  }
 }
 
+impl fmt::Display for Version {
+ fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+ writeln!(f, "Version: {}", self.version_num)?;
+
+ for level in 0..7 {
+ writeln!(f, "Level {level}:")?;
+ write!(f, "\t")?;
+ for scope in &self.level_slice[level] {
+ write!(
+ f,
+ "[gen: {}, scope:({:?},{:?})]\t",
+ scope.gen(),
+ scope.start,
+ scope.end
+ )?;
+ }
+ writeln!(f)?;
+ }
+
+ writeln!(f, "{:#?}", self.meta_data)
+ }
+}
+
 impl Drop for Version {
  /// 将此Version可删除的版本号发送
  fn drop(&mut self) {
@@ -312,14 +336,3 @@ impl Drop for Version {
  }
  }
 }
-
-/// 使用特定格式进行display
-pub(crate) fn version_display(new_version: &Version, method: &str) {
- info!(
- "[Version: {}]: version_num: {}, len: {}, size_of_disk: {}",
- method,
- new_version.version_num,
- new_version.len(),
- new_version.size_of_disk(),
- );
-}
diff --git a/src/kernel/lsm/version/status.rs b/src/kernel/lsm/version/status.rs
@@ -5,7 +5,7 @@ use crate::kernel::lsm::table::loader::TableLoader;
 use crate::kernel::lsm::version::cleaner::Cleaner;
 use crate::kernel::lsm::version::edit::VersionEdit;
 use crate::kernel::lsm::version::{
- snapshot_gen, version_display, Version, DEFAULT_SS_TABLE_PATH, DEFAULT_VERSION_PATH,
+ snapshot_gen, Version, DEFAULT_SS_TABLE_PATH, DEFAULT_VERSION_PATH,
 };
 use crate::kernel::Result;
 use itertools::Itertools;
@@ -83,7 +83,7 @@ impl VersionStatus {
  ) -> Result<()> {
  let mut new_version = Version::clone(self.current().await.as_ref());
  let mut inner = self.inner.write().await;
- version_display(&new_version, "log_and_apply");
+ info!("[Version Status][log_and_apply]: {new_version}");
 
  if self.edit_approximate_count.load(Ordering::Relaxed) >= snapshot_threshold {
  Self::write_snap_shot(&mut inner, &self.log_factory).await?;