remove some single-use imports

Author: marvin-j97

src/abstract.rs

@@ -3,18 +3,10 @@
 // (found in the LICENSE-* files in the repository)
 
 use crate::{
-    blob_tree::FragmentationMap,
-    compaction::CompactionStrategy,
-    config::TreeType,
-    iter_guard::IterGuardImpl,
-    table::Table,
-    tree::inner::MemtableId,
-    version::{SuperVersions, Version},
-    vlog::BlobFile,
-    AnyTree, BlobTree, Config, Guard, InternalValue, KvPair, Memtable, SeqNo,
-    SequenceNumberCounter, TableId, Tree, TreeId, UserKey, UserValue,
+    iter_guard::IterGuardImpl, table::Table, version::Version, vlog::BlobFile, AnyTree, BlobTree,
+    Config, Guard, InternalValue, KvPair, Memtable, SeqNo, SequenceNumberCounter, TableId, Tree,
+    UserKey, UserValue,
 };
-use enum_dispatch::enum_dispatch;
 use std::{
     ops::RangeBounds,
     sync::{Arc, MutexGuard, RwLockWriteGuard},
@@ -23,7 +15,7 @@ use std::{
 pub type RangeItem = crate::Result<KvPair>;
 
 /// Generic Tree API
-#[enum_dispatch]
+#[enum_dispatch::enum_dispatch]
 pub trait AbstractTree {
     // TODO: remove
     #[doc(hidden)]
@@ -35,7 +27,7 @@ pub trait AbstractTree {
     fn next_table_id(&self) -> TableId;
 
     #[doc(hidden)]
-    fn id(&self) -> TreeId;
+    fn id(&self) -> crate::TreeId;
 
     #[doc(hidden)]
     fn get_internal_entry(&self, key: &[u8], seqno: SeqNo) -> crate::Result<Option<InternalValue>>;
@@ -44,7 +36,7 @@ pub trait AbstractTree {
     fn current_version(&self) -> Version;
 
     #[doc(hidden)]
-    fn get_version_history_lock(&self) -> RwLockWriteGuard<'_, SuperVersions>;
+    fn get_version_history_lock(&self) -> RwLockWriteGuard<'_, crate::version::SuperVersions>;
 
     /// Seals the active memtable and flushes to table(s).
     ///
@@ -244,8 +236,8 @@ pub trait AbstractTree {
         &self,
         tables: &[Table],
         blob_files: Option<&[BlobFile]>,
-        frag_map: Option<FragmentationMap>,
-        sealed_memtables_to_delete: &[MemtableId],
+        frag_map: Option<crate::blob_tree::FragmentationMap>,
+        sealed_memtables_to_delete: &[crate::tree::inner::MemtableId],
         gc_watermark: SeqNo,
     ) -> crate::Result<()>;
 
@@ -273,7 +265,7 @@ pub trait AbstractTree {
     /// Will return `Err` if an IO error occurs.
     fn compact(
         &self,
-        strategy: Arc<dyn CompactionStrategy>,
+        strategy: Arc<dyn crate::compaction::CompactionStrategy>,
         seqno_threshold: SeqNo,
     ) -> crate::Result<()>;
 
@@ -296,7 +288,7 @@ pub trait AbstractTree {
     fn active_memtable_size(&self) -> u64;
 
     /// Returns the tree type.
-    fn tree_type(&self) -> TreeType;
+    fn tree_type(&self) -> crate::TreeType;
 
     /// Seals the active memtable.
     fn rotate_memtable(&self) -> Option<Arc<Memtable>>;

src/tree/mod.rs

@@ -7,27 +7,25 @@ pub mod inner;
 pub mod sealed;
 
 use crate::{
-    blob_tree::FragmentationMap,
-    compaction::{drop_range::OwnedBounds, state::CompactionState, CompactionStrategy},
+    compaction::{drop_range::OwnedBounds, CompactionStrategy},
     config::Config,
-    file::BLOBS_FOLDER,
     format_version::FormatVersion,
     iter_guard::{IterGuard, IterGuardImpl},
     manifest::Manifest,
     memtable::Memtable,
     slice::Slice,
-    table::{multi_writer::MultiWriter, Table},
+    table::Table,
     value::InternalValue,
-    version::{recovery::recover, SuperVersion, SuperVersions, Version, VersionId},
+    version::{recovery::recover, SuperVersion, SuperVersions, Version},
     vlog::BlobFile,
-    AbstractTree, Cache, Checksum, DescriptorTable, KvPair, SeqNo, SequenceNumberCounter, TableId,
-    TreeType, UserKey, UserValue, ValueType,
+    AbstractTree, Cache, Checksum, KvPair, SeqNo, SequenceNumberCounter, TableId, TreeType,
+    UserKey, UserValue, ValueType,
 };
-use inner::{MemtableId, TreeId, TreeInner};
+use inner::{TreeId, TreeInner};
 use std::{
     ops::{Bound, RangeBounds},
     path::Path,
-    sync::{Arc, Mutex, MutexGuard, RwLock},
+    sync::{Arc, Mutex, RwLock},
 };
 
 #[cfg(feature = "metrics")]
@@ -131,7 +129,7 @@ impl AbstractTree for Tree {
             .version
     }
 
-    fn get_flush_lock(&self) -> MutexGuard<'_, ()> {
+    fn get_flush_lock(&self) -> std::sync::MutexGuard<'_, ()> {
         self.flush_lock.lock().expect("lock is poisoned")
     }
 
@@ -318,7 +316,7 @@ impl AbstractTree for Tree {
         &self,
         stream: impl Iterator<Item = crate::Result<InternalValue>>,
     ) -> crate::Result<Option<(Vec<Table>, Option<Vec<BlobFile>>)>> {
-        use crate::file::TABLES_FOLDER;
+        use crate::{file::TABLES_FOLDER, table::multi_writer::MultiWriter};
         use std::time::Instant;
 
         let start = Instant::now();
@@ -409,8 +407,8 @@ impl AbstractTree for Tree {
         &self,
         tables: &[Table],
         blob_files: Option<&[BlobFile]>,
-        frag_map: Option<FragmentationMap>,
-        sealed_memtables_to_delete: &[MemtableId],
+        frag_map: Option<crate::blob_tree::FragmentationMap>,
+        sealed_memtables_to_delete: &[crate::tree::inner::MemtableId],
         gc_watermark: SeqNo,
     ) -> crate::Result<()> {
         log::trace!(
@@ -933,7 +931,9 @@ impl Tree {
             config,
             major_compaction_lock: RwLock::default(),
             flush_lock: Mutex::default(),
-            compaction_state: Arc::new(Mutex::new(CompactionState::default())),
+            compaction_state: Arc::new(Mutex::new(
+                crate::compaction::state::CompactionState::default(),
+            )),
 
             #[cfg(feature = "metrics")]
             metrics,
@@ -989,7 +989,7 @@ impl Tree {
         tree_path: P,
         tree_id: TreeId,
         cache: &Arc<Cache>,
-        descriptor_table: &Arc<DescriptorTable>,
+        descriptor_table: &Arc<crate::DescriptorTable>,
         #[cfg(feature = "metrics")] metrics: &Arc<Metrics>,
     ) -> crate::Result<Version> {
         use crate::{file::fsync_directory, file::TABLES_FOLDER, TableId};
@@ -1111,7 +1111,7 @@ impl Tree {
         log::debug!("Successfully recovered {} tables", tables.len());
 
         let (blob_files, orphaned_blob_files) = crate::vlog::recover_blob_files(
-            &tree_path.join(BLOBS_FOLDER),
+            &tree_path.join(crate::file::BLOBS_FOLDER),
             &recovery.blob_file_ids,
         )?;
 
@@ -1134,7 +1134,10 @@ impl Tree {
         Ok(version)
     }
 
-    fn cleanup_orphaned_version(path: &Path, latest_version_id: VersionId) -> crate::Result<()> {
+    fn cleanup_orphaned_version(
+        path: &Path,
+        latest_version_id: crate::version::VersionId,
+    ) -> crate::Result<()> {
         let version_str = format!("v{latest_version_id}");
 
         for file in std::fs::read_dir(path)? {