refactor

Author: marvin-j97

src/lib.rs

@@ -112,7 +112,7 @@ pub use {
     handle::ValueHandle,
     index::{Reader as IndexReader, Writer as IndexWriter},
     segment::multi_writer::MultiWriter as SegmentWriter,
-    value::UserValue,
+    value::{UserKey, UserValue},
     value_log::ValueLog,
     version::Version,
 };

src/mock.rs

@@ -1,10 +1,10 @@
-use crate::{IndexReader, IndexWriter, ValueHandle};
+use crate::{value::UserKey, IndexReader, IndexWriter, ValueHandle};
 use std::{
     collections::BTreeMap,
     sync::{Arc, RwLock},
 };
 
-type MockIndexInner = RwLock<BTreeMap<Arc<[u8]>, (ValueHandle, u32)>>;
+type MockIndexInner = RwLock<BTreeMap<UserKey, (ValueHandle, u32)>>;
 
 /// Mock in-memory index
 #[allow(clippy::module_name_repetitions)]

src/segment/merge.rs

@@ -1,4 +1,4 @@
-use crate::{id::SegmentId, SegmentReader};
+use crate::{id::SegmentId, value::UserKey, SegmentReader, UserValue};
 use std::{cmp::Reverse, sync::Arc};
 
 // TODO: replace with MinHeap...
@@ -9,8 +9,8 @@ type IteratorIndex = usize;
 #[derive(Debug)]
 struct IteratorValue {
     index: IteratorIndex,
-    key: Arc<[u8]>,
-    value: Arc<[u8]>,
+    key: UserKey,
+    value: UserValue,
     segment_id: SegmentId,
     crc: u32,
 }
@@ -79,7 +79,7 @@ impl MergeReader {
 }
 
 impl Iterator for MergeReader {
-    type Item = crate::Result<(Arc<[u8]>, Arc<[u8]>, SegmentId, u32)>;
+    type Item = crate::Result<(UserKey, UserValue, SegmentId, u32)>;
 
     fn next(&mut self) -> Option<Self::Item> {
         if self.heap.is_empty() {

src/segment/reader.rs

@@ -1,5 +1,5 @@
 use super::{meta::METADATA_HEADER_MAGIC, writer::BLOB_HEADER_MAGIC};
-use crate::{id::SegmentId, Compressor};
+use crate::{id::SegmentId, value::UserKey, Compressor, UserValue};
 use byteorder::{BigEndian, ReadBytesExt};
 use std::{
     fs::File,
@@ -50,7 +50,7 @@ impl Reader {
 }
 
 impl Iterator for Reader {
-    type Item = crate::Result<(Arc<[u8]>, Arc<[u8]>, u32)>;
+    type Item = crate::Result<(UserKey, UserValue, u32)>;
 
     fn next(&mut self) -> Option<Self::Item> {
         if self.is_terminated {

src/value_log.rs

@@ -444,7 +444,7 @@ impl ValueLog {
     /// # Errors
     ///
     /// Will return `Err` if an IO error occurs.
-    #[allow(clippy::result_unit_err)]
+    #[allow(clippy::result_uAnit_err)]
     pub fn scan_for_stats(
         &self,
         iter: impl Iterator<Item = std::io::Result<(ValueHandle, u32)>>,