Move StrRefCodec and ByteSliceRefCodec to their own files

milli/src/heed_codec/byte_slice_ref.rs

@@ -0,0 +1,23 @@
+use std::borrow::Cow;
+
+use heed::{BytesDecode, BytesEncode};
+
+/// A codec for values of type `&[u8]`. Unlike `ByteSlice`, its `EItem` and `DItem` associated
+/// types are equivalent (= `&'a [u8]`) and these values can reside within another structure.
+pub struct ByteSliceRefCodec;
+
+impl<'a> BytesEncode<'a> for ByteSliceRefCodec {
+    type EItem = &'a [u8];
+
+    fn bytes_encode(item: &'a Self::EItem) -> Option<Cow<'a, [u8]>> {
+        Some(Cow::Borrowed(item))
+    }
+}
+
+impl<'a> BytesDecode<'a> for ByteSliceRefCodec {
+    type DItem = &'a [u8];
+
+    fn bytes_decode(bytes: &'a [u8]) -> Option<Self::DItem> {
+        Some(bytes)
+    }
+}

milli/src/heed_codec/facet/mod.rs

@@ -1,6 +1,5 @@
 mod field_doc_id_facet_codec;
 mod ordered_f64_codec;
-mod str_ref;
 
 use std::borrow::Cow;
 use std::convert::TryFrom;
@@ -12,9 +11,10 @@ use roaring::RoaringBitmap;
 
 pub use self::field_doc_id_facet_codec::FieldDocIdFacetCodec;
 pub use self::ordered_f64_codec::OrderedF64Codec;
-pub use self::str_ref::StrRefCodec;
 use crate::{CboRoaringBitmapCodec, BEU16};
 
+use super::StrRefCodec;
+
 pub type FieldDocIdFacetF64Codec = FieldDocIdFacetCodec<OrderedF64Codec>;
 pub type FieldDocIdFacetStringCodec = FieldDocIdFacetCodec<StrRefCodec>;
 pub type FieldDocIdFacetIgnoreCodec = FieldDocIdFacetCodec<DecodeIgnore>;
@@ -33,7 +33,7 @@ pub fn try_split_at(slice: &[u8], mid: usize) -> Option<(&[u8], &[u8])> {
 
 /// The key in the [`facet_id_string_docids` and `facet_id_f64_docids`][`Index::facet_id_string_docids`]
 /// databases.
-#[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord)] // TODO: try removing PartialOrd and Ord
 pub struct FacetGroupKey<T> {
     pub field_id: u16,
     pub level: u8,
@@ -103,23 +103,3 @@ impl<'a> heed::BytesDecode<'a> for FacetGroupValueCodec {
         Some(FacetGroupValue { size, bitmap })
     }
 }
-
-/// A codec for values of type `&[u8]`. Unlike `ByteSlice`, its `EItem` and `DItem` associated
-/// types are equivalent (= `&'a [u8]`) and these values can reside within another structure.
-pub struct ByteSliceRef;
-
-impl<'a> BytesEncode<'a> for ByteSliceRef {
-    type EItem = &'a [u8];
-
-    fn bytes_encode(item: &'a Self::EItem) -> Option<Cow<'a, [u8]>> {
-        Some(Cow::Borrowed(item))
-    }
-}
-
-impl<'a> BytesDecode<'a> for ByteSliceRef {
-    type DItem = &'a [u8];
-
-    fn bytes_decode(bytes: &'a [u8]) -> Option<Self::DItem> {
-        Some(bytes)
-    }
-}

milli/src/heed_codec/mod.rs

@@ -1,10 +1,12 @@
 mod beu32_str_codec;
+mod byte_slice_ref;
 pub mod facet;
 mod field_id_word_count_codec;
 mod obkv_codec;
 mod roaring_bitmap;
 mod roaring_bitmap_length;
 mod str_beu32_codec;
+mod str_ref;
 mod str_str_u8_codec;
 
 pub use self::beu32_str_codec::BEU32StrCodec;
@@ -16,3 +18,5 @@ pub use self::roaring_bitmap_length::{
 };
 pub use self::str_beu32_codec::StrBEU32Codec;
 pub use self::str_str_u8_codec::{U8StrStrCodec, UncheckedU8StrStrCodec};
+pub use byte_slice_ref::ByteSliceRefCodec;
+pub use str_ref::StrRefCodec;