refactor

Author: marvin-j97

Cargo.toml

@@ -33,6 +33,7 @@ rustc-hash = "2.0.0"
 serde = { version = "1.0.215", optional = true, features = ["derive"] }
 tempfile = "3.12.0"
 xxhash-rust = { version = "0.8.12", features = ["xxh3"] }
+varint-rs = "2.2.0"
 
 [dev-dependencies]
 criterion = "0.5.1"

src/coding.rs

@@ -43,6 +43,8 @@ pub enum DecodeError {
     /// I/O error
     Io(std::io::Error),
 
+    InvalidVersion,
+
     /// Invalid enum tag
     InvalidTag((&'static str, u8)),
 
@@ -87,10 +89,10 @@ pub trait Encode {
 
     /// Serializes into vector.
     #[allow(unused)]
-    fn encode_into_vec(&self) -> Result<Vec<u8>, EncodeError> {
+    fn encode_into_vec(&self) -> Vec<u8> {
         let mut v = vec![];
-        self.encode_into(&mut v)?;
-        Ok(v)
+        self.encode_into(&mut v).expect("cannot fail");
+        v
     }
 }
 

src/handle.rs

@@ -2,8 +2,15 @@
 // This source code is licensed under both the Apache 2.0 and MIT License
 // (found in the LICENSE-* files in the repository)
 
-use crate::id::SegmentId;
-use std::hash::Hash;
+use crate::{
+    coding::{Decode, DecodeError, Encode, EncodeError},
+    id::SegmentId,
+};
+use std::{
+    hash::Hash,
+    io::{Read, Write},
+};
+use varint_rs::{VarintReader, VarintWriter};
 
 /// A value handle points into the value log
 #[allow(clippy::module_name_repetitions)]
@@ -16,3 +23,19 @@ pub struct ValueHandle {
     /// Offset in file
     pub offset: u64,
 }
+
+impl Encode for ValueHandle {
+    fn encode_into<W: Write>(&self, writer: &mut W) -> Result<(), EncodeError> {
+        writer.write_u64_varint(self.offset)?;
+        writer.write_u64_varint(self.segment_id)?;
+        Ok(())
+    }
+}
+
+impl Decode for ValueHandle {
+    fn decode_from<R: Read>(reader: &mut R) -> Result<Self, DecodeError> {
+        let offset = reader.read_u64_varint()?;
+        let segment_id = reader.read_u64_varint()?;
+        Ok(Self { segment_id, offset })
+    }
+}

src/key_range.rs

@@ -14,6 +14,7 @@ use std::{
 
 /// A key range in the format of [min, max] (inclusive on both sides)
 #[derive(Clone, Debug, PartialEq, Eq)]
+#[cfg_attr(feature = "serde", derive(serde::Deserialize, serde::Serialize))]
 pub struct KeyRange(UserKey, UserKey);
 
 impl std::fmt::Display for KeyRange {

src/lib.rs

@@ -103,7 +103,10 @@
 #![cfg_attr(not(feature = "bytes"), forbid(unsafe_code))]
 
 mod blob_cache;
-mod coding;
+
+#[doc(hidden)]
+pub mod coding;
+
 mod compression;
 mod config;
 mod error;