wip

Author: marvin-j97

src/blob_tree/mod.rs

@@ -642,9 +642,6 @@ impl AbstractTree for BlobTree {
     fn get<K: AsRef<[u8]>>(&self, key: K, seqno: SeqNo) -> crate::Result<Option<crate::UserValue>> {
         let key = key.as_ref();
 
-        // TODO: refactor memtable, sealed memtables, manifest lock to be a single lock (SuperVersion kind of)
-        // TODO: then, try to reduce the lock access to 1, because we are accessing it twice (index.get, and then vhandle resolving...)
-
         let Some(item) = self.index.get_internal_entry(key, seqno)? else {
             return Ok(None);
         };

src/compaction/mod.rs

@@ -83,7 +83,6 @@ pub enum Choice {
 /// and emits a choice on what to do.
 #[expect(clippy::module_name_repetitions)]
 pub trait CompactionStrategy {
-    // TODO: could be : Display instead
     /// Gets the compaction strategy name.
     fn get_name(&self) -> &'static str;
 

src/config/block_size.rs

@@ -14,13 +14,6 @@ impl std::ops::Deref for BlockSizePolicy {
     }
 }
 
-// TODO: remove default
-impl Default for BlockSizePolicy {
-    fn default() -> Self {
-        Self::new(&[4 * 1_024])
-    }
-}
-
 impl BlockSizePolicy {
     pub(crate) fn get(&self, level: usize) -> u32 {
         self.0
@@ -29,8 +22,6 @@ impl BlockSizePolicy {
             .unwrap_or_else(|| self.last().copied().expect("policy should not be empty"))
     }
 
-    // TODO: accept Vec... Into<Vec<...>>? or owned
-
     /// Uses the same block size in every level.
     #[must_use]
     pub fn all(c: u32) -> Self {
@@ -39,9 +30,10 @@ impl BlockSizePolicy {
 
     /// Constructs a custom block size policy.
     #[must_use]
-    pub fn new(policy: &[u32]) -> Self {
+    pub fn new(policy: impl Into<Vec<u32>>) -> Self {
+        let policy = policy.into();
         assert!(!policy.is_empty(), "compression policy may not be empty");
         assert!(policy.len() <= 255, "compression policy is too large");
-        Self(policy.into())
+        Self(policy)
     }
 }

src/config/compression.rs

@@ -16,19 +16,6 @@ impl std::ops::Deref for CompressionPolicy {
     }
 }
 
-// TODO: remove default
-impl Default for CompressionPolicy {
-    fn default() -> Self {
-        #[cfg(feature = "lz4")]
-        let c = Self::new(&[CompressionType::None, CompressionType::Lz4]);
-
-        #[cfg(not(feature = "lz4"))]
-        let c = Self::new(&[CompressionType::None]);
-
-        c
-    }
-}
-
 impl CompressionPolicy {
     pub(crate) fn get(&self, level: usize) -> CompressionType {
         self.0
@@ -43,8 +30,6 @@ impl CompressionPolicy {
         Self::all(CompressionType::None)
     }
 
-    // TODO: accept Vec... Into<Vec<...>>? or owned
-
     /// Uses the same compression in every level.
     #[must_use]
     pub fn all(c: CompressionType) -> Self {
@@ -65,9 +50,10 @@ impl CompressionPolicy {
     /// ]);
     /// ```
     #[must_use]
-    pub fn new(policy: &[CompressionType]) -> Self {
+    pub fn new(policy: impl Into<Vec<CompressionType>>) -> Self {
+        let policy = policy.into();
         assert!(!policy.is_empty(), "compression policy may not be empty");
         assert!(policy.len() <= 255, "compression policy is too large");
-        Self(policy.into())
+        Self(policy)
     }
 }

src/config/filter.rs

@@ -28,15 +28,6 @@ impl std::ops::Deref for FilterPolicy {
     }
 }
 
-// TODO: remove default
-impl Default for FilterPolicy {
-    fn default() -> Self {
-        Self::new(&[FilterPolicyEntry::Bloom(
-            BloomConstructionPolicy::BitsPerKey(10.0),
-        )])
-    }
-}
-
 impl FilterPolicy {
     pub(crate) fn get(&self, level: usize) -> FilterPolicyEntry {
         self.0
@@ -53,8 +44,6 @@ impl FilterPolicy {
         Self::all(FilterPolicyEntry::None)
     }
 
-    // TODO: accept Vec... Into<Vec<...>>? or owned
-
     /// Uses the same block size in every level.
     #[must_use]
     pub fn all(c: FilterPolicyEntry) -> Self {

src/config/hash_ratio.rs

@@ -22,8 +22,6 @@ impl HashRatioPolicy {
             .unwrap_or_else(|| self.last().copied().expect("policy should not be empty"))
     }
 
-    // TODO: accept Vec... Into<Vec<...>>? or owned
-
     /// Uses the same block size in every level.
     #[must_use]
     pub fn all(c: f32) -> Self {
@@ -32,9 +30,10 @@ impl HashRatioPolicy {
 
     /// Constructs a custom block size policy.
     #[must_use]
-    pub fn new(policy: &[f32]) -> Self {
+    pub fn new(policy: impl Into<Vec<f32>>) -> Self {
+        let policy = policy.into();
         assert!(!policy.is_empty(), "compression policy may not be empty");
         assert!(policy.len() <= 255, "compression policy is too large");
-        Self(policy.into())
+        Self(policy)
     }
 }

src/config/mod.rs

@@ -246,26 +246,36 @@ impl Default for Config {
 
             level_count: DEFAULT_LEVEL_COUNT,
 
-            data_block_size_policy: BlockSizePolicy::default(),
+            data_block_size_policy: BlockSizePolicy::all(4_096),
 
-            index_block_pinning_policy: PinningPolicy::new(&[true, true, false]),
-            filter_block_pinning_policy: PinningPolicy::new(&[true, false]),
+            index_block_pinning_policy: PinningPolicy::new([true, true, false]),
+            filter_block_pinning_policy: PinningPolicy::new([true, false]),
 
             top_level_index_block_pinning_policy: PinningPolicy::all(true), // TODO: implement
             top_level_filter_block_pinning_policy: PinningPolicy::all(true), // TODO: implement
 
-            index_block_partitioning_policy: PinningPolicy::new(&[false, false, false, true]),
-            filter_block_partitioning_policy: PinningPolicy::new(&[false, false, false, true]),
+            index_block_partitioning_policy: PinningPolicy::new([false, false, false, true]),
+            filter_block_partitioning_policy: PinningPolicy::new([false, false, false, true]),
 
             index_block_partition_size_policy: BlockSizePolicy::all(4_096), // TODO: implement
             filter_block_partition_size_policy: BlockSizePolicy::all(4_096), // TODO: implement
 
-            data_block_compression_policy: CompressionPolicy::default(),
+            data_block_compression_policy: ({
+                #[cfg(feature = "lz4")]
+                let c = CompressionPolicy::new([CompressionType::None, CompressionType::Lz4]);
+
+                #[cfg(not(feature = "lz4"))]
+                let c = CompressionPolicy::new([CompressionType::None]);
+
+                c
+            }),
             index_block_compression_policy: CompressionPolicy::all(CompressionType::None),
 
             data_block_hash_ratio_policy: HashRatioPolicy::all(0.0),
 
-            filter_policy: FilterPolicy::default(),
+            filter_policy: FilterPolicy::all(FilterPolicyEntry::Bloom(
+                BloomConstructionPolicy::BitsPerKey(10.0),
+            )),
 
             expect_point_read_hits: false,
 

src/config/pinning.rs

@@ -22,8 +22,6 @@ impl PinningPolicy {
             .unwrap_or_else(|| self.last().copied().expect("policy should not be empty"))
     }
 
-    // TODO: accept Vec... Into<Vec<...>>? or owned
-
     /// Uses the same block size in every level.
     #[must_use]
     pub fn all(c: bool) -> Self {
@@ -32,9 +30,10 @@ impl PinningPolicy {
 
     /// Constructs a custom block size policy.
     #[must_use]
-    pub fn new(policy: &[bool]) -> Self {
+    pub fn new(policy: impl Into<Vec<bool>>) -> Self {
+        let policy = policy.into();
         assert!(!policy.is_empty(), "compression policy may not be empty");
         assert!(policy.len() <= 255, "compression policy is too large");
-        Self(policy.into())
+        Self(policy)
     }
 }

src/config/restart_interval.rs

@@ -32,9 +32,10 @@ impl RestartIntervalPolicy {
 
     /// Constructs a custom block size policy.
     #[must_use]
-    pub fn new(policy: &[u8]) -> Self {
+    pub fn new(policy: impl Into<Vec<u8>>) -> Self {
+        let policy = policy.into();
         assert!(!policy.is_empty(), "compression policy may not be empty");
         assert!(policy.len() <= 255, "compression policy is too large");
-        Self(policy.into())
+        Self(policy)
     }
 }