From cfa7c0c2af1a655c3d30cb61b471c4c203cb06da Mon Sep 17 00:00:00 2001 From: Alex Chi Date: Fri, 19 Jan 2024 17:44:38 +0800 Subject: [PATCH] fix warnings Signed-off-by: Alex Chi --- mini-lsm/src/compact.rs | 2 +- mini-lsm/src/lsm_storage.rs | 4 ++-- mini-lsm/src/manifest.rs | 2 +- mini-lsm/src/mem_table.rs | 1 - mini-lsm/src/wal.rs | 2 +- 5 files changed, 5 insertions(+), 6 deletions(-) diff --git a/mini-lsm/src/compact.rs b/mini-lsm/src/compact.rs index ec063f3..9047f17 100644 --- a/mini-lsm/src/compact.rs +++ b/mini-lsm/src/compact.rs @@ -20,7 +20,7 @@ use crate::manifest::ManifestRecord; use crate::table::{SsTable, SsTableBuilder, SsTableIterator}; #[derive(Debug, Serialize, Deserialize)] -pub(crate) enum CompactionTask { +pub enum CompactionTask { Leveled(LeveledCompactionTask), Tiered(TieredCompactionTask), Simple(SimpleLeveledCompactionTask), diff --git a/mini-lsm/src/lsm_storage.rs b/mini-lsm/src/lsm_storage.rs index 96d7568..83162b4 100644 --- a/mini-lsm/src/lsm_storage.rs +++ b/mini-lsm/src/lsm_storage.rs @@ -1,4 +1,4 @@ -use std::collections::{BTreeSet, HashMap, HashSet}; +use std::collections::{BTreeSet, HashMap}; use std::fs::File; use std::ops::Bound; use std::path::{Path, PathBuf}; @@ -20,7 +20,7 @@ use crate::iterators::StorageIterator; use crate::lsm_iterator::{FusedIterator, LsmIterator}; use crate::manifest::{Manifest, ManifestRecord}; use crate::mem_table::{map_bound, MemTable}; -use crate::table::{self, FileObject, SsTable, SsTableBuilder, SsTableIterator}; +use crate::table::{FileObject, SsTable, SsTableBuilder, SsTableIterator}; pub type BlockCache = moka::sync::Cache<(usize, usize), Arc>; diff --git a/mini-lsm/src/manifest.rs b/mini-lsm/src/manifest.rs index a71e61c..6e41a69 100644 --- a/mini-lsm/src/manifest.rs +++ b/mini-lsm/src/manifest.rs @@ -67,7 +67,7 @@ impl Manifest { pub fn add_record_when_init(&self, record: ManifestRecord) -> Result<()> { let mut file = self.file.lock(); let buf = serde_json::to_vec(&record)?; - file.write(&buf)?; + file.write_all(&buf)?; file.sync_all()?; Ok(()) } diff --git a/mini-lsm/src/mem_table.rs b/mini-lsm/src/mem_table.rs index fb6fbc8..08a0490 100644 --- a/mini-lsm/src/mem_table.rs +++ b/mini-lsm/src/mem_table.rs @@ -1,6 +1,5 @@ use std::ops::Bound; use std::path::Path; -use std::sync::atomic::AtomicBool; use std::sync::Arc; use anyhow::Result; diff --git a/mini-lsm/src/wal.rs b/mini-lsm/src/wal.rs index b26f3c6..e14d53c 100644 --- a/mini-lsm/src/wal.rs +++ b/mini-lsm/src/wal.rs @@ -58,7 +58,7 @@ impl Wal { buf.put_slice(key); buf.put_u16(value.len() as u16); buf.put_slice(value); - file.write(&buf)?; + file.write_all(&buf)?; Ok(()) }