add conversion for f32 and fixed precision number

CHANGELOG.md

@@ -1,32 +1,10 @@
 Tantivy 0.19
 ================================
 
-- Major bugfix: Fix missing fieldnorms for u64, i64, f64, bool, bytes and date [#1620](https://github.com/quickwit-oss/tantivy/pull/1620) (@PSeitz)
 - Updated [Date Field Type](https://github.com/quickwit-oss/tantivy/pull/1396)
   The `DateTime` type has been updated to hold timestamps with microseconds precision.
-  `DateOptions` and `DatePrecision` have been added to configure Date fields. The precision is used to hint on fast values compression. Otherwise, seconds precision is used everywhere else (i.e terms, indexing). (@evanxg852000)
-- Add IP address field type [#1553](https://github.com/quickwit-oss/tantivy/pull/1553) (@PSeitz)
-- Add boolean field type [#1382](https://github.com/quickwit-oss/tantivy/pull/1382) (@boraarslan)
-- Remove Searcher pool and make `Searcher` cloneable. (@PSeitz)
-- Validate settings on create [#1570](https://github.com/quickwit-oss/tantivy/pull/1570 (@PSeitz)
-- Fix interpolation overflow in linear interpolation fastfield codec [#1480](https://github.com/quickwit-oss/tantivy/pull/1480 (@PSeitz @fulmicoton)
-- Detect and apply gcd on fastfield codecs [#1418](https://github.com/quickwit-oss/tantivy/pull/1418) (@PSeitz)
-- Doc store
-  - use separate thread to compress block store [#1389](https://github.com/quickwit-oss/tantivy/pull/1389) [#1510](https://github.com/quickwit-oss/tantivy/pull/1510 (@PSeitz @fulmicoton)
-  - Expose doc store cache size [#1403](https://github.com/quickwit-oss/tantivy/pull/1403) (@PSeitz)
-  - Enable compression levels for doc store [#1378](https://github.com/quickwit-oss/tantivy/pull/1378) (@PSeitz)
-  - Make block size configurable [#1374](https://github.com/quickwit-oss/tantivy/pull/1374) (@kryesh)
-- Make `tantivy::TantivyError` cloneable [#1402](https://github.com/quickwit-oss/tantivy/pull/1402) (@PSeitz)
-- Add support for phrase slop in query language [#1393](https://github.com/quickwit-oss/tantivy/pull/1393) (@saroh)
-- Aggregation
-  - Add support for keyed parameter in range and histgram aggregations [#1424](https://github.com/quickwit-oss/tantivy/pull/1424) (@k-yomo)
-  - Add aggregation bucket limit [#1363](https://github.com/quickwit-oss/tantivy/pull/1363) (@PSeitz)
-- Faster indexing
-  - [#1610](https://github.com/quickwit-oss/tantivy/pull/1610 (@PSeitz)
-  - [#1594](https://github.com/quickwit-oss/tantivy/pull/1594 (@PSeitz)
-  - [#1582](https://github.com/quickwit-oss/tantivy/pull/1582 (@PSeitz)
-  - [#1611](https://github.com/quickwit-oss/tantivy/pull/1611 (@PSeitz)
-
+  `DateOptions` and `DatePrecision` have been added to configure Date fields. The precision is used to hint on fast values compression. Otherwise, seconds precision is used everywhere else (i.e terms, indexing).
+- Remove Searcher pool and make `Searcher` cloneable.
 
 Tantivy 0.18
 ================================

Cargo.toml

@@ -57,7 +57,7 @@ lru = "0.7.5"
 fastdivide = "0.4.0"
 itertools = "0.10.3"
 measure_time = "0.8.2"
-ciborium = { version = "0.2", optional = true}
+serde_cbor = { version = "0.11.2", optional = true }
 async-trait = "0.1.53"
 arc-swap = "1.5.0"
 
@@ -101,7 +101,7 @@ zstd-compression = ["zstd"]
 failpoints = ["fail/failpoints"]
 unstable = [] # useful for benches.
 
-quickwit = ["ciborium"]
+quickwit = ["serde_cbor"]
 
 [workspace]
 members = ["query-grammar", "bitpacker", "common", "fastfield_codecs", "ownedbytes"]

common/src/lib.rs

@@ -34,7 +34,8 @@ impl<T: Deref<Target = [u8]>> HasLen for T {
     }
 }
 
-const HIGHEST_BIT: u64 = 1 << 63;
+const HIGHEST_BIT_64: u64 = 1 << 63;
+const HIGHEST_BIT_32: u32 = 1 << 31;
 
 /// Maps a `i64` to `u64`
 ///
@@ -58,13 +59,13 @@ const HIGHEST_BIT: u64 = 1 << 63;
 /// The reverse mapping is [`u64_to_i64()`].
 #[inline]
 pub fn i64_to_u64(val: i64) -> u64 {
-    (val as u64) ^ HIGHEST_BIT
+    (val as u64) ^ HIGHEST_BIT_64
 }
 
 /// Reverse the mapping given by [`i64_to_u64()`].
 #[inline]
 pub fn u64_to_i64(val: u64) -> i64 {
-    (val ^ HIGHEST_BIT) as i64
+    (val ^ HIGHEST_BIT_64) as i64
 }
 
 /// Maps a `f64` to `u64`
@@ -88,7 +89,7 @@ pub fn u64_to_i64(val: u64) -> i64 {
 pub fn f64_to_u64(val: f64) -> u64 {
     let bits = val.to_bits();
     if val.is_sign_positive() {
-        bits ^ HIGHEST_BIT
+        bits ^ HIGHEST_BIT_64
     } else {
         !bits
     }
@@ -97,26 +98,148 @@ pub fn f64_to_u64(val: f64) -> u64 {
 /// Reverse the mapping given by [`f64_to_u64()`].
 #[inline]
 pub fn u64_to_f64(val: u64) -> f64 {
-    f64::from_bits(if val & HIGHEST_BIT != 0 {
-        val ^ HIGHEST_BIT
+    f64::from_bits(if val & HIGHEST_BIT_64 != 0 {
+        val ^ HIGHEST_BIT_64
     } else {
         !val
     })
 }
 
+/// Maps a `f32` to `u64`
+///
+/// # See also
+/// Similar mapping for f64 [`u64_to_f64()`].
+#[inline]
+pub fn f32_to_u64(val: f32) -> u64 {
+    let bits = val.to_bits();
+    let res32 = if val.is_sign_positive() {
+        bits ^ HIGHEST_BIT_32
+    } else {
+        !bits
+    };
+    res32 as u64
+}
+
+/// Reverse the mapping given by [`f32_to_u64()`].
+#[inline]
+pub fn u64_to_f32(val: u64) -> f32 {
+    debug_assert!(val <= 1 << 32);
+    let val = val as u32;
+    f32::from_bits(if val & HIGHEST_BIT_32 != 0 {
+        val ^ HIGHEST_BIT_32
+    } else {
+        !val
+    })
+}
+
+/// Maps a `f64` to a fixed point representation.
+/// Lower bound is inclusive, upper bound is exclusive.
+/// `precision` is the number of bits used to represent the number.
+///
+/// This is a lossy, affine transformation. All provided values must be finite and non-NaN.
+/// Care should be taken to not provide values which would cause loss of precision such as values
+/// low enough to get sub-normal numbers, value high enough rounding would cause ±Inf to appear, or
+/// a precision larger than 50b.
+///
+/// # See also
+/// The reverse mapping is [`fixed_point_to_f64()`].
+#[inline]
+pub fn f64_to_fixed_point(val: f64, min: f64, max: f64, precision: u8) -> u64 {
+    debug_assert!((1..53).contains(&precision));
+    debug_assert!(min < max);
+
+    let delta = max - min;
+    let mult = (1u64 << precision) as f64;
+    let bucket_size = delta / mult;
+    let upper_bound = f64_next_down(max).min(max - bucket_size);
+
+    // due to different cases of rounding error, we need to enforce upper_bound to be
+    // max-bucket_size, but also that upper_bound < max, which is not given for small enough
+    // bucket_size.
+    let val = val.clamp(min, upper_bound);
+
+    let res = (val - min) / bucket_size;
+    if res.fract() == 0.5 {
+        res as u64
+    } else {
+        // round down when getting x.5
+        res.round() as u64
+    }
+}
+
+/// Reverse the mapping given by [`f64_to_fixed_point()`].
+#[inline]
+pub fn fixed_point_to_f64(val: u64, min: f64, max: f64, precision: u8) -> f64 {
+    let delta = max - min;
+    let mult = (1u64 << precision) as f64;
+    let bucket_size = delta / mult;
+
+    bucket_size.mul_add(val as f64, min)
+}
+
+// taken from rfc/3173-float-next-up-down, commented out part about nan in infinity as it is not
+// needed.
+fn f64_next_down(this: f64) -> f64 {
+    const NEG_TINY_BITS: u64 = 0x8000_0000_0000_0001;
+    const CLEAR_SIGN_MASK: u64 = 0x7fff_ffff_ffff_ffff;
+
+    let bits = this.to_bits();
+    // if this.is_nan() || bits == f64::NEG_INFINITY.to_bits() {
+    // return this;
+    // }
+    let abs = bits & CLEAR_SIGN_MASK;
+    let next_bits = if abs == 0 {
+        NEG_TINY_BITS
+    } else if bits == abs {
+        bits - 1
+    } else {
+        bits + 1
+    };
+    f64::from_bits(next_bits)
+}
+
 #[cfg(test)]
 pub mod test {
+    use std::cmp::Ordering;
 
     use proptest::prelude::*;
 
-    use super::{f64_to_u64, i64_to_u64, u64_to_f64, u64_to_i64, BinarySerializable, FixedSize};
+    use super::{
+        f32_to_u64, f64_to_fixed_point, f64_to_u64, fixed_point_to_f64, i64_to_u64, u64_to_f32,
+        u64_to_f64, u64_to_i64, BinarySerializable, FixedSize,
+    };
 
     fn test_i64_converter_helper(val: i64) {
         assert_eq!(u64_to_i64(i64_to_u64(val)), val);
     }
 
     fn test_f64_converter_helper(val: f64) {
-        assert_eq!(u64_to_f64(f64_to_u64(val)), val);
+        assert_eq!(u64_to_f64(f64_to_u64(val)).total_cmp(&val), Ordering::Equal);
+    }
+
+    fn test_f32_converter_helper(val: f32) {
+        assert_eq!(u64_to_f32(f32_to_u64(val)).total_cmp(&val), Ordering::Equal);
+    }
+
+    fn test_fixed_point_converter_helper(val: f64, min: f64, max: f64, precision: u8) {
+        let bucket_count = 1 << precision;
+
+        let packed = f64_to_fixed_point(val, min, max, precision);
+
+        assert!(packed < bucket_count, "used to much bits");
+
+        let depacked = fixed_point_to_f64(packed, min, max, precision);
+        let repacked = f64_to_fixed_point(depacked, min, max, precision);
+
+        assert_eq!(packed, repacked, "generational loss");
+
+        let error = (val.clamp(min, crate::f64_next_down(max)) - depacked).abs();
+
+        let expected = (max - min) / (bucket_count as f64);
+        assert!(
+            error <= (max - min) / (bucket_count as f64) * 2.0,
+            "error larger than expected"
+        );
     }
 
     pub fn fixed_size_test<O: BinarySerializable + FixedSize + Default>() {
@@ -125,12 +248,75 @@ pub mod test {
         assert_eq!(buffer.len(), O::SIZE_IN_BYTES);
     }
 
+    fn fixed_point_bound() -> proptest::num::f64::Any {
+        proptest::num::f64::POSITIVE
+            | proptest::num::f64::NEGATIVE
+            | proptest::num::f64::NORMAL
+            | proptest::num::f64::ZERO
+    }
+
     proptest! {
         #[test]
-        fn test_f64_converter_monotonicity_proptest((left, right) in (proptest::num::f64::NORMAL, proptest::num::f64::NORMAL)) {
+        fn test_f64_converter_monotonicity_proptest((left, right) in (proptest::num::f64::ANY, proptest::num::f64::ANY)) {
+            test_f64_converter_helper(left);
+            test_f64_converter_helper(right);
+
             let left_u64 = f64_to_u64(left);
             let right_u64 = f64_to_u64(right);
-            assert_eq!(left_u64 < right_u64,  left < right);
+
+            assert_eq!(left_u64.cmp(&right_u64),  left.total_cmp(&right));
+        }
+
+        #[test]
+        fn test_f32_converter_monotonicity_proptest((left, right) in (proptest::num::f32::ANY, proptest::num::f32::ANY)) {
+            test_f32_converter_helper(left);
+            test_f32_converter_helper(right);
+
+            let left_u64 = f32_to_u64(left);
+            let right_u64 = f32_to_u64(right);
+            assert_eq!(left_u64.cmp(&right_u64),  left.total_cmp(&right));
+        }
+
+        #[test]
+        fn test_fixed_point_converter_proptest((left, right, min, max, precision) in
+                (fixed_point_bound(), fixed_point_bound(),
+                fixed_point_bound(), fixed_point_bound(),
+                proptest::num::u8::ANY)) {
+            // convert so all input are legal
+            let (min, max) = if min < max {
+                (min, max)
+            } else if min > max {
+                (max, min)
+            } else {
+                return Ok(()); // equals
+            };
+            if 1 > precision || precision >= 50 {
+                return Ok(());
+            }
+
+            let max_full_precision = 53.0 - precision as f64;
+            if (max / min).abs().log2().abs() > max_full_precision {
+                return Ok(());
+            }
+            // we will go in subnormal territories => loss of precision
+            if (((max - min).log2() - precision as f64) as i32) < f64::MIN_EXP {
+                return Ok(());
+            }
+
+            if (max - min).is_infinite() {
+                return Ok(());
+            }
+
+            test_fixed_point_converter_helper(left, min, max, precision);
+            test_fixed_point_converter_helper(right, min, max, precision);
+
+            let left_u64 = f64_to_fixed_point(left, min, max, precision);
+            let right_u64 = f64_to_fixed_point(right, min, max, precision);
+            if left < right {
+                assert!(left_u64 <= right_u64);
+            } else if left > right {
+                assert!(left_u64 >= right_u64)
+            }
         }
     }
 
@@ -168,4 +354,27 @@ pub mod test {
         assert!(f64_to_u64(-2.0) < f64_to_u64(1.0));
         assert!(f64_to_u64(-2.0) < f64_to_u64(-1.5));
     }
+
+    #[test]
+    fn test_f32_converter() {
+        test_f32_converter_helper(f32::INFINITY);
+        test_f32_converter_helper(f32::NEG_INFINITY);
+        test_f32_converter_helper(0.0);
+        test_f32_converter_helper(-0.0);
+        test_f32_converter_helper(1.0);
+        test_f32_converter_helper(-1.0);
+    }
+
+    #[test]
+    fn test_f32_order() {
+        assert!(!(f32_to_u64(f32::NEG_INFINITY)..f32_to_u64(f32::INFINITY))
+            .contains(&f32_to_u64(f32::NAN))); // nan is not a number
+        assert!(f32_to_u64(1.5) > f32_to_u64(1.0)); // same exponent, different mantissa
+        assert!(f32_to_u64(2.0) > f32_to_u64(1.0)); // same mantissa, different exponent
+        assert!(f32_to_u64(2.0) > f32_to_u64(1.5)); // different exponent and mantissa
+        assert!(f32_to_u64(1.0) > f32_to_u64(-1.0)); // pos > neg
+        assert!(f32_to_u64(-1.5) < f32_to_u64(-1.0));
+        assert!(f32_to_u64(-2.0) < f32_to_u64(1.0));
+        assert!(f32_to_u64(-2.0) < f32_to_u64(-1.5));
+    }
 }

common/src/serialize.rs

@@ -107,19 +107,6 @@ impl FixedSize for u64 {
     const SIZE_IN_BYTES: usize = 8;
 }
 
-impl BinarySerializable for u128 {
-    fn serialize<W: Write>(&self, writer: &mut W) -> io::Result<()> {
-        writer.write_u128::<Endianness>(*self)
-    }
-    fn deserialize<R: Read>(reader: &mut R) -> io::Result<Self> {
-        reader.read_u128::<Endianness>()
-    }
-}
-
-impl FixedSize for u128 {
-    const SIZE_IN_BYTES: usize = 16;
-}
-
 impl BinarySerializable for f32 {
     fn serialize<W: Write>(&self, writer: &mut W) -> io::Result<()> {
         writer.write_f32::<Endianness>(*self)

fastfield_codecs/benches/bench.rs

@@ -100,10 +100,9 @@ mod tests {
 
     fn get_u128_column_from_data(data: &[u128]) -> Arc<dyn Column<u128>> {
         let mut out = vec![];
-        let iter_gen = || data.iter().cloned();
-        serialize_u128(iter_gen, data.len() as u64, &mut out).unwrap();
+        serialize_u128(VecColumn::from(&data), &mut out).unwrap();
         let out = OwnedBytes::new(out);
-        open_u128::<u128>(out).unwrap()
+        open_u128(out).unwrap()
     }
 
     #[bench]

fastfield_codecs/src/column.rs

@@ -3,9 +3,6 @@ use std::ops::RangeInclusive;
 
 use tantivy_bitpacker::minmax;
 
-use crate::monotonic_mapping::StrictlyMonotonicFn;
-
-/// `Column` provides columnar access on a field.
 pub trait Column<T: PartialOrd = u64>: Send + Sync {
     /// Return the value associated with the given idx.
     ///
@@ -60,7 +57,6 @@ pub trait Column<T: PartialOrd = u64>: Send + Sync {
     /// `.max_value()`.
     fn max_value(&self) -> T;
 
-    /// The number of values in the column.
     fn num_vals(&self) -> u64;
 
     /// Returns a iterator over the data
@@ -69,7 +65,6 @@ pub trait Column<T: PartialOrd = u64>: Send + Sync {
     }
 }
 
-/// VecColumn provides `Column` over a slice.
 pub struct VecColumn<'a, T = u64> {
     values: &'a [T],
     min_value: T,
@@ -148,30 +143,16 @@ struct MonotonicMappingColumn<C, T, Input> {
     _phantom: PhantomData<Input>,
 }
 
-/// Creates a view of a column transformed by a strictly monotonic mapping. See
-/// [`StrictlyMonotonicFn`].
-///
-/// E.g. apply a gcd monotonic_mapping([100, 200, 300]) == [1, 2, 3]
-/// monotonic_mapping.mapping() is expected to be injective, and we should always have
-/// monotonic_mapping.inverse(monotonic_mapping.mapping(el)) == el
-///
-/// The inverse of the mapping is required for:
-/// `fn get_between_vals(&self, range: RangeInclusive<T>) -> Vec<u64> `
-/// The user provides the original value range and we need to monotonic map them in the same way the
-/// serialization does before calling the underlying column.
-///
-/// Note that when opening a codec, the monotonic_mapping should be the inverse of the mapping
-/// during serialization. And therefore the monotonic_mapping_inv when opening is the same as
-/// monotonic_mapping during serialization.
-pub fn monotonic_map_column<C, T, Input, Output>(
+/// Creates a view of a column transformed by a monotonic mapping.
+pub fn monotonic_map_column<C, T, Input: PartialOrd, Output: PartialOrd>(
     from_column: C,
     monotonic_mapping: T,
 ) -> impl Column<Output>
 where
     C: Column<Input>,
-    T: StrictlyMonotonicFn<Input, Output> + Send + Sync,
-    Input: PartialOrd + Send + Sync + Clone,
-    Output: PartialOrd + Send + Sync + Clone,
+    T: Fn(Input) -> Output + Send + Sync,
+    Input: Send + Sync,
+    Output: Send + Sync,
 {
     MonotonicMappingColumn {
         from_column,
@@ -180,27 +161,28 @@ where
     }
 }
 
-impl<C, T, Input, Output> Column<Output> for MonotonicMappingColumn<C, T, Input>
+impl<C, T, Input: PartialOrd, Output: PartialOrd> Column<Output>
+    for MonotonicMappingColumn<C, T, Input>
 where
     C: Column<Input>,
-    T: StrictlyMonotonicFn<Input, Output> + Send + Sync,
-    Input: PartialOrd + Send + Sync + Clone,
-    Output: PartialOrd + Send + Sync + Clone,
+    T: Fn(Input) -> Output + Send + Sync,
+    Input: Send + Sync,
+    Output: Send + Sync,
 {
     #[inline]
     fn get_val(&self, idx: u64) -> Output {
         let from_val = self.from_column.get_val(idx);
-        self.monotonic_mapping.mapping(from_val)
+        (self.monotonic_mapping)(from_val)
     }
 
     fn min_value(&self) -> Output {
         let from_min_value = self.from_column.min_value();
-        self.monotonic_mapping.mapping(from_min_value)
+        (self.monotonic_mapping)(from_min_value)
     }
 
     fn max_value(&self) -> Output {
         let from_max_value = self.from_column.max_value();
-        self.monotonic_mapping.mapping(from_max_value)
+        (self.monotonic_mapping)(from_max_value)
     }
 
     fn num_vals(&self) -> u64 {
@@ -208,18 +190,7 @@ where
     }
 
     fn iter(&self) -> Box<dyn Iterator<Item = Output> + '_> {
-        Box::new(
-            self.from_column
-                .iter()
-                .map(|el| self.monotonic_mapping.mapping(el)),
-        )
-    }
-
-    fn get_between_vals(&self, range: RangeInclusive<Output>) -> Vec<u64> {
-        self.from_column.get_between_vals(
-            self.monotonic_mapping.inverse(range.start().clone())
-                ..=self.monotonic_mapping.inverse(range.end().clone()),
-        )
+        Box::new(self.from_column.iter().map(&self.monotonic_mapping))
     }
 
     // We voluntarily do not implement get_range as it yields a regression,
@@ -265,22 +236,19 @@ where
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::monotonic_mapping::{
-        StrictlyMonotonicMappingInverter, StrictlyMonotonicMappingToInternalBaseval,
-        StrictlyMonotonicMappingToInternalGCDBaseval,
-    };
+    use crate::MonotonicallyMappableToU64;
 
     #[test]
     fn test_monotonic_mapping() {
-        let vals = &[3u64, 5u64][..];
+        let vals = &[1u64, 3u64][..];
         let col = VecColumn::from(vals);
-        let mapped = monotonic_map_column(col, StrictlyMonotonicMappingToInternalBaseval::new(2));
-        assert_eq!(mapped.min_value(), 1u64);
-        assert_eq!(mapped.max_value(), 3u64);
+        let mapped = monotonic_map_column(col, |el| el + 4);
+        assert_eq!(mapped.min_value(), 5u64);
+        assert_eq!(mapped.max_value(), 7u64);
         assert_eq!(mapped.num_vals(), 2);
         assert_eq!(mapped.num_vals(), 2);
-        assert_eq!(mapped.get_val(0), 1);
-        assert_eq!(mapped.get_val(1), 3);
+        assert_eq!(mapped.get_val(0), 5);
+        assert_eq!(mapped.get_val(1), 7);
     }
 
     #[test]
@@ -292,15 +260,10 @@ mod tests {
 
     #[test]
     fn test_monotonic_mapping_iter() {
-        let vals: Vec<u64> = (10..110u64).map(|el| el * 10).collect();
+        let vals: Vec<u64> = (-1..99).map(i64::to_u64).collect();
         let col = VecColumn::from(&vals);
-        let mapped = monotonic_map_column(
-            col,
-            StrictlyMonotonicMappingInverter::from(
-                StrictlyMonotonicMappingToInternalGCDBaseval::new(10, 100),
-            ),
-        );
-        let val_i64s: Vec<u64> = mapped.iter().collect();
+        let mapped = monotonic_map_column(col, |el| i64::from_u64(el) * 10i64);
+        let val_i64s: Vec<i64> = mapped.iter().collect();
         for i in 0..100 {
             assert_eq!(val_i64s[i as usize], mapped.get_val(i));
         }
@@ -308,26 +271,20 @@ mod tests {
 
     #[test]
     fn test_monotonic_mapping_get_range() {
-        let vals: Vec<u64> = (0..100u64).map(|el| el * 10).collect();
+        let vals: Vec<u64> = (-1..99).map(i64::to_u64).collect();
         let col = VecColumn::from(&vals);
-        let mapped = monotonic_map_column(
-            col,
-            StrictlyMonotonicMappingInverter::from(
-                StrictlyMonotonicMappingToInternalGCDBaseval::new(10, 0),
-            ),
-        );
-
-        assert_eq!(mapped.min_value(), 0u64);
-        assert_eq!(mapped.max_value(), 9900u64);
+        let mapped = monotonic_map_column(col, |el| i64::from_u64(el) * 10i64);
+        assert_eq!(mapped.min_value(), -10i64);
+        assert_eq!(mapped.max_value(), 980i64);
         assert_eq!(mapped.num_vals(), 100);
-        let val_u64s: Vec<u64> = mapped.iter().collect();
-        assert_eq!(val_u64s.len(), 100);
+        let val_i64s: Vec<i64> = mapped.iter().collect();
+        assert_eq!(val_i64s.len(), 100);
         for i in 0..100 {
-            assert_eq!(val_u64s[i as usize], mapped.get_val(i));
-            assert_eq!(val_u64s[i as usize], vals[i as usize] * 10);
+            assert_eq!(val_i64s[i as usize], mapped.get_val(i));
+            assert_eq!(val_i64s[i as usize], i64::from_u64(vals[i as usize]) * 10);
         }
-        let mut buf = [0u64; 20];
+        let mut buf = [0i64; 20];
         mapped.get_range(7, &mut buf[..]);
-        assert_eq!(&val_u64s[7..][..20], &buf);
+        assert_eq!(&val_i64s[7..][..20], &buf);
     }
 }

fastfield_codecs/src/compact_space/mod.rs

@@ -171,10 +171,10 @@ pub struct IPCodecParams {
 
 impl CompactSpaceCompressor {
     /// Taking the vals as Vec may cost a lot of memory. It is used to sort the vals.
-    pub fn train_from(iter: impl Iterator<Item = u128>, num_vals: u64) -> Self {
+    pub fn train_from(column: &impl Column<u128>) -> Self {
         let mut values_sorted = BTreeSet::new();
-        values_sorted.extend(iter);
-        let total_num_values = num_vals;
+        values_sorted.extend(column.iter());
+        let total_num_values = column.num_vals();
 
         let compact_space =
             get_compact_space(&values_sorted, total_num_values, COST_PER_BLANK_IN_BITS);
@@ -443,7 +443,7 @@ impl CompactSpaceDecompressor {
 mod tests {
 
     use super::*;
-    use crate::{open_u128, serialize_u128};
+    use crate::{open_u128, serialize_u128, VecColumn};
 
     #[test]
     fn compact_space_test() {
@@ -513,12 +513,7 @@ mod tests {
 
     fn test_aux_vals(u128_vals: &[u128]) -> OwnedBytes {
         let mut out = Vec::new();
-        serialize_u128(
-            || u128_vals.iter().cloned(),
-            u128_vals.len() as u64,
-            &mut out,
-        )
-        .unwrap();
+        serialize_u128(VecColumn::from(u128_vals), &mut out).unwrap();
 
         let data = OwnedBytes::new(out);
         test_all(data.clone(), u128_vals);
@@ -608,8 +603,8 @@ mod tests {
             5_000_000_000,
         ];
         let mut out = Vec::new();
-        serialize_u128(|| vals.iter().cloned(), vals.len() as u64, &mut out).unwrap();
-        let decomp = open_u128::<u128>(OwnedBytes::new(out)).unwrap();
+        serialize_u128(VecColumn::from(vals), &mut out).unwrap();
+        let decomp = open_u128(OwnedBytes::new(out)).unwrap();
 
         assert_eq!(decomp.get_between_vals(199..=200), vec![0]);
         assert_eq!(decomp.get_between_vals(199..=201), vec![0, 1]);

fastfield_codecs/src/lib.rs

@@ -1,12 +1,5 @@
-#![warn(missing_docs)]
 #![cfg_attr(all(feature = "unstable", test), feature(test))]
 
-//! # `fastfield_codecs`
-//!
-//! - Columnar storage of data for tantivy [`Column`].
-//! - Encode data in different codecs.
-//! - Monotonically map values to u64/u128
-
 #[cfg(test)]
 #[macro_use]
 extern crate more_asserts;
@@ -20,10 +13,6 @@ use std::sync::Arc;
 
 use common::BinarySerializable;
 use compact_space::CompactSpaceDecompressor;
-use monotonic_mapping::{
-    StrictlyMonotonicMappingInverter, StrictlyMonotonicMappingToInternal,
-    StrictlyMonotonicMappingToInternalBaseval, StrictlyMonotonicMappingToInternalGCDBaseval,
-};
 use ownedbytes::OwnedBytes;
 use serialize::Header;
 
@@ -33,7 +22,6 @@ mod compact_space;
 mod line;
 mod linear;
 mod monotonic_mapping;
-mod monotonic_mapping_u128;
 
 mod column;
 mod gcd;
@@ -43,24 +31,16 @@ use self::bitpacked::BitpackedCodec;
 use self::blockwise_linear::BlockwiseLinearCodec;
 pub use self::column::{monotonic_map_column, Column, VecColumn};
 use self::linear::LinearCodec;
-pub use self::monotonic_mapping::{MonotonicallyMappableToU64, StrictlyMonotonicFn};
-pub use self::monotonic_mapping_u128::MonotonicallyMappableToU128;
+pub use self::monotonic_mapping::MonotonicallyMappableToU64;
 pub use self::serialize::{
     estimate, serialize, serialize_and_load, serialize_u128, NormalizedHeader,
 };
 
 #[derive(PartialEq, Eq, PartialOrd, Ord, Debug, Clone, Copy)]
 #[repr(u8)]
-/// Available codecs to use to encode the u64 (via [`MonotonicallyMappableToU64`]) converted data.
 pub enum FastFieldCodecType {
-    /// Bitpack all values in the value range. The number of bits is defined by the amplitude
-    /// `column.max_value() - column.min_value()`
     Bitpacked = 1,
-    /// Linear interpolation puts a line between the first and last value and then bitpacks the
-    /// values by the offset from the line. The number of bits is defined by the max deviation from
-    /// the line.
     Linear = 2,
-    /// Same as [`FastFieldCodecType::Linear`], but encodes in blocks of 512 elements.
     BlockwiseLinear = 3,
 }
 
@@ -78,11 +58,11 @@ impl BinarySerializable for FastFieldCodecType {
 }
 
 impl FastFieldCodecType {
-    pub(crate) fn to_code(self) -> u8 {
+    pub fn to_code(self) -> u8 {
         self as u8
     }
 
-    pub(crate) fn from_code(code: u8) -> Option<Self> {
+    pub fn from_code(code: u8) -> Option<Self> {
         match code {
             1 => Some(Self::Bitpacked),
             2 => Some(Self::Linear),
@@ -93,13 +73,8 @@ impl FastFieldCodecType {
 }
 
 /// Returns the correct codec reader wrapped in the `Arc` for the data.
-pub fn open_u128<Item: MonotonicallyMappableToU128>(
-    bytes: OwnedBytes,
-) -> io::Result<Arc<dyn Column<Item>>> {
-    let reader = CompactSpaceDecompressor::open(bytes)?;
-    let inverted: StrictlyMonotonicMappingInverter<StrictlyMonotonicMappingToInternal<Item>> =
-        StrictlyMonotonicMappingToInternal::<Item>::new().into();
-    Ok(Arc::new(monotonic_map_column(reader, inverted)))
+pub fn open_u128(bytes: OwnedBytes) -> io::Result<Arc<dyn Column<u128>>> {
+    Ok(Arc::new(CompactSpaceDecompressor::open(bytes)?))
 }
 
 /// Returns the correct codec reader wrapped in the `Arc` for the data.
@@ -124,15 +99,11 @@ fn open_specific_codec<C: FastFieldCodec, Item: MonotonicallyMappableToU64>(
     let reader = C::open_from_bytes(bytes, normalized_header)?;
     let min_value = header.min_value;
     if let Some(gcd) = header.gcd {
-        let mapping = StrictlyMonotonicMappingInverter::from(
-            StrictlyMonotonicMappingToInternalGCDBaseval::new(gcd.get(), min_value),
-        );
-        Ok(Arc::new(monotonic_map_column(reader, mapping)))
+        let monotonic_mapping = move |val: u64| Item::from_u64(min_value + val * gcd.get());
+        Ok(Arc::new(monotonic_map_column(reader, monotonic_mapping)))
     } else {
-        let mapping = StrictlyMonotonicMappingInverter::from(
-            StrictlyMonotonicMappingToInternalBaseval::new(min_value),
-        );
-        Ok(Arc::new(monotonic_map_column(reader, mapping)))
+        let monotonic_mapping = move |val: u64| Item::from_u64(min_value + val);
+        Ok(Arc::new(monotonic_map_column(reader, monotonic_mapping)))
     }
 }
 
@@ -164,7 +135,6 @@ trait FastFieldCodec: 'static {
     fn estimate(column: &dyn Column) -> Option<f32>;
 }
 
-/// The list of all available codecs for u64 convertible data.
 pub const ALL_CODEC_TYPES: [FastFieldCodecType; 3] = [
     FastFieldCodecType::Bitpacked,
     FastFieldCodecType::BlockwiseLinear,
@@ -173,7 +143,6 @@ pub const ALL_CODEC_TYPES: [FastFieldCodecType; 3] = [
 
 #[cfg(test)]
 mod tests {
-
     use proptest::prelude::*;
     use proptest::strategy::Strategy;
     use proptest::{prop_oneof, proptest};
@@ -208,18 +177,6 @@ mod tests {
                  `{data:?}`",
             );
         }
-
-        if !data.is_empty() {
-            let test_rand_idx = rand::thread_rng().gen_range(0..=data.len() - 1);
-            let expected_positions: Vec<u64> = data
-                .iter()
-                .enumerate()
-                .filter(|(_, el)| **el == data[test_rand_idx])
-                .map(|(pos, _)| pos as u64)
-                .collect();
-            let positions = reader.get_between_vals(data[test_rand_idx]..=data[test_rand_idx]);
-            assert_eq!(expected_positions, positions);
-        }
         Some((estimation, actual_compression))
     }
 

fastfield_codecs/src/main.rs

@@ -90,7 +90,7 @@ fn bench_ip() {
     {
         let mut data = vec![];
         for dataset in dataset.chunks(500_000) {
-            serialize_u128(|| dataset.iter().cloned(), dataset.len() as u64, &mut data).unwrap();
+            serialize_u128(VecColumn::from(dataset), &mut data).unwrap();
         }
         let compression = data.len() as f64 / (dataset.len() * 16) as f64;
         println!("Compression 50_000 chunks {:.4}", compression);
@@ -101,10 +101,7 @@ fn bench_ip() {
     }
 
     let mut data = vec![];
-    {
-        print_time!("creation");
-        serialize_u128(|| dataset.iter().cloned(), dataset.len() as u64, &mut data).unwrap();
-    }
+    serialize_u128(VecColumn::from(&dataset), &mut data).unwrap();
 
     let compression = data.len() as f64 / (dataset.len() * 16) as f64;
     println!("Compression {:.2}", compression);
@@ -113,7 +110,7 @@ fn bench_ip() {
         (data.len() * 8) as f32 / dataset.len() as f32
     );
 
-    let decompressor = open_u128::<u128>(OwnedBytes::new(data)).unwrap();
+    let decompressor = open_u128(OwnedBytes::new(data)).unwrap();
     // Sample some ranges
     for value in dataset.iter().take(1110).skip(1100).cloned() {
         print_time!("get range");

fastfield_codecs/src/monotonic_mapping.rs

@@ -1,11 +1,3 @@
-use std::marker::PhantomData;
-
-use fastdivide::DividerU64;
-
-use crate::MonotonicallyMappableToU128;
-
-/// Monotonic maps a value to u64 value space.
-/// Monotonic mapping enables `PartialOrd` on u64 space without conversion to original space.
 pub trait MonotonicallyMappableToU64: 'static + PartialOrd + Copy + Send + Sync {
     /// Converts a value to u64.
     ///
@@ -19,145 +11,6 @@ pub trait MonotonicallyMappableToU64: 'static + PartialOrd + Copy + Send + Sync
     fn from_u64(val: u64) -> Self;
 }
 
-/// Values need to be strictly monotonic mapped to a `Internal` value (u64 or u128) that can be
-/// used in fast field codecs.
-///
-/// The monotonic mapping is required so that `PartialOrd` can be used on `Internal` without
-/// converting to `External`.
-///
-/// All strictly monotonic functions are invertible because they are guaranteed to have a one-to-one
-/// mapping from their range to their domain. The `inverse` method is required when opening a codec,
-/// so a value can be converted back to its original domain (e.g. ip address or f64) from its
-/// internal representation.
-pub trait StrictlyMonotonicFn<External, Internal> {
-    /// Strictly monotonically maps the value from External to Internal.
-    fn mapping(&self, inp: External) -> Internal;
-    /// Inverse of `mapping`. Maps the value from Internal to External.
-    fn inverse(&self, out: Internal) -> External;
-}
-
-/// Inverts a strictly monotonic mapping from `StrictlyMonotonicFn<A, B>` to
-/// `StrictlyMonotonicFn<B, A>`.
-///
-/// # Warning
-///
-/// This type comes with a footgun. A type being strictly monotonic does not impose that the inverse
-/// mapping is strictly monotonic over the entire space External. e.g. a -> a * 2. Use at your own
-/// risks.
-pub(crate) struct StrictlyMonotonicMappingInverter<T> {
-    orig_mapping: T,
-}
-impl<T> From<T> for StrictlyMonotonicMappingInverter<T> {
-    fn from(orig_mapping: T) -> Self {
-        Self { orig_mapping }
-    }
-}
-
-impl<From, To, T> StrictlyMonotonicFn<To, From> for StrictlyMonotonicMappingInverter<T>
-where T: StrictlyMonotonicFn<From, To>
-{
-    fn mapping(&self, val: To) -> From {
-        self.orig_mapping.inverse(val)
-    }
-
-    fn inverse(&self, val: From) -> To {
-        self.orig_mapping.mapping(val)
-    }
-}
-
-/// Applies the strictly monotonic mapping from `T` without any additional changes.
-pub(crate) struct StrictlyMonotonicMappingToInternal<T> {
-    _phantom: PhantomData<T>,
-}
-
-impl<T> StrictlyMonotonicMappingToInternal<T> {
-    pub(crate) fn new() -> StrictlyMonotonicMappingToInternal<T> {
-        Self {
-            _phantom: PhantomData,
-        }
-    }
-}
-
-impl<External: MonotonicallyMappableToU128, T: MonotonicallyMappableToU128>
-    StrictlyMonotonicFn<External, u128> for StrictlyMonotonicMappingToInternal<T>
-where T: MonotonicallyMappableToU128
-{
-    fn mapping(&self, inp: External) -> u128 {
-        External::to_u128(inp)
-    }
-
-    fn inverse(&self, out: u128) -> External {
-        External::from_u128(out)
-    }
-}
-
-impl<External: MonotonicallyMappableToU64, T: MonotonicallyMappableToU64>
-    StrictlyMonotonicFn<External, u64> for StrictlyMonotonicMappingToInternal<T>
-where T: MonotonicallyMappableToU64
-{
-    fn mapping(&self, inp: External) -> u64 {
-        External::to_u64(inp)
-    }
-
-    fn inverse(&self, out: u64) -> External {
-        External::from_u64(out)
-    }
-}
-
-/// Mapping dividing by  gcd and a base value.
-///
-/// The function is assumed to be only called on values divided by passed
-/// gcd value. (It is necessary for the function to be monotonic.)
-pub(crate) struct StrictlyMonotonicMappingToInternalGCDBaseval {
-    gcd_divider: DividerU64,
-    gcd: u64,
-    min_value: u64,
-}
-impl StrictlyMonotonicMappingToInternalGCDBaseval {
-    pub(crate) fn new(gcd: u64, min_value: u64) -> Self {
-        let gcd_divider = DividerU64::divide_by(gcd);
-        Self {
-            gcd_divider,
-            gcd,
-            min_value,
-        }
-    }
-}
-impl<External: MonotonicallyMappableToU64> StrictlyMonotonicFn<External, u64>
-    for StrictlyMonotonicMappingToInternalGCDBaseval
-{
-    fn mapping(&self, inp: External) -> u64 {
-        self.gcd_divider
-            .divide(External::to_u64(inp) - self.min_value)
-    }
-
-    fn inverse(&self, out: u64) -> External {
-        External::from_u64(self.min_value + out * self.gcd)
-    }
-}
-
-/// Strictly monotonic mapping with a base value.
-pub(crate) struct StrictlyMonotonicMappingToInternalBaseval {
-    min_value: u64,
-}
-impl StrictlyMonotonicMappingToInternalBaseval {
-    pub(crate) fn new(min_value: u64) -> Self {
-        Self { min_value }
-    }
-}
-
-impl<External: MonotonicallyMappableToU64> StrictlyMonotonicFn<External, u64>
-    for StrictlyMonotonicMappingToInternalBaseval
-{
-    fn mapping(&self, val: External) -> u64 {
-        External::to_u64(val) - self.min_value
-    }
-
-    fn inverse(&self, val: u64) -> External {
-        External::from_u64(self.min_value + val)
-    }
-}
-
 impl MonotonicallyMappableToU64 for u64 {
     fn to_u64(self) -> u64 {
         self
@@ -201,33 +54,3 @@ impl MonotonicallyMappableToU64 for f64 {
         common::u64_to_f64(val)
     }
 }
-
-#[cfg(test)]
-mod tests {
-
-    use super::*;
-
-    #[test]
-    fn strictly_monotonic_test() {
-        // identity mapping
-        test_round_trip(&StrictlyMonotonicMappingToInternal::<u64>::new(), 100u64);
-        // round trip to i64
-        test_round_trip(&StrictlyMonotonicMappingToInternal::<i64>::new(), 100u64);
-        // identity mapping
-        test_round_trip(&StrictlyMonotonicMappingToInternal::<u128>::new(), 100u128);
-
-        // base value to i64 round trip
-        let mapping = StrictlyMonotonicMappingToInternalBaseval::new(100);
-        test_round_trip::<_, _, u64>(&mapping, 100i64);
-        // base value and gcd to u64 round trip
-        let mapping = StrictlyMonotonicMappingToInternalGCDBaseval::new(10, 100);
-        test_round_trip::<_, _, u64>(&mapping, 100u64);
-    }
-
-    fn test_round_trip<T: StrictlyMonotonicFn<K, L>, K: std::fmt::Debug + Eq + Copy, L>(
-        mapping: &T,
-        test_val: K,
-    ) {
-        assert_eq!(mapping.inverse(mapping.mapping(test_val)), test_val);
-    }
-}

fastfield_codecs/src/monotonic_mapping_u128.rs

@@ -1,7 +1,5 @@
-use std::net::Ipv6Addr;
+use std::net::{IpAddr, Ipv6Addr};
 
-/// Montonic maps a value to u128 value space
-/// Monotonic mapping enables `PartialOrd` on u128 space without conversion to original space.
 pub trait MonotonicallyMappableToU128: 'static + PartialOrd + Copy + Send + Sync {
     /// Converts a value to u128.
     ///
@@ -25,16 +23,20 @@ impl MonotonicallyMappableToU128 for u128 {
     }
 }
 
-impl MonotonicallyMappableToU128 for Ipv6Addr {
+impl MonotonicallyMappableToU128 for IpAddr {
     fn to_u128(self) -> u128 {
         ip_to_u128(self)
     }
 
     fn from_u128(val: u128) -> Self {
-        Ipv6Addr::from(val.to_be_bytes())
+        IpAddr::from(val.to_be_bytes())
     }
 }
 
-fn ip_to_u128(ip_addr: Ipv6Addr) -> u128 {
-    u128::from_be_bytes(ip_addr.octets())
+fn ip_to_u128(ip_addr: IpAddr) -> u128 {
+    let ip_addr_v6: Ipv6Addr = match ip_addr {
+        IpAddr::V4(v4) => v4.to_ipv6_mapped(),
+        IpAddr::V6(v6) => v6,
+    };
+    u128::from_be_bytes(ip_addr_v6.octets())
 }

fastfield_codecs/src/serialize.rs

@@ -22,6 +22,7 @@ use std::num::NonZeroU64;
 use std::sync::Arc;
 
 use common::{BinarySerializable, VInt};
+use fastdivide::DividerU64;
 use log::warn;
 use ownedbytes::OwnedBytes;
 
@@ -29,10 +30,6 @@ use crate::bitpacked::BitpackedCodec;
 use crate::blockwise_linear::BlockwiseLinearCodec;
 use crate::compact_space::CompactSpaceCompressor;
 use crate::linear::LinearCodec;
-use crate::monotonic_mapping::{
-    StrictlyMonotonicFn, StrictlyMonotonicMappingToInternal,
-    StrictlyMonotonicMappingToInternalGCDBaseval,
-};
 use crate::{
     monotonic_map_column, Column, FastFieldCodec, FastFieldCodecType, MonotonicallyMappableToU64,
     VecColumn, ALL_CODEC_TYPES,
@@ -40,14 +37,12 @@ use crate::{
 
 /// The normalized header gives some parameters after applying the following
 /// normalization of the vector:
-/// `val -> (val - min_value) / gcd`
+/// val -> (val - min_value) / gcd
 ///
 /// By design, after normalization, `min_value = 0` and `gcd = 1`.
 #[derive(Debug, Copy, Clone)]
 pub struct NormalizedHeader {
-    /// The number of values in the underlying column.
     pub num_vals: u64,
-    /// The max value of the underlying column.
     pub max_value: u64,
 }
 
@@ -62,11 +57,8 @@ pub(crate) struct Header {
 
 impl Header {
     pub fn normalized(self) -> NormalizedHeader {
-        let gcd = self.gcd.map(|gcd| gcd.get()).unwrap_or(1);
-        let gcd_min_val_mapping =
-            StrictlyMonotonicMappingToInternalGCDBaseval::new(gcd, self.min_value);
-
-        let max_value = gcd_min_val_mapping.mapping(self.max_value);
+        let max_value =
+            (self.max_value - self.min_value) / self.gcd.map(|gcd| gcd.get()).unwrap_or(1);
         NormalizedHeader {
             num_vals: self.num_vals,
             max_value,
@@ -74,7 +66,10 @@ impl Header {
     }
 
     pub fn normalize_column<C: Column>(&self, from_column: C) -> impl Column {
-        normalize_column(from_column, self.min_value, self.gcd)
+        let min_value = self.min_value;
+        let gcd = self.gcd.map(|gcd| gcd.get()).unwrap_or(1);
+        let divider = DividerU64::divide_by(gcd);
+        monotonic_map_column(from_column, move |val| divider.divide(val - min_value))
     }
 
     pub fn compute_header(
@@ -86,8 +81,9 @@ impl Header {
         let max_value = column.max_value();
         let gcd = crate::gcd::find_gcd(column.iter().map(|val| val - min_value))
             .filter(|gcd| gcd.get() > 1u64);
-        let normalized_column = normalize_column(column, min_value, gcd);
-        let codec_type = detect_codec(normalized_column, codecs)?;
+        let divider = DividerU64::divide_by(gcd.map(|gcd| gcd.get()).unwrap_or(1u64));
+        let shifted_column = monotonic_map_column(&column, |val| divider.divide(val - min_value));
+        let codec_type = detect_codec(shifted_column, codecs)?;
         Some(Header {
             num_vals,
             min_value,
@@ -98,16 +94,6 @@ impl Header {
     }
 }
 
-pub fn normalize_column<C: Column>(
-    from_column: C,
-    min_value: u64,
-    gcd: Option<NonZeroU64>,
-) -> impl Column {
-    let gcd = gcd.map(|gcd| gcd.get()).unwrap_or(1);
-    let mapping = StrictlyMonotonicMappingToInternalGCDBaseval::new(gcd, min_value);
-    monotonic_map_column(from_column, mapping)
-}
-
 impl BinarySerializable for Header {
     fn serialize<W: io::Write>(&self, writer: &mut W) -> io::Result<()> {
         VInt(self.num_vals).serialize(writer)?;
@@ -139,21 +125,16 @@ impl BinarySerializable for Header {
     }
 }
 
-/// Return estimated compression for given codec in the value range [0.0..1.0], where 1.0 means no
-/// compression.
 pub fn estimate<T: MonotonicallyMappableToU64>(
     typed_column: impl Column<T>,
     codec_type: FastFieldCodecType,
 ) -> Option<f32> {
-    let column = monotonic_map_column(typed_column, StrictlyMonotonicMappingToInternal::<T>::new());
+    let column = monotonic_map_column(typed_column, T::to_u64);
     let min_value = column.min_value();
     let gcd = crate::gcd::find_gcd(column.iter().map(|val| val - min_value))
         .filter(|gcd| gcd.get() > 1u64);
-    let mapping = StrictlyMonotonicMappingToInternalGCDBaseval::new(
-        gcd.map(|gcd| gcd.get()).unwrap_or(1u64),
-        min_value,
-    );
-    let normalized_column = monotonic_map_column(&column, mapping);
+    let divider = DividerU64::divide_by(gcd.map(|gcd| gcd.get()).unwrap_or(1u64));
+    let normalized_column = monotonic_map_column(&column, |val| divider.divide(val - min_value));
     match codec_type {
         FastFieldCodecType::Bitpacked => BitpackedCodec::estimate(&normalized_column),
         FastFieldCodecType::Linear => LinearCodec::estimate(&normalized_column),
@@ -161,26 +142,25 @@ pub fn estimate<T: MonotonicallyMappableToU64>(
     }
 }
 
-/// Serializes u128 values with the compact space codec.
-pub fn serialize_u128<F: Fn() -> I, I: Iterator<Item = u128>>(
-    iter_gen: F,
-    num_vals: u64,
+pub fn serialize_u128(
+    typed_column: impl Column<u128>,
     output: &mut impl io::Write,
 ) -> io::Result<()> {
     // TODO write header, to later support more codecs
-    let compressor = CompactSpaceCompressor::train_from(iter_gen(), num_vals);
-    compressor.compress_into(iter_gen(), output).unwrap();
+    let compressor = CompactSpaceCompressor::train_from(&typed_column);
+    compressor
+        .compress_into(typed_column.iter(), output)
+        .unwrap();
 
     Ok(())
 }
 
-/// Serializes the column with the codec with the best estimate on the data.
 pub fn serialize<T: MonotonicallyMappableToU64>(
     typed_column: impl Column<T>,
     output: &mut impl io::Write,
     codecs: &[FastFieldCodecType],
 ) -> io::Result<()> {
-    let column = monotonic_map_column(typed_column, StrictlyMonotonicMappingToInternal::<T>::new());
+    let column = monotonic_map_column(typed_column, T::to_u64);
     let header = Header::compute_header(&column, codecs).ok_or_else(|| {
         io::Error::new(
             io::ErrorKind::InvalidInput,
@@ -245,7 +225,6 @@ fn serialize_given_codec(
     Ok(())
 }
 
-/// Helper function to serialize a column (autodetect from all codecs) and then open it
 pub fn serialize_and_load<T: MonotonicallyMappableToU64 + Ord + Default>(
     column: &[T],
 ) -> Arc<dyn Column<T>> {

src/aggregation/bucket/term_agg.rs

@@ -17,11 +17,7 @@ use crate::fastfield::MultiValuedFastFieldReader;
 use crate::schema::Type;
 use crate::{DocId, TantivyError};
 
-/// Creates a bucket for every unique term and counts the number of occurences.
-/// Note that doc_count in the response buckets equals term count here.
-///
-/// If the text is untokenized and single value, that means one term per document and therefore it
-/// is in fact doc count.
+/// Creates a bucket for every unique term
 ///
 /// ### Terminology
 /// Shard parameters are supposed to be equivalent to elasticsearch shard parameter.
@@ -68,25 +64,6 @@ use crate::{DocId, TantivyError};
 ///     }
 /// }
 /// ```
-///
-/// /// # Response JSON Format
-/// ```json
-/// {
-///     ...
-///     "aggregations": {
-///         "genres": {
-///             "doc_count_error_upper_bound": 0,   
-///             "sum_other_doc_count": 0,           
-///             "buckets": [                        
-///                 { "key": "drumnbass", "doc_count": 6 },
-///                 { "key": "raggae", "doc_count": 4 },
-///                 { "key": "jazz", "doc_count": 2 }
-///             ]
-///         }
-///     }
-/// }
-/// ```
-
 #[derive(Clone, Debug, Default, PartialEq, Serialize, Deserialize)]
 pub struct TermsAggregation {
     /// The field to aggregate on.
@@ -1229,43 +1206,11 @@ mod tests {
         .collect();
 
         let res = exec_request_with_query(agg_req, &index, None);
-
         assert!(res.is_err());
 
         Ok(())
     }
 
-    #[test]
-    fn terms_aggregation_multi_token_per_doc() -> crate::Result<()> {
-        let terms = vec!["Hello Hello", "Hallo Hallo"];
-
-        let index = get_test_index_from_terms(true, &[terms])?;
-
-        let agg_req: Aggregations = vec![(
-            "my_texts".to_string(),
-            Aggregation::Bucket(BucketAggregation {
-                bucket_agg: BucketAggregationType::Terms(TermsAggregation {
-                    field: "text_id".to_string(),
-                    min_doc_count: Some(0),
-                    ..Default::default()
-                }),
-                sub_aggregation: Default::default(),
-            }),
-        )]
-        .into_iter()
-        .collect();
-
-        let res = exec_request_with_query(agg_req, &index, None).unwrap();
-
-        assert_eq!(res["my_texts"]["buckets"][0]["key"], "hello");
-        assert_eq!(res["my_texts"]["buckets"][0]["doc_count"], 2);
-
-        assert_eq!(res["my_texts"]["buckets"][1]["key"], "hallo");
-        assert_eq!(res["my_texts"]["buckets"][1]["doc_count"], 2);
-
-        Ok(())
-    }
-
     #[test]
     fn test_json_format() -> crate::Result<()> {
         let agg_req: Aggregations = vec![(

src/aggregation/mod.rs

@@ -10,19 +10,21 @@
 //!
 //! There are two categories: [Metrics](metric) and [Buckets](bucket).
 //!
-//! ## Prerequisite
-//! Currently aggregations work only on [fast fields](`crate::fastfield`). Single value fast fields
-//! of type `u64`, `f64`, `i64` and fast fields on text fields.
+//! # Usage
+//!
 //!
-//! ## Usage
 //! To use aggregations, build an aggregation request by constructing
 //! [`Aggregations`](agg_req::Aggregations).
 //! Create an [`AggregationCollector`] from this request. `AggregationCollector` implements the
 //! [`Collector`](crate::collector::Collector) trait and can be passed as collector into
 //! [`Searcher::search()`](crate::Searcher::search).
 //!
+//! #### Limitations
 //!
-//! ## JSON Format
+//! Currently aggregations work only on single value fast fields of type `u64`, `f64`, `i64` and
+//! fast fields on text fields.
+//!
+//! # JSON Format
 //! Aggregations request and result structures de/serialize into elasticsearch compatible JSON.
 //!
 //! ```verbatim
@@ -33,7 +35,7 @@
 //! let json_response_string: String = &serde_json::to_string(&agg_res)?;
 //! ```
 //!
-//! ## Supported Aggregations
+//! # Supported Aggregations
 //! - [Bucket](bucket)
 //!     - [Histogram](bucket::HistogramAggregation)
 //!     - [Range](bucket::RangeAggregation)

src/directory/mmap_directory.rs

@@ -571,21 +571,9 @@ mod tests {
         assert_eq!(mmap_directory.get_cache_info().mmapped.len(), 0);
     }
 
-    fn assert_eventually<P: Fn() -> Option<String>>(predicate: P) {
-        for _ in 0..30 {
-            if predicate().is_none() {
-                break;
-            }
-            std::thread::sleep(Duration::from_millis(200));
-        }
-        if let Some(error_msg) = predicate() {
-            panic!("{}", error_msg);
-        }
-    }
-
     #[test]
-    fn test_mmap_released() {
-        let mmap_directory = MmapDirectory::create_from_tempdir().unwrap();
+    fn test_mmap_released() -> crate::Result<()> {
+        let mmap_directory = MmapDirectory::create_from_tempdir()?;
         let mut schema_builder: SchemaBuilder = Schema::builder();
         let text_field = schema_builder.add_text_field("text", TEXT);
         let schema = schema_builder.build();
@@ -594,56 +582,49 @@ mod tests {
             let index =
                 Index::create(mmap_directory.clone(), schema, IndexSettings::default()).unwrap();
 
-            let mut index_writer = index.writer_for_tests().unwrap();
+            let mut index_writer = index.writer_for_tests()?;
             let mut log_merge_policy = LogMergePolicy::default();
             log_merge_policy.set_min_num_segments(3);
             index_writer.set_merge_policy(Box::new(log_merge_policy));
             for _num_commits in 0..10 {
                 for _ in 0..10 {
-                    index_writer.add_document(doc!(text_field=>"abc")).unwrap();
+                    index_writer.add_document(doc!(text_field=>"abc"))?;
                 }
-                index_writer.commit().unwrap();
+                index_writer.commit()?;
             }
 
             let reader = index
                 .reader_builder()
                 .reload_policy(ReloadPolicy::Manual)
-                .try_into()
-                .unwrap();
+                .try_into()?;
 
             for _ in 0..4 {
-                index_writer.add_document(doc!(text_field=>"abc")).unwrap();
-                index_writer.commit().unwrap();
-                reader.reload().unwrap();
+                index_writer.add_document(doc!(text_field=>"abc"))?;
+                index_writer.commit()?;
+                reader.reload()?;
             }
-            index_writer.wait_merging_threads().unwrap();
+            index_writer.wait_merging_threads()?;
 
-            reader.reload().unwrap();
+            reader.reload()?;
             let num_segments = reader.searcher().segment_readers().len();
             assert!(num_segments <= 4);
             let num_components_except_deletes_and_tempstore =
                 crate::core::SegmentComponent::iterator().len() - 2;
-            let max_num_mmapped = num_components_except_deletes_and_tempstore * num_segments;
-            assert_eventually(|| {
-                let num_mmapped = mmap_directory.get_cache_info().mmapped.len();
-                if num_mmapped > max_num_mmapped {
-                    Some(format!(
-                        "Expected at most {max_num_mmapped} mmapped files, got {num_mmapped}"
-                    ))
-                } else {
-                    None
-                }
-            });
+            let num_mmapped = mmap_directory.get_cache_info().mmapped.len();
+            assert!(
+                num_mmapped <= num_segments * num_components_except_deletes_and_tempstore,
+                "Expected at most {} mmapped files, got {num_mmapped}",
+                num_segments * num_components_except_deletes_and_tempstore
+            );
         }
         // This test failed on CI. The last Mmap is dropped from the merging thread so there might
         // be a race condition indeed.
-        assert_eventually(|| {
-            let num_mmapped = mmap_directory.get_cache_info().mmapped.len();
-            if num_mmapped > 0 {
-                Some(format!("Expected no mmapped files, got {num_mmapped}"))
-            } else {
-                None
+        for _ in 0..10 {
+            if mmap_directory.get_cache_info().mmapped.is_empty() {
+                return Ok(());
             }
-        });
+            std::thread::sleep(Duration::from_millis(200));
+        }
+        panic!("The cache still contains information. One of the Mmap has not been dropped.");
     }
 }

src/fastfield/bytes/writer.rs

@@ -57,15 +57,14 @@ impl BytesFastFieldWriter {
 
     /// Shift to the next document and add all of the
     /// matching field values present in the document.
-    pub fn add_document(&mut self, doc: &Document) -> crate::Result<()> {
+    pub fn add_document(&mut self, doc: &Document) {
         self.next_doc();
         for field_value in doc.get_all(self.field) {
             if let Value::Bytes(ref bytes) = field_value {
                 self.vals.extend_from_slice(bytes);
-                return Ok(());
+                return;
             }
         }
-        Ok(())
     }
 
     /// Register the bytes associated with a document.

src/fastfield/mod.rs

@@ -7,15 +7,16 @@
 //! It is designed for the fast random access of some document
 //! fields given a document id.
 //!
-//! Fast fields are useful when a field is required for all or most of
-//! the `DocSet`: for instance for scoring, grouping, aggregation, filtering, or faceting.
+//! `FastField` are useful when a field is required for all or most of
+//! the `DocSet` : for instance for scoring, grouping, filtering, or faceting.
 //!
 //!
-//! Fields have to be declared as `FAST` in the schema.
-//! Currently supported fields are: u64, i64, f64, bytes and text.
+//! Fields have to be declared as `FAST` in the  schema.
+//! Currently supported fields are: u64, i64, f64 and bytes.
 //!
-//! Fast fields are stored in with [different codecs](fastfield_codecs). The best codec is detected
-//! automatically, when serializing.
+//! u64, i64 and f64 fields are stored in a bit-packed fashion so that
+//! their memory usage is directly linear with the amplitude of the
+//! values stored.
 //!
 //! Read access performance is comparable to that of an array lookup.
 
@@ -26,14 +27,10 @@ pub use self::bytes::{BytesFastFieldReader, BytesFastFieldWriter};
 pub use self::error::{FastFieldNotAvailableError, Result};
 pub use self::facet_reader::FacetReader;
 pub(crate) use self::multivalued::{get_fastfield_codecs_for_multivalue, MultivalueStartIndex};
-pub use self::multivalued::{
-    MultiValueU128FastFieldWriter, MultiValuedFastFieldReader, MultiValuedFastFieldWriter,
-    MultiValuedU128FastFieldReader,
-};
+pub use self::multivalued::{MultiValuedFastFieldReader, MultiValuedFastFieldWriter};
 pub use self::readers::FastFieldReaders;
 pub(crate) use self::readers::{type_and_cardinality, FastType};
 pub use self::serializer::{Column, CompositeFastFieldSerializer};
-use self::writer::unexpected_value;
 pub use self::writer::{FastFieldsWriter, IntFastFieldWriter};
 use crate::schema::{Type, Value};
 use crate::{DateTime, DocId};
@@ -120,16 +117,15 @@ impl FastValue for DateTime {
     }
 }
 
-fn value_to_u64(value: &Value) -> crate::Result<u64> {
-    let value = match value {
+fn value_to_u64(value: &Value) -> u64 {
+    match value {
         Value::U64(val) => val.to_u64(),
         Value::I64(val) => val.to_u64(),
         Value::F64(val) => val.to_u64(),
         Value::Bool(val) => val.to_u64(),
         Value::Date(val) => val.to_u64(),
-        _ => return Err(unexpected_value("u64/i64/f64/bool/date", value)),
-    };
-    Ok(value)
+        _ => panic!("Expected a u64/i64/f64/bool/date field, got {:?} ", value),
+    }
 }
 
 /// The fast field type
@@ -203,15 +199,9 @@ mod tests {
             let write: WritePtr = directory.open_write(Path::new("test")).unwrap();
             let mut serializer = CompositeFastFieldSerializer::from_write(write).unwrap();
             let mut fast_field_writers = FastFieldsWriter::from_schema(&SCHEMA);
-            fast_field_writers
-                .add_document(&doc!(*FIELD=>13u64))
-                .unwrap();
-            fast_field_writers
-                .add_document(&doc!(*FIELD=>14u64))
-                .unwrap();
-            fast_field_writers
-                .add_document(&doc!(*FIELD=>2u64))
-                .unwrap();
+            fast_field_writers.add_document(&doc!(*FIELD=>13u64));
+            fast_field_writers.add_document(&doc!(*FIELD=>14u64));
+            fast_field_writers.add_document(&doc!(*FIELD=>2u64));
             fast_field_writers
                 .serialize(&mut serializer, &HashMap::new(), None)
                 .unwrap();
@@ -236,33 +226,15 @@ mod tests {
             let write: WritePtr = directory.open_write(Path::new("test"))?;
             let mut serializer = CompositeFastFieldSerializer::from_write(write)?;
             let mut fast_field_writers = FastFieldsWriter::from_schema(&SCHEMA);
-            fast_field_writers
-                .add_document(&doc!(*FIELD=>4u64))
-                .unwrap();
-            fast_field_writers
-                .add_document(&doc!(*FIELD=>14_082_001u64))
-                .unwrap();
-            fast_field_writers
-                .add_document(&doc!(*FIELD=>3_052u64))
-                .unwrap();
-            fast_field_writers
-                .add_document(&doc!(*FIELD=>9_002u64))
-                .unwrap();
-            fast_field_writers
-                .add_document(&doc!(*FIELD=>15_001u64))
-                .unwrap();
-            fast_field_writers
-                .add_document(&doc!(*FIELD=>777u64))
-                .unwrap();
-            fast_field_writers
-                .add_document(&doc!(*FIELD=>1_002u64))
-                .unwrap();
-            fast_field_writers
-                .add_document(&doc!(*FIELD=>1_501u64))
-                .unwrap();
-            fast_field_writers
-                .add_document(&doc!(*FIELD=>215u64))
-                .unwrap();
+            fast_field_writers.add_document(&doc!(*FIELD=>4u64));
+            fast_field_writers.add_document(&doc!(*FIELD=>14_082_001u64));
+            fast_field_writers.add_document(&doc!(*FIELD=>3_052u64));
+            fast_field_writers.add_document(&doc!(*FIELD=>9_002u64));
+            fast_field_writers.add_document(&doc!(*FIELD=>15_001u64));
+            fast_field_writers.add_document(&doc!(*FIELD=>777u64));
+            fast_field_writers.add_document(&doc!(*FIELD=>1_002u64));
+            fast_field_writers.add_document(&doc!(*FIELD=>1_501u64));
+            fast_field_writers.add_document(&doc!(*FIELD=>215u64));
             fast_field_writers.serialize(&mut serializer, &HashMap::new(), None)?;
             serializer.close()?;
         }
@@ -298,9 +270,7 @@ mod tests {
             let mut serializer = CompositeFastFieldSerializer::from_write(write).unwrap();
             let mut fast_field_writers = FastFieldsWriter::from_schema(&SCHEMA);
             for _ in 0..10_000 {
-                fast_field_writers
-                    .add_document(&doc!(*FIELD=>100_000u64))
-                    .unwrap();
+                fast_field_writers.add_document(&doc!(*FIELD=>100_000u64));
             }
             fast_field_writers
                 .serialize(&mut serializer, &HashMap::new(), None)
@@ -333,13 +303,9 @@ mod tests {
             let mut serializer = CompositeFastFieldSerializer::from_write(write).unwrap();
             let mut fast_field_writers = FastFieldsWriter::from_schema(&SCHEMA);
             // forcing the amplitude to be high
-            fast_field_writers
-                .add_document(&doc!(*FIELD=>0u64))
-                .unwrap();
+            fast_field_writers.add_document(&doc!(*FIELD=>0u64));
             for i in 0u64..10_000u64 {
-                fast_field_writers
-                    .add_document(&doc!(*FIELD=>5_000_000_000_000_000_000u64 + i))
-                    .unwrap();
+                fast_field_writers.add_document(&doc!(*FIELD=>5_000_000_000_000_000_000u64 + i));
             }
             fast_field_writers
                 .serialize(&mut serializer, &HashMap::new(), None)
@@ -381,7 +347,7 @@ mod tests {
             for i in -100i64..10_000i64 {
                 let mut doc = Document::default();
                 doc.add_i64(i64_field, i);
-                fast_field_writers.add_document(&doc).unwrap();
+                fast_field_writers.add_document(&doc);
             }
             fast_field_writers
                 .serialize(&mut serializer, &HashMap::new(), None)
@@ -426,7 +392,7 @@ mod tests {
             let mut serializer = CompositeFastFieldSerializer::from_write(write).unwrap();
             let mut fast_field_writers = FastFieldsWriter::from_schema(&schema);
             let doc = Document::default();
-            fast_field_writers.add_document(&doc).unwrap();
+            fast_field_writers.add_document(&doc);
             fast_field_writers
                 .serialize(&mut serializer, &HashMap::new(), None)
                 .unwrap();
@@ -469,7 +435,7 @@ mod tests {
             let mut serializer = CompositeFastFieldSerializer::from_write(write)?;
             let mut fast_field_writers = FastFieldsWriter::from_schema(&SCHEMA);
             for &x in &permutation {
-                fast_field_writers.add_document(&doc!(*FIELD=>x)).unwrap();
+                fast_field_writers.add_document(&doc!(*FIELD=>x));
             }
             fast_field_writers.serialize(&mut serializer, &HashMap::new(), None)?;
             serializer.close()?;
@@ -819,14 +785,10 @@ mod tests {
             let write: WritePtr = directory.open_write(path).unwrap();
             let mut serializer = CompositeFastFieldSerializer::from_write(write).unwrap();
             let mut fast_field_writers = FastFieldsWriter::from_schema(&schema);
-            fast_field_writers.add_document(&doc!(field=>true)).unwrap();
-            fast_field_writers
-                .add_document(&doc!(field=>false))
-                .unwrap();
-            fast_field_writers.add_document(&doc!(field=>true)).unwrap();
-            fast_field_writers
-                .add_document(&doc!(field=>false))
-                .unwrap();
+            fast_field_writers.add_document(&doc!(field=>true));
+            fast_field_writers.add_document(&doc!(field=>false));
+            fast_field_writers.add_document(&doc!(field=>true));
+            fast_field_writers.add_document(&doc!(field=>false));
             fast_field_writers
                 .serialize(&mut serializer, &HashMap::new(), None)
                 .unwrap();
@@ -860,10 +822,8 @@ mod tests {
             let mut serializer = CompositeFastFieldSerializer::from_write(write).unwrap();
             let mut fast_field_writers = FastFieldsWriter::from_schema(&schema);
             for _ in 0..50 {
-                fast_field_writers.add_document(&doc!(field=>true)).unwrap();
-                fast_field_writers
-                    .add_document(&doc!(field=>false))
-                    .unwrap();
+                fast_field_writers.add_document(&doc!(field=>true));
+                fast_field_writers.add_document(&doc!(field=>false));
             }
             fast_field_writers
                 .serialize(&mut serializer, &HashMap::new(), None)
@@ -897,7 +857,7 @@ mod tests {
             let mut serializer = CompositeFastFieldSerializer::from_write(write)?;
             let mut fast_field_writers = FastFieldsWriter::from_schema(&schema);
             let doc = Document::default();
-            fast_field_writers.add_document(&doc).unwrap();
+            fast_field_writers.add_document(&doc);
             fast_field_writers.serialize(&mut serializer, &HashMap::new(), None)?;
             serializer.close()?;
         }
@@ -923,7 +883,7 @@ mod tests {
                 CompositeFastFieldSerializer::from_write_with_codec(write, codec_types).unwrap();
             let mut fast_field_writers = FastFieldsWriter::from_schema(schema);
             for doc in docs {
-                fast_field_writers.add_document(doc).unwrap();
+                fast_field_writers.add_document(doc);
             }
             fast_field_writers
                 .serialize(&mut serializer, &HashMap::new(), None)

src/fastfield/multivalued/mod.rs

@@ -3,9 +3,9 @@ mod writer;
 
 use fastfield_codecs::FastFieldCodecType;
 
-pub use self::reader::{MultiValuedFastFieldReader, MultiValuedU128FastFieldReader};
+pub use self::reader::MultiValuedFastFieldReader;
+pub use self::writer::MultiValuedFastFieldWriter;
 pub(crate) use self::writer::MultivalueStartIndex;
-pub use self::writer::{MultiValueU128FastFieldWriter, MultiValuedFastFieldWriter};
 
 /// The valid codecs for multivalue values excludes the linear interpolation codec.
 ///

src/fastfield/multivalued/reader.rs

@@ -1,7 +1,7 @@
-use std::ops::{Range, RangeInclusive};
+use std::ops::Range;
 use std::sync::Arc;
 
-use fastfield_codecs::{Column, MonotonicallyMappableToU128};
+use fastfield_codecs::Column;
 
 use crate::fastfield::{FastValue, MultiValueLength};
 use crate::DocId;
@@ -99,176 +99,12 @@ impl<Item: FastValue> MultiValueLength for MultiValuedFastFieldReader<Item> {
         self.total_num_vals() as u64
     }
 }
-
-/// Reader for a multivalued `u128` fast field.
-///
-/// The reader is implemented as a `u64` fast field for the index and a `u128` fast field.
-///
-/// The `vals_reader` will access the concatenated list of all
-/// values for all reader.
-/// The `idx_reader` associated, for each document, the index of its first value.
-#[derive(Clone)]
-pub struct MultiValuedU128FastFieldReader<T: MonotonicallyMappableToU128> {
-    idx_reader: Arc<dyn Column<u64>>,
-    vals_reader: Arc<dyn Column<T>>,
-}
-
-impl<T: MonotonicallyMappableToU128> MultiValuedU128FastFieldReader<T> {
-    pub(crate) fn open(
-        idx_reader: Arc<dyn Column<u64>>,
-        vals_reader: Arc<dyn Column<T>>,
-    ) -> MultiValuedU128FastFieldReader<T> {
-        Self {
-            idx_reader,
-            vals_reader,
-        }
-    }
-
-    /// Returns `[start, end)`, such that the values associated
-    /// to the given document are `start..end`.
-    #[inline]
-    fn range(&self, doc: DocId) -> Range<u64> {
-        let start = self.idx_reader.get_val(doc as u64);
-        let end = self.idx_reader.get_val(doc as u64 + 1);
-        start..end
-    }
-
-    /// Returns the array of values associated to the given `doc`.
-    #[inline]
-    pub fn get_first_val(&self, doc: DocId) -> Option<T> {
-        let range = self.range(doc);
-        if range.is_empty() {
-            return None;
-        }
-        Some(self.vals_reader.get_val(range.start))
-    }
-
-    /// Returns the array of values associated to the given `doc`.
-    #[inline]
-    fn get_vals_for_range(&self, range: Range<u64>, vals: &mut Vec<T>) {
-        let len = (range.end - range.start) as usize;
-        vals.resize(len, T::from_u128(0));
-        self.vals_reader.get_range(range.start, &mut vals[..]);
-    }
-
-    /// Returns the array of values associated to the given `doc`.
-    #[inline]
-    pub fn get_vals(&self, doc: DocId, vals: &mut Vec<T>) {
-        let range = self.range(doc);
-        self.get_vals_for_range(range, vals);
-    }
-
-    /// Returns all docids which are in the provided value range
-    pub fn get_between_vals(&self, range: RangeInclusive<T>) -> Vec<DocId> {
-        let positions = self.vals_reader.get_between_vals(range);
-
-        positions_to_docids(&positions, self.idx_reader.as_ref())
-    }
-
-    /// Iterates over all elements in the fast field
-    pub fn iter(&self) -> impl Iterator<Item = T> + '_ {
-        self.vals_reader.iter()
-    }
-
-    /// Returns the minimum value for this fast field.
-    ///
-    /// The min value does not take in account of possible
-    /// deleted document, and should be considered as a lower bound
-    /// of the actual mimimum value.
-    pub fn min_value(&self) -> T {
-        self.vals_reader.min_value()
-    }
-
-    /// Returns the maximum value for this fast field.
-    ///
-    /// The max value does not take in account of possible
-    /// deleted document, and should be considered as an upper bound
-    /// of the actual maximum value.
-    pub fn max_value(&self) -> T {
-        self.vals_reader.max_value()
-    }
-
-    /// Returns the number of values associated with the document `DocId`.
-    #[inline]
-    pub fn num_vals(&self, doc: DocId) -> usize {
-        let range = self.range(doc);
-        (range.end - range.start) as usize
-    }
-
-    /// Returns the overall number of values in this field.
-    #[inline]
-    pub fn total_num_vals(&self) -> u64 {
-        self.idx_reader.max_value()
-    }
-}
-
-impl<T: MonotonicallyMappableToU128> MultiValueLength for MultiValuedU128FastFieldReader<T> {
-    fn get_range(&self, doc_id: DocId) -> std::ops::Range<u64> {
-        self.range(doc_id)
-    }
-    fn get_len(&self, doc_id: DocId) -> u64 {
-        self.num_vals(doc_id) as u64
-    }
-    fn get_total_len(&self) -> u64 {
-        self.total_num_vals() as u64
-    }
-}
-
-/// Converts a list of positions of values in a 1:n index to the corresponding list of DocIds.
-///
-/// Since there is no index for value pos -> docid, but docid -> value pos range, we scan the index.
-///
-/// Correctness: positions needs to be sorted. idx_reader needs to contain monotonically increasing
-/// positions.
-///
-/// TODO: Instead of a linear scan we can employ a expotential search into binary search to match a
-/// docid to its value position.
-fn positions_to_docids<C: Column + ?Sized>(positions: &[u64], idx_reader: &C) -> Vec<DocId> {
-    let mut docs = vec![];
-    let mut cur_doc = 0u32;
-    let mut last_doc = None;
-
-    for pos in positions {
-        loop {
-            let end = idx_reader.get_val(cur_doc as u64 + 1);
-            if end > *pos {
-                // avoid duplicates
-                if Some(cur_doc) == last_doc {
-                    break;
-                }
-                docs.push(cur_doc);
-                last_doc = Some(cur_doc);
-                break;
-            }
-            cur_doc += 1;
-        }
-    }
-
-    docs
-}
-
 #[cfg(test)]
 mod tests {
 
-    use fastfield_codecs::VecColumn;
-
     use crate::core::Index;
-    use crate::fastfield::multivalued::reader::positions_to_docids;
     use crate::schema::{Cardinality, Facet, FacetOptions, NumericOptions, Schema};
 
-    #[test]
-    fn test_positions_to_docid() {
-        let positions = vec![10u64, 11, 15, 20, 21, 22];
-
-        let offsets = vec![0, 10, 12, 15, 22, 23];
-        {
-            let column = VecColumn::from(&offsets);
-
-            let docids = positions_to_docids(&positions, &column);
-            assert_eq!(docids, vec![1, 3, 4]);
-        }
-    }
-
     #[test]
     fn test_multifastfield_reader() -> crate::Result<()> {
         let mut schema_builder = Schema::builder();

src/fastfield/multivalued/writer.rs

@@ -1,12 +1,9 @@
 use std::io;
 
-use fastfield_codecs::{
-    Column, MonotonicallyMappableToU128, MonotonicallyMappableToU64, VecColumn,
-};
+use fastfield_codecs::{Column, MonotonicallyMappableToU64, VecColumn};
 use fnv::FnvHashMap;
 
 use super::get_fastfield_codecs_for_multivalue;
-use crate::fastfield::writer::unexpected_value;
 use crate::fastfield::{value_to_u64, CompositeFastFieldSerializer, FastFieldType};
 use crate::indexer::doc_id_mapping::DocIdMapping;
 use crate::postings::UnorderedTermId;
@@ -82,11 +79,11 @@ impl MultiValuedFastFieldWriter {
 
     /// Shift to the next document and adds
     /// all of the matching field values present in the document.
-    pub fn add_document(&mut self, doc: &Document) -> crate::Result<()> {
+    pub fn add_document(&mut self, doc: &Document) {
         self.next_doc();
         // facets/texts are indexed in the `SegmentWriter` as we encode their unordered id.
         if self.fast_field_type.is_storing_term_ids() {
-            return Ok(());
+            return;
         }
         for field_value in doc.field_values() {
             if field_value.field == self.field {
@@ -95,12 +92,11 @@ impl MultiValuedFastFieldWriter {
                     (Some(precision), Value::Date(date_val)) => {
                         date_val.truncate(precision).to_u64()
                     }
-                    _ => value_to_u64(value)?,
+                    _ => value_to_u64(value),
                 };
                 self.add_val(value_u64);
             }
         }
-        Ok(())
     }
 
     /// Returns an iterator over values per doc_id in ascending doc_id order.
@@ -268,144 +264,6 @@ fn iter_remapped_multivalue_index<'a, C: Column>(
     }))
 }
 
-/// Writer for multi-valued (as in, more than one value per document)
-/// int fast field.
-///
-/// This `Writer` is only useful for advanced users.
-/// The normal way to get your multivalued int in your index
-/// is to
-/// - declare your field with fast set to `Cardinality::MultiValues`
-/// in your schema
-/// - add your document simply by calling `.add_document(...)`.
-///
-/// The `MultiValuedFastFieldWriter` can be acquired from the
-
-pub struct MultiValueU128FastFieldWriter {
-    field: Field,
-    vals: Vec<u128>,
-    doc_index: Vec<u64>,
-}
-
-impl MultiValueU128FastFieldWriter {
-    /// Creates a new `U128MultiValueFastFieldWriter`
-    pub(crate) fn new(field: Field) -> Self {
-        MultiValueU128FastFieldWriter {
-            field,
-            vals: Vec::new(),
-            doc_index: Vec::new(),
-        }
-    }
-
-    /// The memory used (inclusive childs)
-    pub fn mem_usage(&self) -> usize {
-        self.vals.capacity() * std::mem::size_of::<UnorderedTermId>()
-            + self.doc_index.capacity() * std::mem::size_of::<u64>()
-    }
-
-    /// Finalize the current document.
-    pub(crate) fn next_doc(&mut self) {
-        self.doc_index.push(self.vals.len() as u64);
-    }
-
-    /// Pushes a new value to the current document.
-    pub(crate) fn add_val(&mut self, val: u128) {
-        self.vals.push(val);
-    }
-
-    /// Shift to the next document and adds
-    /// all of the matching field values present in the document.
-    pub fn add_document(&mut self, doc: &Document) -> crate::Result<()> {
-        self.next_doc();
-        for field_value in doc.field_values() {
-            if field_value.field == self.field {
-                let value = field_value.value();
-                let ip_addr = value
-                    .as_ip_addr()
-                    .ok_or_else(|| unexpected_value("ip", value))?;
-                let ip_addr_u128 = ip_addr.to_u128();
-                self.add_val(ip_addr_u128);
-            }
-        }
-        Ok(())
-    }
-
-    /// Returns an iterator over values per doc_id in ascending doc_id order.
-    ///
-    /// Normally the order is simply iterating self.doc_id_index.
-    /// With doc_id_map it accounts for the new mapping, returning values in the order of the
-    /// new doc_ids.
-    fn get_ordered_values<'a: 'b, 'b>(
-        &'a self,
-        doc_id_map: Option<&'b DocIdMapping>,
-    ) -> impl Iterator<Item = &'b [u128]> {
-        get_ordered_values(&self.vals, &self.doc_index, doc_id_map)
-    }
-
-    /// Serializes fast field values.
-    pub fn serialize(
-        mut self,
-        serializer: &mut CompositeFastFieldSerializer,
-        doc_id_map: Option<&DocIdMapping>,
-    ) -> io::Result<()> {
-        {
-            // writing the offset index
-            //
-            self.doc_index.push(self.vals.len() as u64);
-            let col = VecColumn::from(&self.doc_index[..]);
-            if let Some(doc_id_map) = doc_id_map {
-                let multi_value_start_index = MultivalueStartIndex::new(&col, doc_id_map);
-                serializer.create_auto_detect_u64_fast_field_with_idx(
-                    self.field,
-                    multi_value_start_index,
-                    0,
-                )?;
-            } else {
-                serializer.create_auto_detect_u64_fast_field_with_idx(self.field, col, 0)?;
-            }
-        }
-        {
-            let iter_gen = || self.get_ordered_values(doc_id_map).flatten().cloned();
-
-            serializer.create_u128_fast_field_with_idx(
-                self.field,
-                iter_gen,
-                self.vals.len() as u64,
-                1,
-            )?;
-        }
-        Ok(())
-    }
-}
-
-/// Returns an iterator over values per doc_id in ascending doc_id order.
-///
-/// Normally the order is simply iterating self.doc_id_index.
-/// With doc_id_map it accounts for the new mapping, returning values in the order of the
-/// new doc_ids.
-fn get_ordered_values<'a: 'b, 'b, T>(
-    vals: &'a [T],
-    doc_index: &'a [u64],
-    doc_id_map: Option<&'b DocIdMapping>,
-) -> impl Iterator<Item = &'b [T]> {
-    let doc_id_iter: Box<dyn Iterator<Item = u32>> = if let Some(doc_id_map) = doc_id_map {
-        Box::new(doc_id_map.iter_old_doc_ids())
-    } else {
-        let max_doc = doc_index.len() as DocId;
-        Box::new(0..max_doc)
-    };
-    doc_id_iter.map(move |doc_id| get_values_for_doc_id(doc_id, vals, doc_index))
-}
-
-/// returns all values for a doc_id
-fn get_values_for_doc_id<'a, T>(doc_id: u32, vals: &'a [T], doc_index: &'a [u64]) -> &'a [T] {
-    let start_pos = doc_index[doc_id as usize] as usize;
-    let end_pos = doc_index
-        .get(doc_id as usize + 1)
-        .cloned()
-        .unwrap_or(vals.len() as u64) as usize; // special case, last doc_id has no offset information
-    &vals[start_pos..end_pos]
-}
-
 #[cfg(test)]
 mod tests {
     use super::*;

src/fastfield/readers.rs

@@ -1,9 +1,7 @@
-use std::net::Ipv6Addr;
 use std::sync::Arc;
 
-use fastfield_codecs::{open, open_u128, Column};
+use fastfield_codecs::{open, Column};
 
-use super::multivalued::MultiValuedU128FastFieldReader;
 use crate::directory::{CompositeFile, FileSlice};
 use crate::fastfield::{
     BytesFastFieldReader, FastFieldNotAvailableError, FastValue, MultiValuedFastFieldReader,
@@ -25,7 +23,6 @@ pub struct FastFieldReaders {
 pub(crate) enum FastType {
     I64,
     U64,
-    U128,
     F64,
     Bool,
     Date,
@@ -52,9 +49,6 @@ pub(crate) fn type_and_cardinality(field_type: &FieldType) -> Option<(FastType,
         FieldType::Str(options) if options.is_fast() => {
             Some((FastType::U64, Cardinality::MultiValues))
         }
-        FieldType::IpAddr(options) => options
-            .get_fastfield_cardinality()
-            .map(|cardinality| (FastType::U128, cardinality)),
         _ => None,
     }
 }
@@ -149,59 +143,6 @@ impl FastFieldReaders {
         self.typed_fast_field_reader(field)
     }
 
-    /// Returns the `ip` fast field reader reader associated to `field`.
-    ///
-    /// If `field` is not a u128 fast field, this method returns an Error.
-    pub fn ip_addr(&self, field: Field) -> crate::Result<Arc<dyn Column<Ipv6Addr>>> {
-        self.check_type(field, FastType::U128, Cardinality::SingleValue)?;
-        let bytes = self.fast_field_data(field, 0)?.read_bytes()?;
-        Ok(open_u128::<Ipv6Addr>(bytes)?)
-    }
-
-    /// Returns the `ip` fast field reader reader associated to `field`.
-    ///
-    /// If `field` is not a u128 fast field, this method returns an Error.
-    pub fn ip_addrs(
-        &self,
-        field: Field,
-    ) -> crate::Result<MultiValuedU128FastFieldReader<Ipv6Addr>> {
-        self.check_type(field, FastType::U128, Cardinality::MultiValues)?;
-        let idx_reader: Arc<dyn Column<u64>> = self.typed_fast_field_reader(field)?;
-
-        let bytes = self.fast_field_data(field, 1)?.read_bytes()?;
-        let vals_reader = open_u128::<Ipv6Addr>(bytes)?;
-
-        Ok(MultiValuedU128FastFieldReader::open(
-            idx_reader,
-            vals_reader,
-        ))
-    }
-
-    /// Returns the `u128` fast field reader reader associated to `field`.
-    ///
-    /// If `field` is not a u128 fast field, this method returns an Error.
-    pub(crate) fn u128(&self, field: Field) -> crate::Result<Arc<dyn Column<u128>>> {
-        self.check_type(field, FastType::U128, Cardinality::SingleValue)?;
-        let bytes = self.fast_field_data(field, 0)?.read_bytes()?;
-        Ok(open_u128::<u128>(bytes)?)
-    }
-
-    /// Returns the `u128` multi-valued fast field reader reader associated to `field`.
-    ///
-    /// If `field` is not a u128 multi-valued fast field, this method returns an Error.
-    pub fn u128s(&self, field: Field) -> crate::Result<MultiValuedU128FastFieldReader<u128>> {
-        self.check_type(field, FastType::U128, Cardinality::MultiValues)?;
-        let idx_reader: Arc<dyn Column<u64>> = self.typed_fast_field_reader(field)?;
-
-        let bytes = self.fast_field_data(field, 1)?.read_bytes()?;
-        let vals_reader = open_u128::<u128>(bytes)?;
-
-        Ok(MultiValuedU128FastFieldReader::open(
-            idx_reader,
-            vals_reader,
-        ))
-    }
-
     /// Returns the `u64` fast field reader reader associated with `field`, regardless of whether
     /// the given field is effectively of type `u64` or not.
     ///

src/fastfield/serializer/mod.rs

@@ -84,21 +84,6 @@ impl CompositeFastFieldSerializer {
         Ok(())
     }
 
-    /// Serialize data into a new u128 fast field. The codec will be compact space compressor,
-    /// which is optimized for scanning the fast field for a given range.
-    pub fn create_u128_fast_field_with_idx<F: Fn() -> I, I: Iterator<Item = u128>>(
-        &mut self,
-        field: Field,
-        iter_gen: F,
-        num_vals: u64,
-        idx: usize,
-    ) -> io::Result<()> {
-        let field_write = self.composite_write.for_field_with_idx(field, idx);
-        fastfield_codecs::serialize_u128(iter_gen, num_vals, field_write)?;
-
-        Ok(())
-    }
-
     /// Start serializing a new [u8] fast field. Use the returned writer to write data into the
     /// bytes field. To associate the bytes with documents a seperate index must be created on
     /// index 0. See bytes/writer.rs::serialize for an example.

src/fastfield/writer.rs

@@ -2,11 +2,11 @@ use std::collections::HashMap;
 use std::io;
 
 use common;
-use fastfield_codecs::{Column, MonotonicallyMappableToU128, MonotonicallyMappableToU64};
+use fastfield_codecs::{Column, MonotonicallyMappableToU64};
 use fnv::FnvHashMap;
 use tantivy_bitpacker::BlockedBitpacker;
 
-use super::multivalued::{MultiValueU128FastFieldWriter, MultiValuedFastFieldWriter};
+use super::multivalued::MultiValuedFastFieldWriter;
 use super::FastFieldType;
 use crate::fastfield::{BytesFastFieldWriter, CompositeFastFieldSerializer};
 use crate::indexer::doc_id_mapping::DocIdMapping;
@@ -19,19 +19,10 @@ use crate::DatePrecision;
 pub struct FastFieldsWriter {
     term_id_writers: Vec<MultiValuedFastFieldWriter>,
     single_value_writers: Vec<IntFastFieldWriter>,
-    u128_value_writers: Vec<U128FastFieldWriter>,
-    u128_multi_value_writers: Vec<MultiValueU128FastFieldWriter>,
     multi_values_writers: Vec<MultiValuedFastFieldWriter>,
     bytes_value_writers: Vec<BytesFastFieldWriter>,
 }
 
-pub(crate) fn unexpected_value(expected: &str, actual: &Value) -> crate::TantivyError {
-    crate::TantivyError::SchemaError(format!(
-        "Expected a {:?} in fast field, but got {:?}",
-        expected, actual
-    ))
-}
-
 fn fast_field_default_value(field_entry: &FieldEntry) -> u64 {
     match *field_entry.field_type() {
         FieldType::I64(_) | FieldType::Date(_) => common::i64_to_u64(0i64),
@@ -43,8 +34,6 @@ fn fast_field_default_value(field_entry: &FieldEntry) -> u64 {
 impl FastFieldsWriter {
     /// Create all `FastFieldWriter` required by the schema.
     pub fn from_schema(schema: &Schema) -> FastFieldsWriter {
-        let mut u128_value_writers = Vec::new();
-        let mut u128_multi_value_writers = Vec::new();
         let mut single_value_writers = Vec::new();
         let mut term_id_writers = Vec::new();
         let mut multi_values_writers = Vec::new();
@@ -108,27 +97,10 @@ impl FastFieldsWriter {
                         bytes_value_writers.push(fast_field_writer);
                     }
                 }
-                FieldType::IpAddr(opt) => {
-                    if opt.is_fast() {
-                        match opt.get_fastfield_cardinality() {
-                            Some(Cardinality::SingleValue) => {
-                                let fast_field_writer = U128FastFieldWriter::new(field);
-                                u128_value_writers.push(fast_field_writer);
-                            }
-                            Some(Cardinality::MultiValues) => {
-                                let fast_field_writer = MultiValueU128FastFieldWriter::new(field);
-                                u128_multi_value_writers.push(fast_field_writer);
-                            }
-                            None => {}
-                        }
-                    }
-                }
                 FieldType::Str(_) | FieldType::JsonObject(_) => {}
             }
         }
         FastFieldsWriter {
-            u128_value_writers,
-            u128_multi_value_writers,
             term_id_writers,
             single_value_writers,
             multi_values_writers,
@@ -157,16 +129,6 @@ impl FastFieldsWriter {
                 .iter()
                 .map(|w| w.mem_usage())
                 .sum::<usize>()
-            + self
-                .u128_value_writers
-                .iter()
-                .map(|w| w.mem_usage())
-                .sum::<usize>()
-            + self
-                .u128_multi_value_writers
-                .iter()
-                .map(|w| w.mem_usage())
-                .sum::<usize>()
     }
 
     /// Get the `FastFieldWriter` associated with a field.
@@ -228,27 +190,21 @@ impl FastFieldsWriter {
             .iter_mut()
             .find(|field_writer| field_writer.field() == field)
     }
+
     /// Indexes all of the fastfields of a new document.
-    pub fn add_document(&mut self, doc: &Document) -> crate::Result<()> {
+    pub fn add_document(&mut self, doc: &Document) {
         for field_writer in &mut self.term_id_writers {
-            field_writer.add_document(doc)?;
+            field_writer.add_document(doc);
         }
         for field_writer in &mut self.single_value_writers {
-            field_writer.add_document(doc)?;
+            field_writer.add_document(doc);
         }
         for field_writer in &mut self.multi_values_writers {
-            field_writer.add_document(doc)?;
+            field_writer.add_document(doc);
         }
         for field_writer in &mut self.bytes_value_writers {
-            field_writer.add_document(doc)?;
+            field_writer.add_document(doc);
         }
-        for field_writer in &mut self.u128_value_writers {
-            field_writer.add_document(doc)?;
-        }
-        for field_writer in &mut self.u128_multi_value_writers {
-            field_writer.add_document(doc)?;
-        }
-        Ok(())
     }
 
     /// Serializes all of the `FastFieldWriter`s by pushing them in
@@ -274,108 +230,6 @@ impl FastFieldsWriter {
         for field_writer in self.bytes_value_writers {
             field_writer.serialize(serializer, doc_id_map)?;
         }
-        for field_writer in self.u128_value_writers {
-            field_writer.serialize(serializer, doc_id_map)?;
-        }
-        for field_writer in self.u128_multi_value_writers {
-            field_writer.serialize(serializer, doc_id_map)?;
-        }
-
-        Ok(())
-    }
-}
-
-/// Fast field writer for u128 values.
-/// The fast field writer just keeps the values in memory.
-///
-/// Only when the segment writer can be closed and
-/// persisted on disk, the fast field writer is
-/// sent to a `FastFieldSerializer` via the `.serialize(...)`
-/// method.
-///
-/// We cannot serialize earlier as the values are
-/// compressed to a compact number space and the number of
-/// bits required for bitpacking can only been known once
-/// we have seen all of the values.
-pub struct U128FastFieldWriter {
-    field: Field,
-    vals: Vec<u128>,
-    val_count: u32,
-}
-
-impl U128FastFieldWriter {
-    /// Creates a new `IntFastFieldWriter`
-    pub fn new(field: Field) -> Self {
-        Self {
-            field,
-            vals: vec![],
-            val_count: 0,
-        }
-    }
-
-    /// The memory used (inclusive childs)
-    pub fn mem_usage(&self) -> usize {
-        self.vals.len() * 16
-    }
-
-    /// Records a new value.
-    ///
-    /// The n-th value being recorded is implicitely
-    /// associated to the document with the `DocId` n.
-    /// (Well, `n-1` actually because of 0-indexing)
-    pub fn add_val(&mut self, val: u128) {
-        self.vals.push(val);
-    }
-
-    /// Extract the fast field value from the document
-    /// (or use the default value) and records it.
-    ///
-    /// Extract the value associated to the fast field for
-    /// this document.
-    pub fn add_document(&mut self, doc: &Document) -> crate::Result<()> {
-        match doc.get_first(self.field) {
-            Some(v) => {
-                let ip_addr = v.as_ip_addr().ok_or_else(|| unexpected_value("ip", v))?;
-                let value = ip_addr.to_u128();
-                self.add_val(value);
-            }
-            None => {
-                self.add_val(0); // TODO fix null handling
-            }
-        };
-        self.val_count += 1;
-        Ok(())
-    }
-
-    /// Push the fast fields value to the `FastFieldWriter`.
-    pub fn serialize(
-        &self,
-        serializer: &mut CompositeFastFieldSerializer,
-        doc_id_map: Option<&DocIdMapping>,
-    ) -> io::Result<()> {
-        if let Some(doc_id_map) = doc_id_map {
-            let iter_gen = || {
-                doc_id_map
-                    .iter_old_doc_ids()
-                    .map(|idx| self.vals[idx as usize])
-            };
-
-            serializer.create_u128_fast_field_with_idx(
-                self.field,
-                iter_gen,
-                self.val_count as u64,
-                0,
-            )?;
-        } else {
-            let iter_gen = || self.vals.iter().cloned();
-            serializer.create_u128_fast_field_with_idx(
-                self.field,
-                iter_gen,
-                self.val_count as u64,
-                0,
-            )?;
-        }
-
         Ok(())
     }
 }
@@ -384,7 +238,7 @@ impl U128FastFieldWriter {
 /// The fast field writer just keeps the values in memory.
 ///
 /// Only when the segment writer can be closed and
-/// persisted on disk, the fast field writer is
+/// persisted on disc, the fast field writer is
 /// sent to a `FastFieldSerializer` via the `.serialize(...)`
 /// method.
 ///
@@ -471,14 +325,14 @@ impl IntFastFieldWriter {
     /// only the first one is taken in account.
     ///
     /// Values on text fast fields are skipped.
-    pub fn add_document(&mut self, doc: &Document) -> crate::Result<()> {
+    pub fn add_document(&mut self, doc: &Document) {
         match doc.get_first(self.field) {
             Some(v) => {
                 let value = match (self.precision_opt, v) {
                     (Some(precision), Value::Date(date_val)) => {
                         date_val.truncate(precision).to_u64()
                     }
-                    _ => super::value_to_u64(v)?,
+                    _ => super::value_to_u64(v),
                 };
                 self.add_val(value);
             }
@@ -486,7 +340,6 @@ impl IntFastFieldWriter {
                 self.add_val(self.val_if_missing);
             }
         };
-        Ok(())
     }
 
     /// get iterator over the data

src/indexer/index_writer.rs

@@ -803,9 +803,7 @@ impl Drop for IndexWriter {
 #[cfg(test)]
 mod tests {
     use std::collections::{HashMap, HashSet};
-    use std::net::Ipv6Addr;
 
-    use fastfield_codecs::MonotonicallyMappableToU128;
     use proptest::prelude::*;
     use proptest::prop_oneof;
     use proptest::strategy::Strategy;
@@ -817,13 +815,11 @@ mod tests {
     use crate::indexer::NoMergePolicy;
     use crate::query::{BooleanQuery, Occur, Query, QueryParser, TermQuery};
     use crate::schema::{
-        self, Cardinality, Facet, FacetOptions, IndexRecordOption, IpAddrOptions, NumericOptions,
+        self, Cardinality, Facet, FacetOptions, IndexRecordOption, NumericOptions,
         TextFieldIndexing, TextOptions, FAST, INDEXED, STORED, STRING, TEXT,
     };
     use crate::store::DOCSTORE_CACHE_CAPACITY;
-    use crate::{
-        DateTime, DocAddress, Index, IndexSettings, IndexSortByField, Order, ReloadPolicy, Term,
-    };
+    use crate::{DocAddress, Index, IndexSettings, IndexSortByField, Order, ReloadPolicy, Term};
 
     const LOREM: &str = "Doc Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do \
                          eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad \
@@ -1597,15 +1593,7 @@ mod tests {
         force_end_merge: bool,
     ) -> crate::Result<()> {
         let mut schema_builder = schema::Schema::builder();
-        let ip_field = schema_builder.add_ip_addr_field("ip", FAST | INDEXED | STORED);
-        let ips_field = schema_builder.add_ip_addr_field(
-            "ips",
-            IpAddrOptions::default().set_fast(Cardinality::MultiValues),
-        );
         let id_field = schema_builder.add_u64_field("id", FAST | INDEXED | STORED);
-        let i64_field = schema_builder.add_i64_field("i64", INDEXED);
-        let f64_field = schema_builder.add_f64_field("f64", INDEXED);
-        let date_field = schema_builder.add_date_field("date", INDEXED);
         let bytes_field = schema_builder.add_bytes_field("bytes", FAST | INDEXED | STORED);
         let bool_field = schema_builder.add_bool_field("bool", FAST | INDEXED | STORED);
         let text_field = schema_builder.add_text_field(
@@ -1656,49 +1644,21 @@ mod tests {
 
         let old_reader = index.reader()?;
 
-        let ip_exists = |id| id % 3 != 0; // 0 does not exist
-
         for &op in ops {
             match op {
                 IndexingOp::AddDoc { id } => {
                     let facet = Facet::from(&("/cola/".to_string() + &id.to_string()));
-                    let ip_from_id = Ipv6Addr::from_u128(id as u128);
-
-                    if !ip_exists(id) {
-                        // every 3rd doc has no ip field
-                        index_writer.add_document(doc!(id_field=>id,
-                                bytes_field => id.to_le_bytes().as_slice(),
-                                multi_numbers=> id,
-                                multi_numbers => id,
-                                bool_field => (id % 2u64) != 0,
-                                i64_field => id as i64,
-                                f64_field => id as f64,
-                                date_field => DateTime::from_timestamp_secs(id as i64),
-                                multi_bools => (id % 2u64) != 0,
-                                multi_bools => (id % 2u64) == 0,
-                                text_field => id.to_string(),
-                                facet_field => facet,
-                                large_text_field=> LOREM
-                        ))?;
-                    } else {
-                        index_writer.add_document(doc!(id_field=>id,
-                                bytes_field => id.to_le_bytes().as_slice(),
-                                ip_field => ip_from_id,
-                                ips_field => ip_from_id,
-                                ips_field => ip_from_id,
-                                multi_numbers=> id,
-                                multi_numbers => id,
-                                bool_field => (id % 2u64) != 0,
-                                i64_field => id as i64,
-                                f64_field => id as f64,
-                                date_field => DateTime::from_timestamp_secs(id as i64),
-                                multi_bools => (id % 2u64) != 0,
-                                multi_bools => (id % 2u64) == 0,
-                                text_field => id.to_string(),
-                                facet_field => facet,
-                                large_text_field=> LOREM
-                        ))?;
-                    }
+                    index_writer.add_document(doc!(id_field=>id,
+                            bytes_field => id.to_le_bytes().as_slice(),
+                            multi_numbers=> id,
+                            multi_numbers => id,
+                            bool_field => (id % 2u64) != 0,
+                            multi_bools => (id % 2u64) != 0,
+                            multi_bools => (id % 2u64) == 0,
+                            text_field => id.to_string(),
+                            facet_field => facet,
+                            large_text_field=> LOREM
+                    ))?;
                 }
                 IndexingOp::DeleteDoc { id } => {
                     index_writer.delete_term(Term::from_field_u64(id_field, id));
@@ -1784,60 +1744,6 @@ mod tests {
                 .collect::<HashSet<_>>()
         );
 
-        // Load all ips addr
-        let ips: HashSet<Ipv6Addr> = searcher
-            .segment_readers()
-            .iter()
-            .flat_map(|segment_reader| {
-                let ff_reader = segment_reader.fast_fields().ip_addr(ip_field).unwrap();
-                segment_reader.doc_ids_alive().flat_map(move |doc| {
-                    let val = ff_reader.get_val(doc as u64);
-                    if val == Ipv6Addr::from_u128(0) {
-                        // TODO Fix null handling
-                        None
-                    } else {
-                        Some(val)
-                    }
-                })
-            })
-            .collect();
-
-        let expected_ips = expected_ids_and_num_occurrences
-            .keys()
-            .flat_map(|id| {
-                if !ip_exists(*id) {
-                    None
-                } else {
-                    Some(Ipv6Addr::from_u128(*id as u128))
-                }
-            })
-            .collect::<HashSet<_>>();
-        assert_eq!(ips, expected_ips);
-
-        let expected_ips = expected_ids_and_num_occurrences
-            .keys()
-            .filter_map(|id| {
-                if !ip_exists(*id) {
-                    None
-                } else {
-                    Some(Ipv6Addr::from_u128(*id as u128))
-                }
-            })
-            .collect::<HashSet<_>>();
-        let ips: HashSet<Ipv6Addr> = searcher
-            .segment_readers()
-            .iter()
-            .flat_map(|segment_reader| {
-                let ff_reader = segment_reader.fast_fields().ip_addrs(ips_field).unwrap();
-                segment_reader.doc_ids_alive().flat_map(move |doc| {
-                    let mut vals = vec![];
-                    ff_reader.get_vals(doc, &mut vals);
-                    vals.into_iter().filter(|val| val.to_u128() != 0) // TODO Fix null handling
-                })
-            })
-            .collect();
-        assert_eq!(ips, expected_ips);
-
         // multivalue fast field tests
         for segment_reader in searcher.segment_readers().iter() {
             let id_reader = segment_reader.fast_fields().u64(id_field).unwrap();
@@ -1902,8 +1808,10 @@ mod tests {
             }
         }
         // test search
-        let do_search = |term: &str, field| {
-            let query = QueryParser::for_index(&index, vec![field])
+        let my_text_field = index.schema().get_field("text_field").unwrap();
+
+        let do_search = |term: &str| {
+            let query = QueryParser::for_index(&index, vec![my_text_field])
                 .parse_query(term)
                 .unwrap();
             let top_docs: Vec<(f32, DocAddress)> =
@@ -1912,70 +1820,11 @@ mod tests {
             top_docs.iter().map(|el| el.1).collect::<Vec<_>>()
         };
 
-        let do_search2 = |term: Term| {
-            let query = TermQuery::new(term, IndexRecordOption::Basic);
-            let top_docs: Vec<(f32, DocAddress)> =
-                searcher.search(&query, &TopDocs::with_limit(1000)).unwrap();
-
-            top_docs.iter().map(|el| el.1).collect::<Vec<_>>()
-        };
-
-        for (existing_id, count) in &expected_ids_and_num_occurrences {
-            let (existing_id, count) = (*existing_id, *count);
-            let assert_field = |field| do_search(&existing_id.to_string(), field).len() as u64;
-            assert_eq!(assert_field(text_field), count);
-            assert_eq!(assert_field(i64_field), count);
-            assert_eq!(assert_field(f64_field), count);
-            assert_eq!(assert_field(id_field), count);
-
-            // Test bytes
-            let term = Term::from_field_bytes(bytes_field, existing_id.to_le_bytes().as_slice());
-            assert_eq!(do_search2(term).len() as u64, count);
-
-            // Test date
-            let term = Term::from_field_date(
-                date_field,
-                DateTime::from_timestamp_secs(existing_id as i64),
-            );
-            assert_eq!(do_search2(term).len() as u64, count);
+        for (existing_id, count) in expected_ids_and_num_occurrences {
+            assert_eq!(do_search(&existing_id.to_string()).len() as u64, count);
         }
-        for deleted_id in deleted_ids {
-            let assert_field = |field| {
-                assert_eq!(do_search(&deleted_id.to_string(), field).len() as u64, 0);
-            };
-            assert_field(text_field);
-            assert_field(f64_field);
-            assert_field(i64_field);
-            assert_field(id_field);
-
-            // Test bytes
-            let term = Term::from_field_bytes(bytes_field, deleted_id.to_le_bytes().as_slice());
-            assert_eq!(do_search2(term).len() as u64, 0);
-
-            // Test date
-            let term =
-                Term::from_field_date(date_field, DateTime::from_timestamp_secs(deleted_id as i64));
-            assert_eq!(do_search2(term).len() as u64, 0);
-        }
-        // search ip address
-        //
-        for (existing_id, count) in &expected_ids_and_num_occurrences {
-            let (existing_id, count) = (*existing_id, *count);
-            if !ip_exists(existing_id) {
-                continue;
-            }
-            let do_search_ip_field = |term: &str| do_search(term, ip_field).len() as u64;
-            let ip_addr = Ipv6Addr::from_u128(existing_id as u128);
-            // Test incoming ip as ipv6
-            assert_eq!(do_search_ip_field(&format!("\"{}\"", ip_addr)), count);
-
-            let term = Term::from_field_ip_addr(ip_field, ip_addr);
-            assert_eq!(do_search2(term).len() as u64, count);
-
-            // Test incoming ip as ipv4
-            if let Some(ip_addr) = ip_addr.to_ipv4_mapped() {
-                assert_eq!(do_search_ip_field(&format!("\"{}\"", ip_addr)), count);
-            }
+        for existing_id in deleted_ids {
+            assert_eq!(do_search(&existing_id.to_string()).len(), 0);
         }
         // test facets
         for segment_reader in searcher.segment_readers().iter() {
@@ -1998,36 +1847,6 @@ mod tests {
         Ok(())
     }
 
-    #[test]
-    fn test_minimal() {
-        assert!(test_operation_strategy(
-            &[
-                IndexingOp::AddDoc { id: 23 },
-                IndexingOp::AddDoc { id: 13 },
-                IndexingOp::DeleteDoc { id: 13 }
-            ],
-            true,
-            false
-        )
-        .is_ok());
-
-        assert!(test_operation_strategy(
-            &[
-                IndexingOp::AddDoc { id: 23 },
-                IndexingOp::AddDoc { id: 13 },
-                IndexingOp::DeleteDoc { id: 13 }
-            ],
-            false,
-            false
-        )
-        .is_ok());
-    }
-
-    #[test]
-    fn test_minimal_sort_merge() {
-        assert!(test_operation_strategy(&[IndexingOp::AddDoc { id: 3 },], true, true).is_ok());
-    }
-
     proptest! {
         #![proptest_config(ProptestConfig::with_cases(20))]
         #[test]
@@ -2120,135 +1939,4 @@ mod tests {
         index_writer.commit()?;
         Ok(())
     }
-
-    #[test]
-    fn test_bug_1617_3() {
-        assert!(test_operation_strategy(
-            &[
-                IndexingOp::DeleteDoc { id: 0 },
-                IndexingOp::AddDoc { id: 6 },
-                IndexingOp::DeleteDocQuery { id: 11 },
-                IndexingOp::Commit,
-                IndexingOp::Merge,
-                IndexingOp::Commit,
-                IndexingOp::Commit
-            ],
-            false,
-            false
-        )
-        .is_ok());
-    }
-
-    #[test]
-    fn test_bug_1617_2() {
-        assert!(test_operation_strategy(
-            &[
-                IndexingOp::AddDoc { id: 13 },
-                IndexingOp::DeleteDoc { id: 13 },
-                IndexingOp::Commit,
-                IndexingOp::AddDoc { id: 30 },
-                IndexingOp::Commit,
-                IndexingOp::Merge,
-            ],
-            false,
-            true
-        )
-        .is_ok());
-    }
-
-    #[test]
-    fn test_bug_1617() -> crate::Result<()> {
-        let mut schema_builder = schema::Schema::builder();
-        let id_field = schema_builder.add_u64_field("id", INDEXED);
-
-        let schema = schema_builder.build();
-        let index = Index::builder().schema(schema).create_in_ram()?;
-        let mut index_writer = index.writer_for_tests()?;
-        index_writer.set_merge_policy(Box::new(NoMergePolicy));
-
-        let existing_id = 16u64;
-        let deleted_id = 13u64;
-        index_writer.add_document(doc!(
-            id_field=>existing_id,
-        ))?;
-        index_writer.add_document(doc!(
-            id_field=>deleted_id,
-        ))?;
-        index_writer.delete_term(Term::from_field_u64(id_field, deleted_id));
-        index_writer.commit()?;
-
-        // Merge
-        {
-            assert!(index_writer.wait_merging_threads().is_ok());
-            let mut index_writer = index.writer_for_tests()?;
-            let segment_ids = index
-                .searchable_segment_ids()
-                .expect("Searchable segments failed.");
-            index_writer.merge(&segment_ids).wait().unwrap();
-            assert!(index_writer.wait_merging_threads().is_ok());
-        }
-        let searcher = index.reader()?.searcher();
-
-        let query = TermQuery::new(
-            Term::from_field_u64(id_field, existing_id),
-            IndexRecordOption::Basic,
-        );
-        let top_docs: Vec<(f32, DocAddress)> =
-            searcher.search(&query, &TopDocs::with_limit(10)).unwrap();
-
-        assert_eq!(top_docs.len(), 1); // Fails
-
-        Ok(())
-    }
-
-    #[test]
-    fn test_bug_1618() -> crate::Result<()> {
-        let mut schema_builder = schema::Schema::builder();
-        let id_field = schema_builder.add_i64_field("id", INDEXED);
-
-        let schema = schema_builder.build();
-        let index = Index::builder().schema(schema).create_in_ram()?;
-        let mut index_writer = index.writer_for_tests()?;
-        index_writer.set_merge_policy(Box::new(NoMergePolicy));
-
-        index_writer.add_document(doc!(
-            id_field=>10i64,
-        ))?;
-        index_writer.add_document(doc!(
-            id_field=>30i64,
-        ))?;
-        index_writer.commit()?;
-
-        // Merge
-        {
-            assert!(index_writer.wait_merging_threads().is_ok());
-            let mut index_writer = index.writer_for_tests()?;
-            let segment_ids = index
-                .searchable_segment_ids()
-                .expect("Searchable segments failed.");
-            index_writer.merge(&segment_ids).wait().unwrap();
-            assert!(index_writer.wait_merging_threads().is_ok());
-        }
-        let searcher = index.reader()?.searcher();
-
-        let query = TermQuery::new(
-            Term::from_field_i64(id_field, 10i64),
-            IndexRecordOption::Basic,
-        );
-        let top_docs: Vec<(f32, DocAddress)> =
-            searcher.search(&query, &TopDocs::with_limit(10)).unwrap();
-
-        assert_eq!(top_docs.len(), 1); // Fails
-
-        let query = TermQuery::new(
-            Term::from_field_i64(id_field, 30i64),
-            IndexRecordOption::Basic,
-        );
-        let top_docs: Vec<(f32, DocAddress)> =
-            searcher.search(&query, &TopDocs::with_limit(10)).unwrap();
-
-        assert_eq!(top_docs.len(), 1); // Fails
-
-        Ok(())
-    }
 }

src/indexer/json_term_writer.rs

@@ -242,12 +242,10 @@ pub(crate) fn set_string_and_get_terms(
 ) -> Vec<(usize, Term)> {
     let mut positions_and_terms = Vec::<(usize, Term)>::new();
     json_term_writer.close_path_and_set_type(Type::Str);
-    let term_num_bytes = json_term_writer.term_buffer.len_bytes();
+    let term_num_bytes = json_term_writer.term_buffer.as_slice().len();
     let mut token_stream = text_analyzer.token_stream(value);
     token_stream.process(&mut |token| {
-        json_term_writer
-            .term_buffer
-            .truncate_value_bytes(term_num_bytes);
+        json_term_writer.term_buffer.truncate(term_num_bytes);
         json_term_writer
             .term_buffer
             .append_bytes(token.text.as_bytes());
@@ -267,7 +265,7 @@ impl<'a> JsonTermWriter<'a> {
         json_path: &str,
         term_buffer: &'a mut Term,
     ) -> Self {
-        term_buffer.set_field_and_type(field, Type::Json);
+        term_buffer.set_field(Type::Json, field);
         let mut json_term_writer = Self::wrap(term_buffer);
         for segment in json_path.split('.') {
             json_term_writer.push_path_segment(segment);
@@ -278,7 +276,7 @@ impl<'a> JsonTermWriter<'a> {
     pub fn wrap(term_buffer: &'a mut Term) -> Self {
         term_buffer.clear_with_type(Type::Json);
         let mut path_stack = Vec::with_capacity(10);
-        path_stack.push(0);
+        path_stack.push(5);
         Self {
             term_buffer,
             path_stack,
@@ -287,28 +285,28 @@ impl<'a> JsonTermWriter<'a> {
 
     fn trim_to_end_of_path(&mut self) {
         let end_of_path = *self.path_stack.last().unwrap();
-        self.term_buffer.truncate_value_bytes(end_of_path);
+        self.term_buffer.truncate(end_of_path);
     }
 
     pub fn close_path_and_set_type(&mut self, typ: Type) {
         self.trim_to_end_of_path();
-        let buffer = self.term_buffer.value_bytes_mut();
+        let buffer = self.term_buffer.as_mut();
         let buffer_len = buffer.len();
         buffer[buffer_len - 1] = JSON_END_OF_PATH;
-        self.term_buffer.append_bytes(&[typ.to_code()]);
+        buffer.push(typ.to_code());
     }
 
     pub fn push_path_segment(&mut self, segment: &str) {
         // the path stack should never be empty.
         self.trim_to_end_of_path();
-        let buffer = self.term_buffer.value_bytes_mut();
+        let buffer = self.term_buffer.as_mut();
         let buffer_len = buffer.len();
         if self.path_stack.len() > 1 {
             buffer[buffer_len - 1] = JSON_PATH_SEGMENT_SEP;
         }
-        self.term_buffer.append_bytes(segment.as_bytes());
-        self.term_buffer.append_bytes(&[JSON_PATH_SEGMENT_SEP]);
-        self.path_stack.push(self.term_buffer.len_bytes());
+        buffer.extend(segment.as_bytes());
+        buffer.push(JSON_PATH_SEGMENT_SEP);
+        self.path_stack.push(buffer.len());
     }
 
     pub fn pop_path_segment(&mut self) {
@@ -320,8 +318,8 @@ impl<'a> JsonTermWriter<'a> {
     /// Returns the json path of the term being currently built.
     #[cfg(test)]
     pub(crate) fn path(&self) -> &[u8] {
-        let end_of_path = self.path_stack.last().cloned().unwrap_or(1);
-        &self.term().value_bytes()[..end_of_path - 1]
+        let end_of_path = self.path_stack.last().cloned().unwrap_or(6);
+        &self.term().as_slice()[5..end_of_path - 1]
     }
 
     pub fn set_fast_value<T: FastValue>(&mut self, val: T) {
@@ -334,13 +332,14 @@ impl<'a> JsonTermWriter<'a> {
             val.to_u64()
         };
         self.term_buffer
-            .append_bytes(value.to_be_bytes().as_slice());
+            .as_mut()
+            .extend_from_slice(value.to_be_bytes().as_slice());
     }
 
     #[cfg(test)]
     pub(crate) fn set_str(&mut self, text: &str) {
         self.close_path_and_set_type(Type::Str);
-        self.term_buffer.append_bytes(text.as_bytes());
+        self.term_buffer.as_mut().extend_from_slice(text.as_bytes());
     }
 
     pub fn term(&self) -> &Term {
@@ -357,7 +356,8 @@ mod tests {
     #[test]
     fn test_json_writer() {
         let field = Field::from_field_id(1);
-        let mut term = Term::with_type_and_field(Type::Json, field);
+        let mut term = Term::new();
+        term.set_field(Type::Json, field);
         let mut json_writer = JsonTermWriter::wrap(&mut term);
         json_writer.push_path_segment("attributes");
         json_writer.push_path_segment("color");
@@ -391,7 +391,8 @@ mod tests {
     #[test]
     fn test_string_term() {
         let field = Field::from_field_id(1);
-        let mut term = Term::with_type_and_field(Type::Json, field);
+        let mut term = Term::new();
+        term.set_field(Type::Json, field);
         let mut json_writer = JsonTermWriter::wrap(&mut term);
         json_writer.push_path_segment("color");
         json_writer.set_str("red");
@@ -404,7 +405,8 @@ mod tests {
     #[test]
     fn test_i64_term() {
         let field = Field::from_field_id(1);
-        let mut term = Term::with_type_and_field(Type::Json, field);
+        let mut term = Term::new();
+        term.set_field(Type::Json, field);
         let mut json_writer = JsonTermWriter::wrap(&mut term);
         json_writer.push_path_segment("color");
         json_writer.set_fast_value(-4i64);
@@ -417,7 +419,8 @@ mod tests {
     #[test]
     fn test_u64_term() {
         let field = Field::from_field_id(1);
-        let mut term = Term::with_type_and_field(Type::Json, field);
+        let mut term = Term::new();
+        term.set_field(Type::Json, field);
         let mut json_writer = JsonTermWriter::wrap(&mut term);
         json_writer.push_path_segment("color");
         json_writer.set_fast_value(4u64);
@@ -430,7 +433,8 @@ mod tests {
     #[test]
     fn test_f64_term() {
         let field = Field::from_field_id(1);
-        let mut term = Term::with_type_and_field(Type::Json, field);
+        let mut term = Term::new();
+        term.set_field(Type::Json, field);
         let mut json_writer = JsonTermWriter::wrap(&mut term);
         json_writer.push_path_segment("color");
         json_writer.set_fast_value(4.0f64);
@@ -443,7 +447,8 @@ mod tests {
     #[test]
     fn test_bool_term() {
         let field = Field::from_field_id(1);
-        let mut term = Term::with_type_and_field(Type::Json, field);
+        let mut term = Term::new();
+        term.set_field(Type::Json, field);
         let mut json_writer = JsonTermWriter::wrap(&mut term);
         json_writer.push_path_segment("color");
         json_writer.set_fast_value(true);
@@ -456,7 +461,8 @@ mod tests {
     #[test]
     fn test_push_after_set_path_segment() {
         let field = Field::from_field_id(1);
-        let mut term = Term::with_type_and_field(Type::Json, field);
+        let mut term = Term::new();
+        term.set_field(Type::Json, field);
         let mut json_writer = JsonTermWriter::wrap(&mut term);
         json_writer.push_path_segment("attribute");
         json_writer.set_str("something");
@@ -471,7 +477,8 @@ mod tests {
     #[test]
     fn test_pop_segment() {
         let field = Field::from_field_id(1);
-        let mut term = Term::with_type_and_field(Type::Json, field);
+        let mut term = Term::new();
+        term.set_field(Type::Json, field);
         let mut json_writer = JsonTermWriter::wrap(&mut term);
         json_writer.push_path_segment("color");
         json_writer.push_path_segment("hue");
@@ -486,7 +493,8 @@ mod tests {
     #[test]
     fn test_json_writer_path() {
         let field = Field::from_field_id(1);
-        let mut term = Term::with_type_and_field(Type::Json, field);
+        let mut term = Term::new();
+        term.set_field(Type::Json, field);
         let mut json_writer = JsonTermWriter::wrap(&mut term);
         json_writer.push_path_segment("color");
         assert_eq!(json_writer.path(), b"color");

src/indexer/merger.rs

@@ -6,14 +6,13 @@ use fastfield_codecs::VecColumn;
 use itertools::Itertools;
 use measure_time::debug_time;
 
-use super::flat_map_with_buffer::FlatMapWithBufferIter;
 use super::sorted_doc_id_multivalue_column::RemappedDocIdMultiValueIndexColumn;
 use crate::core::{Segment, SegmentReader};
 use crate::docset::{DocSet, TERMINATED};
 use crate::error::DataCorruption;
 use crate::fastfield::{
     get_fastfield_codecs_for_multivalue, AliveBitSet, Column, CompositeFastFieldSerializer,
-    MultiValueLength, MultiValuedFastFieldReader, MultiValuedU128FastFieldReader,
+    MultiValueLength, MultiValuedFastFieldReader,
 };
 use crate::fieldnorm::{FieldNormReader, FieldNormReaders, FieldNormsSerializer, FieldNormsWriter};
 use crate::indexer::doc_id_mapping::{expect_field_id_for_sort_field, SegmentDocIdMapping};
@@ -296,24 +295,6 @@ impl IndexMerger {
                         self.write_bytes_fast_field(field, fast_field_serializer, doc_id_mapping)?;
                     }
                 }
-                FieldType::IpAddr(options) => match options.get_fastfield_cardinality() {
-                    Some(Cardinality::SingleValue) => {
-                        self.write_u128_single_fast_field(
-                            field,
-                            fast_field_serializer,
-                            doc_id_mapping,
-                        )?;
-                    }
-                    Some(Cardinality::MultiValues) => {
-                        self.write_u128_multi_fast_field(
-                            field,
-                            fast_field_serializer,
-                            doc_id_mapping,
-                        )?;
-                    }
-                    None => {}
-                },
-
                 FieldType::JsonObject(_) | FieldType::Facet(_) | FieldType::Str(_) => {
                     // We don't handle json fast field for the moment
                     // They can be implemented using what is done
@@ -324,91 +305,6 @@ impl IndexMerger {
         Ok(())
     }
 
-    // used to merge `u128` single fast fields.
-    fn write_u128_multi_fast_field(
-        &self,
-        field: Field,
-        fast_field_serializer: &mut CompositeFastFieldSerializer,
-        doc_id_mapping: &SegmentDocIdMapping,
-    ) -> crate::Result<()> {
-        let segment_and_ff_readers: Vec<(&SegmentReader, MultiValuedU128FastFieldReader<u128>)> =
-            self.readers
-                .iter()
-                .map(|segment_reader| {
-                    let ff_reader: MultiValuedU128FastFieldReader<u128> =
-                        segment_reader.fast_fields().u128s(field).expect(
-                            "Failed to find index for multivalued field. This is a bug in \
-                             tantivy, please report.",
-                        );
-                    (segment_reader, ff_reader)
-                })
-                .collect::<Vec<_>>();
-
-        Self::write_1_n_fast_field_idx_generic(
-            field,
-            fast_field_serializer,
-            doc_id_mapping,
-            &segment_and_ff_readers,
-        )?;
-
-        let fast_field_readers = segment_and_ff_readers
-            .into_iter()
-            .map(|(_, ff_reader)| ff_reader)
-            .collect::<Vec<_>>();
-
-        let iter_gen = || {
-            doc_id_mapping
-                .iter_old_doc_addrs()
-                .flat_map_with_buffer(|doc_addr, buffer| {
-                    let fast_field_reader = &fast_field_readers[doc_addr.segment_ord as usize];
-                    fast_field_reader.get_vals(doc_addr.doc_id, buffer);
-                })
-        };
-
-        fast_field_serializer.create_u128_fast_field_with_idx(
-            field,
-            iter_gen,
-            doc_id_mapping.len() as u64,
-            1,
-        )?;
-
-        Ok(())
-    }
-
-    // used to merge `u128` single fast fields.
-    fn write_u128_single_fast_field(
-        &self,
-        field: Field,
-        fast_field_serializer: &mut CompositeFastFieldSerializer,
-        doc_id_mapping: &SegmentDocIdMapping,
-    ) -> crate::Result<()> {
-        let fast_field_readers = self
-            .readers
-            .iter()
-            .map(|reader| {
-                let u128_reader: Arc<dyn Column<u128>> = reader.fast_fields().u128(field).expect(
-                    "Failed to find a reader for single fast field. This is a tantivy bug and it \
-                     should never happen.",
-                );
-                u128_reader
-            })
-            .collect::<Vec<_>>();
-
-        let iter_gen = || {
-            doc_id_mapping.iter_old_doc_addrs().map(|doc_addr| {
-                let fast_field_reader = &fast_field_readers[doc_addr.segment_ord as usize];
-                fast_field_reader.get_val(doc_addr.doc_id as u64)
-            })
-        };
-        fast_field_serializer.create_u128_fast_field_with_idx(
-            field,
-            iter_gen,
-            doc_id_mapping.len() as u64,
-            0,
-        )?;
-        Ok(())
-    }
-
     // used both to merge field norms, `u64/i64` single fast fields.
     fn write_single_fast_field(
         &self,

src/indexer/segment_serializer.rs

@@ -30,10 +30,8 @@ impl SegmentSerializer {
             StoreWriter::new(
                 store_write,
                 crate::store::Compressor::None,
-                // We want fast random access on the docs, so we choose a small block size.
-                // If this is zero, the skip index will contain too many checkpoints and
-                // therefore will be relatively slow.
-                16000,
+                0, // we want random access on the docs, so we choose a minimal block size. Every
+                // doc will get its own block.
                 settings.docstore_compress_dedicated_thread,
             )?
         } else {

src/indexer/segment_writer.rs

@@ -12,9 +12,11 @@ use crate::postings::{
     compute_table_size, serialize_postings, IndexingContext, IndexingPosition,
     PerFieldPostingsWriter, PostingsWriter,
 };
-use crate::schema::{FieldEntry, FieldType, Schema, Term, Value};
+use crate::schema::{FieldEntry, FieldType, FieldValue, Schema, Term, Value};
 use crate::store::{StoreReader, StoreWriter};
-use crate::tokenizer::{FacetTokenizer, PreTokenizedStream, TextAnalyzer, Tokenizer};
+use crate::tokenizer::{
+    BoxTokenStream, FacetTokenizer, PreTokenizedStream, TextAnalyzer, Tokenizer,
+};
 use crate::{DatePrecision, DocId, Document, Opstamp, SegmentComponent};
 
 /// Computes the initial size of the hash table.
@@ -114,7 +116,7 @@ impl SegmentWriter {
             fast_field_writers: FastFieldsWriter::from_schema(&schema),
             doc_opstamps: Vec::with_capacity(1_000),
             per_field_text_analyzers,
-            term_buffer: Term::with_capacity(16),
+            term_buffer: Term::new(),
             schema,
         })
     }
@@ -174,12 +176,10 @@ impl SegmentWriter {
             if !field_entry.is_indexed() {
                 continue;
             }
-
             let (term_buffer, ctx) = (&mut self.term_buffer, &mut self.ctx);
             let postings_writer: &mut dyn PostingsWriter =
                 self.per_field_postings_writers.get_for_field_mut(field);
-            term_buffer.clear_with_field_and_type(field_entry.field_type().value_type(), field);
-
+            term_buffer.set_field(field_entry.field_type().value_type(), field);
             match *field_entry.field_type() {
                 FieldType::Facet(_) => {
                     for value in values {
@@ -204,23 +204,27 @@ impl SegmentWriter {
                     }
                 }
                 FieldType::Str(_) => {
-                    let mut indexing_position = IndexingPosition::default();
+                    let mut token_streams: Vec<BoxTokenStream> = vec![];
+
                     for value in values {
-                        let mut token_stream = match value {
+                        match value {
                             Value::PreTokStr(tok_str) => {
-                                PreTokenizedStream::from(tok_str.clone()).into()
+                                token_streams
+                                    .push(PreTokenizedStream::from(tok_str.clone()).into());
                             }
                             Value::Str(ref text) => {
                                 let text_analyzer =
                                     &self.per_field_text_analyzers[field.field_id() as usize];
-                                text_analyzer.token_stream(text)
+                                token_streams.push(text_analyzer.token_stream(text));
                             }
-                            _ => {
-                                continue;
-                            }
-                        };
+                            _ => (),
+                        }
+                    }
 
-                        assert!(term_buffer.is_empty());
+                    let mut indexing_position = IndexingPosition::default();
+
+                    for mut token_stream in token_streams {
+                        assert_eq!(term_buffer.as_slice().len(), 5);
                         postings_writer.index_text(
                             doc_id,
                             &mut *token_stream,
@@ -236,76 +240,46 @@ impl SegmentWriter {
                     }
                 }
                 FieldType::U64(_) => {
-                    let mut num_vals = 0;
                     for value in values {
-                        num_vals += 1;
                         let u64_val = value.as_u64().ok_or_else(make_schema_error)?;
                         term_buffer.set_u64(u64_val);
                         postings_writer.subscribe(doc_id, 0u32, term_buffer, ctx);
                     }
-                    if field_entry.has_fieldnorms() {
-                        self.fieldnorms_writer.record(doc_id, field, num_vals);
-                    }
                 }
                 FieldType::Date(_) => {
-                    let mut num_vals = 0;
                     for value in values {
-                        num_vals += 1;
                         let date_val = value.as_date().ok_or_else(make_schema_error)?;
                         term_buffer.set_u64(date_val.truncate(DatePrecision::Seconds).to_u64());
                         postings_writer.subscribe(doc_id, 0u32, term_buffer, ctx);
                     }
-                    if field_entry.has_fieldnorms() {
-                        self.fieldnorms_writer.record(doc_id, field, num_vals);
-                    }
                 }
                 FieldType::I64(_) => {
-                    let mut num_vals = 0;
                     for value in values {
-                        num_vals += 1;
                         let i64_val = value.as_i64().ok_or_else(make_schema_error)?;
                         term_buffer.set_i64(i64_val);
                         postings_writer.subscribe(doc_id, 0u32, term_buffer, ctx);
                     }
-                    if field_entry.has_fieldnorms() {
-                        self.fieldnorms_writer.record(doc_id, field, num_vals);
-                    }
                 }
                 FieldType::F64(_) => {
-                    let mut num_vals = 0;
                     for value in values {
-                        num_vals += 1;
                         let f64_val = value.as_f64().ok_or_else(make_schema_error)?;
                         term_buffer.set_f64(f64_val);
                         postings_writer.subscribe(doc_id, 0u32, term_buffer, ctx);
                     }
-                    if field_entry.has_fieldnorms() {
-                        self.fieldnorms_writer.record(doc_id, field, num_vals);
-                    }
                 }
                 FieldType::Bool(_) => {
-                    let mut num_vals = 0;
                     for value in values {
-                        num_vals += 1;
                         let bool_val = value.as_bool().ok_or_else(make_schema_error)?;
                         term_buffer.set_bool(bool_val);
                         postings_writer.subscribe(doc_id, 0u32, term_buffer, ctx);
                     }
-                    if field_entry.has_fieldnorms() {
-                        self.fieldnorms_writer.record(doc_id, field, num_vals);
-                    }
                 }
                 FieldType::Bytes(_) => {
-                    let mut num_vals = 0;
                     for value in values {
-                        num_vals += 1;
                         let bytes = value.as_bytes().ok_or_else(make_schema_error)?;
                         term_buffer.set_bytes(bytes);
                         postings_writer.subscribe(doc_id, 0u32, term_buffer, ctx);
                     }
-                    if field_entry.has_fieldnorms() {
-                        self.fieldnorms_writer.record(doc_id, field, num_vals);
-                    }
                 }
                 FieldType::JsonObject(_) => {
                     let text_analyzer = &self.per_field_text_analyzers[field.field_id() as usize];
@@ -320,18 +294,6 @@ impl SegmentWriter {
                         ctx,
                     )?;
                 }
-                FieldType::IpAddr(_) => {
-                    let mut num_vals = 0;
-                    for value in values {
-                        num_vals += 1;
-                        let ip_addr = value.as_ip_addr().ok_or_else(make_schema_error)?;
-                        term_buffer.set_ip_addr(ip_addr);
-                        postings_writer.subscribe(doc_id, 0u32, term_buffer, ctx);
-                    }
-                    if field_entry.has_fieldnorms() {
-                        self.fieldnorms_writer.record(doc_id, field, num_vals);
-                    }
-                }
             }
         }
         Ok(())
@@ -343,10 +305,11 @@ impl SegmentWriter {
     pub fn add_document(&mut self, add_operation: AddOperation) -> crate::Result<()> {
         let doc = add_operation.document;
         self.doc_opstamps.push(add_operation.opstamp);
-        self.fast_field_writers.add_document(&doc)?;
+        self.fast_field_writers.add_document(&doc);
         self.index_document(&doc)?;
+        let prepared_doc = prepare_doc_for_store(doc, &self.schema);
         let doc_writer = self.segment_serializer.get_store_writer();
-        doc_writer.store(&doc, &self.schema)?;
+        doc_writer.store(&prepared_doc)?;
         self.max_doc += 1;
         Ok(())
     }
@@ -443,24 +406,40 @@ fn remap_and_write(
     Ok(())
 }
 
+/// Prepares Document for being stored in the document store
+///
+/// Method transforms PreTokenizedString values into String
+/// values.
+pub fn prepare_doc_for_store(doc: Document, schema: &Schema) -> Document {
+    Document::from(
+        doc.into_iter()
+            .filter(|field_value| schema.get_field_entry(field_value.field()).is_stored())
+            .map(|field_value| match field_value {
+                FieldValue {
+                    field,
+                    value: Value::PreTokStr(pre_tokenized_text),
+                } => FieldValue {
+                    field,
+                    value: Value::Str(pre_tokenized_text.text),
+                },
+                field_value => field_value,
+            })
+            .collect::<Vec<_>>(),
+    )
+}
+
 #[cfg(test)]
 mod tests {
-    use std::path::Path;
-
     use super::compute_initial_table_size;
     use crate::collector::Count;
-    use crate::directory::RamDirectory;
     use crate::indexer::json_term_writer::JsonTermWriter;
     use crate::postings::TermInfo;
     use crate::query::PhraseQuery;
     use crate::schema::{IndexRecordOption, Schema, Type, STORED, STRING, TEXT};
-    use crate::store::{Compressor, StoreReader, StoreWriter};
     use crate::time::format_description::well_known::Rfc3339;
     use crate::time::OffsetDateTime;
     use crate::tokenizer::{PreTokenizedString, Token};
-    use crate::{
-        DateTime, Directory, DocAddress, DocSet, Document, Index, Postings, Term, TERMINATED,
-    };
+    use crate::{DateTime, DocAddress, DocSet, Document, Index, Postings, Term, TERMINATED};
 
     #[test]
     fn test_hashmap_size() {
@@ -490,21 +469,14 @@ mod tests {
 
         doc.add_pre_tokenized_text(text_field, pre_tokenized_text);
         doc.add_text(text_field, "title");
+        let prepared_doc = super::prepare_doc_for_store(doc, &schema);
 
-        let path = Path::new("store");
-        let directory = RamDirectory::create();
-        let store_wrt = directory.open_write(path).unwrap();
-
-        let mut store_writer = StoreWriter::new(store_wrt, Compressor::None, 0, false).unwrap();
-        store_writer.store(&doc, &schema).unwrap();
-        store_writer.close().unwrap();
-
-        let reader = StoreReader::open(directory.open_read(path).unwrap(), 0).unwrap();
-        let doc = reader.get(0).unwrap();
-
-        assert_eq!(doc.field_values().len(), 2);
-        assert_eq!(doc.field_values()[0].value().as_text(), Some("A"));
-        assert_eq!(doc.field_values()[1].value().as_text(), Some("title"));
+        assert_eq!(prepared_doc.field_values().len(), 2);
+        assert_eq!(prepared_doc.field_values()[0].value().as_text(), Some("A"));
+        assert_eq!(
+            prepared_doc.field_values()[1].value().as_text(),
+            Some("title")
+        );
     }
 
     #[test]
@@ -554,7 +526,8 @@ mod tests {
         let inv_idx = segment_reader.inverted_index(json_field).unwrap();
         let term_dict = inv_idx.terms();
 
-        let mut term = Term::with_type_and_field(Type::Json, json_field);
+        let mut term = Term::new();
+        term.set_field(Type::Json, json_field);
         let mut term_stream = term_dict.stream().unwrap();
 
         let mut json_term_writer = JsonTermWriter::wrap(&mut term);
@@ -647,7 +620,8 @@ mod tests {
         let searcher = reader.searcher();
         let segment_reader = searcher.segment_reader(0u32);
         let inv_index = segment_reader.inverted_index(json_field).unwrap();
-        let mut term = Term::with_type_and_field(Type::Json, json_field);
+        let mut term = Term::new();
+        term.set_field(Type::Json, json_field);
         let mut json_term_writer = JsonTermWriter::wrap(&mut term);
         json_term_writer.push_path_segment("mykey");
         json_term_writer.set_str("token");
@@ -691,7 +665,8 @@ mod tests {
         let searcher = reader.searcher();
         let segment_reader = searcher.segment_reader(0u32);
         let inv_index = segment_reader.inverted_index(json_field).unwrap();
-        let mut term = Term::with_type_and_field(Type::Json, json_field);
+        let mut term = Term::new();
+        term.set_field(Type::Json, json_field);
         let mut json_term_writer = JsonTermWriter::wrap(&mut term);
         json_term_writer.push_path_segment("mykey");
         json_term_writer.set_str("two tokens");
@@ -736,7 +711,8 @@ mod tests {
         writer.commit().unwrap();
         let reader = index.reader().unwrap();
         let searcher = reader.searcher();
-        let mut term = Term::with_type_and_field(Type::Json, json_field);
+        let mut term = Term::new();
+        term.set_field(Type::Json, json_field);
         let mut json_term_writer = JsonTermWriter::wrap(&mut term);
         json_term_writer.push_path_segment("mykey");
         json_term_writer.push_path_segment("field");
@@ -751,38 +727,4 @@ mod tests {
         let phrase_query = PhraseQuery::new(vec![nothello_term, happy_term]);
         assert_eq!(searcher.search(&phrase_query, &Count).unwrap(), 0);
     }
-
-    #[test]
-    fn test_bug_regression_1629_position_when_array_with_a_field_value_that_does_not_contain_any_token(
-    ) {
-        // We experienced a bug where we would have a position underflow when computing position
-        // delta in an horrible corner case.
-        //
-        // See the commit with this unit test if you want the details.
-        let mut schema_builder = Schema::builder();
-        let text = schema_builder.add_text_field("text", TEXT);
-        let schema = schema_builder.build();
-        let doc = schema
-            .parse_document(r#"{"text": [ "bbb", "aaa", "", "aaa"]}"#)
-            .unwrap();
-        let index = Index::create_in_ram(schema);
-        let mut index_writer = index.writer_for_tests().unwrap();
-        index_writer.add_document(doc).unwrap();
-        // On debug this did panic on the underflow
-        index_writer.commit().unwrap();
-        let reader = index.reader().unwrap();
-        let searcher = reader.searcher();
-        let seg_reader = searcher.segment_reader(0);
-        let inv_index = seg_reader.inverted_index(text).unwrap();
-        let term = Term::from_field_text(text, "aaa");
-        let mut postings = inv_index
-            .read_postings(&term, IndexRecordOption::WithFreqsAndPositions)
-            .unwrap()
-            .unwrap();
-        assert_eq!(postings.doc(), 0u32);
-        let mut positions = Vec::new();
-        postings.positions(&mut positions);
-        // On release this was [2, 1]. (< note the decreasing values)
-        assert_eq!(positions, &[2, 5]);
-    }
 }

src/postings/json_postings_writer.rs

@@ -3,7 +3,7 @@ use std::io;
 use crate::fastfield::MultiValuedFastFieldWriter;
 use crate::indexer::doc_id_mapping::DocIdMapping;
 use crate::postings::postings_writer::SpecializedPostingsWriter;
-use crate::postings::recorder::{BufferLender, DocIdRecorder, Recorder};
+use crate::postings::recorder::{BufferLender, NothingRecorder, Recorder};
 use crate::postings::stacker::Addr;
 use crate::postings::{
     FieldSerializer, IndexingContext, IndexingPosition, PostingsWriter, UnorderedTermId,
@@ -16,7 +16,7 @@ use crate::{DocId, Term};
 #[derive(Default)]
 pub(crate) struct JsonPostingsWriter<Rec: Recorder> {
     str_posting_writer: SpecializedPostingsWriter<Rec>,
-    non_str_posting_writer: SpecializedPostingsWriter<DocIdRecorder>,
+    non_str_posting_writer: SpecializedPostingsWriter<NothingRecorder>,
 }
 
 impl<Rec: Recorder> From<JsonPostingsWriter<Rec>> for Box<dyn PostingsWriter> {
@@ -77,7 +77,7 @@ impl<Rec: Recorder> PostingsWriter for JsonPostingsWriter<Rec> {
                         serializer,
                     )?;
                 } else {
-                    SpecializedPostingsWriter::<DocIdRecorder>::serialize_one_term(
+                    SpecializedPostingsWriter::<NothingRecorder>::serialize_one_term(
                         term,
                         *addr,
                         doc_id_map,

src/postings/per_field_postings_writer.rs

@@ -1,6 +1,6 @@
 use crate::postings::json_postings_writer::JsonPostingsWriter;
 use crate::postings::postings_writer::SpecializedPostingsWriter;
-use crate::postings::recorder::{DocIdRecorder, TermFrequencyRecorder, TfAndPositionRecorder};
+use crate::postings::recorder::{NothingRecorder, TermFrequencyRecorder, TfAndPositionRecorder};
 use crate::postings::PostingsWriter;
 use crate::schema::{Field, FieldEntry, FieldType, IndexRecordOption, Schema};
 
@@ -34,7 +34,7 @@ fn posting_writer_from_field_entry(field_entry: &FieldEntry) -> Box<dyn Postings
             .get_indexing_options()
             .map(|indexing_options| match indexing_options.index_option() {
                 IndexRecordOption::Basic => {
-                    SpecializedPostingsWriter::<DocIdRecorder>::default().into()
+                    SpecializedPostingsWriter::<NothingRecorder>::default().into()
                 }
                 IndexRecordOption::WithFreqs => {
                     SpecializedPostingsWriter::<TermFrequencyRecorder>::default().into()
@@ -43,20 +43,19 @@ fn posting_writer_from_field_entry(field_entry: &FieldEntry) -> Box<dyn Postings
                     SpecializedPostingsWriter::<TfAndPositionRecorder>::default().into()
                 }
             })
-            .unwrap_or_else(|| SpecializedPostingsWriter::<DocIdRecorder>::default().into()),
+            .unwrap_or_else(|| SpecializedPostingsWriter::<NothingRecorder>::default().into()),
         FieldType::U64(_)
         | FieldType::I64(_)
         | FieldType::F64(_)
         | FieldType::Bool(_)
         | FieldType::Date(_)
         | FieldType::Bytes(_)
-        | FieldType::IpAddr(_)
-        | FieldType::Facet(_) => Box::new(SpecializedPostingsWriter::<DocIdRecorder>::default()),
+        | FieldType::Facet(_) => Box::new(SpecializedPostingsWriter::<NothingRecorder>::default()),
         FieldType::JsonObject(ref json_object_options) => {
             if let Some(text_indexing_option) = json_object_options.get_text_indexing_options() {
                 match text_indexing_option.index_option() {
                     IndexRecordOption::Basic => {
-                        JsonPostingsWriter::<DocIdRecorder>::default().into()
+                        JsonPostingsWriter::<NothingRecorder>::default().into()
                     }
                     IndexRecordOption::WithFreqs => {
                         JsonPostingsWriter::<TermFrequencyRecorder>::default().into()
@@ -66,7 +65,7 @@ fn posting_writer_from_field_entry(field_entry: &FieldEntry) -> Box<dyn Postings
                     }
                 }
             } else {
-                JsonPostingsWriter::<DocIdRecorder>::default().into()
+                JsonPostingsWriter::<NothingRecorder>::default().into()
             }
         }
     }

src/postings/postings_writer.rs

@@ -89,7 +89,6 @@ pub(crate) fn serialize_postings(
             | FieldType::Bool(_) => {}
             FieldType::Bytes(_) => {}
             FieldType::JsonObject(_) => {}
-            FieldType::IpAddr(_) => {}
         }
 
         let postings_writer = per_field_postings_writers.get_for_field(field);
@@ -153,9 +152,9 @@ pub(crate) trait PostingsWriter: Send + Sync {
         indexing_position: &mut IndexingPosition,
         mut term_id_fast_field_writer_opt: Option<&mut MultiValuedFastFieldWriter>,
     ) {
-        let end_of_path_idx = term_buffer.len_bytes();
+        let end_of_path_idx = term_buffer.as_slice().len();
         let mut num_tokens = 0;
-        let mut end_position = indexing_position.end_position;
+        let mut end_position = 0;
         token_stream.process(&mut |token: &Token| {
             // We skip all tokens with a len greater than u16.
             if token.text.len() > MAX_TOKEN_LEN {
@@ -167,7 +166,7 @@ pub(crate) trait PostingsWriter: Send + Sync {
                 );
                 return;
             }
-            term_buffer.truncate_value_bytes(end_of_path_idx);
+            term_buffer.truncate(end_of_path_idx);
             term_buffer.append_bytes(token.text.as_bytes());
             let start_position = indexing_position.end_position + token.position as u32;
             end_position = start_position + token.position_length as u32;
@@ -181,7 +180,7 @@ pub(crate) trait PostingsWriter: Send + Sync {
 
         indexing_position.end_position = end_position + POSITION_GAP;
         indexing_position.num_tokens += num_tokens;
-        term_buffer.truncate_value_bytes(end_of_path_idx);
+        term_buffer.truncate(end_of_path_idx);
     }
 
     fn total_num_tokens(&self) -> u64;

src/postings/recorder.rs

@@ -83,21 +83,21 @@ pub(crate) trait Recorder: Copy + Default + Send + Sync + 'static {
 
 /// Only records the doc ids
 #[derive(Clone, Copy)]
-pub struct DocIdRecorder {
+pub struct NothingRecorder {
     stack: ExpUnrolledLinkedList,
     current_doc: DocId,
 }
 
-impl Default for DocIdRecorder {
+impl Default for NothingRecorder {
     fn default() -> Self {
-        DocIdRecorder {
+        NothingRecorder {
             stack: ExpUnrolledLinkedList::new(),
             current_doc: u32::MAX,
         }
     }
 }
 
-impl Recorder for DocIdRecorder {
+impl Recorder for NothingRecorder {
     fn current_doc(&self) -> DocId {
         self.current_doc
     }

src/postings/stacker/term_hashmap.rs

@@ -98,7 +98,7 @@ impl<'a> Iterator for Iter<'a> {
 /// # Panics if n == 0
 fn compute_previous_power_of_two(n: usize) -> usize {
     assert!(n > 0);
-    let msb = (63u32 - (n as u64).leading_zeros()) as u8;
+    let msb = (63u32 - n.leading_zeros()) as u8;
     1 << msb
 }
 

src/query/boolean_query/block_wand.rs

@@ -212,12 +212,12 @@ pub fn block_wand(
 }
 
 /// Specialized version of [`block_wand`] for a single scorer.
-/// In this case, the algorithm is simple, readable and faster (~ x3)
+/// In this case, the algorithm is simple and readable and faster (~ x3)
 /// than the generic algorithm.
 /// The algorithm behaves as follows:
 /// - While we don't hit the end of the docset:
 ///   - While the block max score is under the `threshold`, go to the next block.
-///   - On a block, advance until the end and execute `callback` when the doc score is greater or
+///   - On a block, advance until the end and execute `callback`` when the doc score is greater or
 ///     equal to the `threshold`.
 pub fn block_wand_single_scorer(
     mut scorer: TermScorer,

src/query/query_parser/query_parser.rs

@@ -1,5 +1,4 @@
 use std::collections::HashMap;
-use std::net::{AddrParseError, IpAddr};
 use std::num::{ParseFloatError, ParseIntError};
 use std::ops::Bound;
 use std::str::{FromStr, ParseBoolError};
@@ -16,7 +15,7 @@ use crate::query::{
     TermQuery,
 };
 use crate::schema::{
-    Facet, FacetParseError, Field, FieldType, IndexRecordOption, IntoIpv6Addr, Schema, Term, Type,
+    Facet, FacetParseError, Field, FieldType, IndexRecordOption, Schema, Term, Type,
 };
 use crate::time::format_description::well_known::Rfc3339;
 use crate::time::OffsetDateTime;
@@ -85,9 +84,6 @@ pub enum QueryParserError {
     /// The format for the facet field is invalid.
     #[error("The facet field is malformed: {0}")]
     FacetFormatError(#[from] FacetParseError),
-    /// The format for the ip field is invalid.
-    #[error("The ip field is malformed: {0}")]
-    IpFormatError(#[from] AddrParseError),
 }
 
 /// Recursively remove empty clause from the AST
@@ -404,10 +400,6 @@ impl QueryParser {
                 let bytes = base64::decode(phrase).map_err(QueryParserError::ExpectedBase64)?;
                 Ok(Term::from_field_bytes(field, &bytes))
             }
-            FieldType::IpAddr(_) => {
-                let ip_v6 = IpAddr::from_str(phrase)?.into_ipv6_addr();
-                Ok(Term::from_field_ip_addr(field, ip_v6))
-            }
         }
     }
 
@@ -514,11 +506,6 @@ impl QueryParser {
                 let bytes_term = Term::from_field_bytes(field, &bytes);
                 Ok(vec![LogicalLiteral::Term(bytes_term)])
             }
-            FieldType::IpAddr(_) => {
-                let ip_v6 = IpAddr::from_str(phrase)?.into_ipv6_addr();
-                let term = Term::from_field_ip_addr(field, ip_v6);
-                Ok(vec![LogicalLiteral::Term(term)])
-            }
         }
     }
 
@@ -743,7 +730,7 @@ fn generate_literals_for_json_object(
     index_record_option: IndexRecordOption,
 ) -> Result<Vec<LogicalLiteral>, QueryParserError> {
     let mut logical_literals = Vec::new();
-    let mut term = Term::with_capacity(100);
+    let mut term = Term::new();
     let mut json_term_writer =
         JsonTermWriter::from_field_and_json_path(field, json_path, &mut term);
     if let Some(term) = convert_to_fast_value_and_get_term(&mut json_term_writer, phrase) {

src/query/range_query.rs

@@ -328,15 +328,13 @@ impl Weight for RangeWeight {
 #[cfg(test)]
 mod tests {
 
-    use std::net::IpAddr;
     use std::ops::Bound;
-    use std::str::FromStr;
 
     use super::RangeQuery;
     use crate::collector::{Count, TopDocs};
     use crate::query::QueryParser;
-    use crate::schema::{Document, Field, IntoIpv6Addr, Schema, INDEXED, STORED, TEXT};
-    use crate::{doc, Index};
+    use crate::schema::{Document, Field, Schema, INDEXED, TEXT};
+    use crate::Index;
 
     #[test]
     fn test_range_query_simple() -> crate::Result<()> {
@@ -508,69 +506,4 @@ mod tests {
         assert_eq!(top_docs.len(), 1);
         Ok(())
     }
-
-    #[test]
-    fn search_ip_range_test() {
-        let mut schema_builder = Schema::builder();
-        let ip_field = schema_builder.add_ip_addr_field("ip", INDEXED | STORED);
-        let schema = schema_builder.build();
-        let index = Index::create_in_ram(schema);
-        let ip_addr_1 = IpAddr::from_str("127.0.0.10").unwrap().into_ipv6_addr();
-        let ip_addr_2 = IpAddr::from_str("127.0.0.20").unwrap().into_ipv6_addr();
-
-        {
-            let mut index_writer = index.writer(3_000_000).unwrap();
-            index_writer
-                .add_document(doc!(
-                    ip_field => ip_addr_1
-                ))
-                .unwrap();
-            index_writer
-                .add_document(doc!(
-                    ip_field => ip_addr_2
-                ))
-                .unwrap();
-
-            index_writer.commit().unwrap();
-        }
-        let reader = index.reader().unwrap();
-        let searcher = reader.searcher();
-
-        let get_num_hits = |query| {
-            let (_top_docs, count) = searcher
-                .search(&query, &(TopDocs::with_limit(10), Count))
-                .unwrap();
-            count
-        };
-        let query_from_text = |text: &str| {
-            QueryParser::for_index(&index, vec![ip_field])
-                .parse_query(text)
-                .unwrap()
-        };
-
-        assert_eq!(
-            get_num_hits(query_from_text("ip:[127.0.0.1 TO 127.0.0.20]")),
-            2
-        );
-
-        assert_eq!(
-            get_num_hits(query_from_text("ip:[127.0.0.10 TO 127.0.0.20]")),
-            2
-        );
-
-        assert_eq!(
-            get_num_hits(query_from_text("ip:[127.0.0.11 TO 127.0.0.20]")),
-            1
-        );
-
-        assert_eq!(
-            get_num_hits(query_from_text("ip:[127.0.0.11 TO 127.0.0.19]")),
-            0
-        );
-
-        assert_eq!(get_num_hits(query_from_text("ip:[127.0.0.11 TO *]")), 1);
-        assert_eq!(get_num_hits(query_from_text("ip:[127.0.0.21 TO *]")), 0);
-        assert_eq!(get_num_hits(query_from_text("ip:[* TO 127.0.0.9]")), 0);
-        assert_eq!(get_num_hits(query_from_text("ip:[* TO 127.0.0.10]")), 1);
-    }
 }

src/query/term_query/term_query.rs

@@ -124,70 +124,3 @@ impl Query for TermQuery {
         visitor(&self.term, false);
     }
 }
-
-#[cfg(test)]
-mod tests {
-    use std::net::{IpAddr, Ipv6Addr};
-    use std::str::FromStr;
-
-    use fastfield_codecs::MonotonicallyMappableToU128;
-
-    use crate::collector::{Count, TopDocs};
-    use crate::query::{Query, QueryParser, TermQuery};
-    use crate::schema::{IndexRecordOption, IntoIpv6Addr, Schema, INDEXED, STORED};
-    use crate::{doc, Index, Term};
-
-    #[test]
-    fn search_ip_test() {
-        let mut schema_builder = Schema::builder();
-        let ip_field = schema_builder.add_ip_addr_field("ip", INDEXED | STORED);
-        let schema = schema_builder.build();
-        let index = Index::create_in_ram(schema);
-        let ip_addr_1 = IpAddr::from_str("127.0.0.1").unwrap().into_ipv6_addr();
-        let ip_addr_2 = Ipv6Addr::from_u128(10);
-
-        {
-            let mut index_writer = index.writer(3_000_000).unwrap();
-            index_writer
-                .add_document(doc!(
-                    ip_field => ip_addr_1
-                ))
-                .unwrap();
-            index_writer
-                .add_document(doc!(
-                    ip_field => ip_addr_2
-                ))
-                .unwrap();
-
-            index_writer.commit().unwrap();
-        }
-        let reader = index.reader().unwrap();
-        let searcher = reader.searcher();
-
-        let assert_single_hit = |query| {
-            let (_top_docs, count) = searcher
-                .search(&query, &(TopDocs::with_limit(2), Count))
-                .unwrap();
-            assert_eq!(count, 1);
-        };
-        let query_from_text = |text: String| {
-            QueryParser::for_index(&index, vec![ip_field])
-                .parse_query(&text)
-                .unwrap()
-        };
-
-        let query_from_ip = |ip_addr| -> Box<dyn Query> {
-            Box::new(TermQuery::new(
-                Term::from_field_ip_addr(ip_field, ip_addr),
-                IndexRecordOption::Basic,
-            ))
-        };
-
-        assert_single_hit(query_from_ip(ip_addr_1));
-        assert_single_hit(query_from_ip(ip_addr_2));
-        assert_single_hit(query_from_text("127.0.0.1".to_string()));
-        assert_single_hit(query_from_text("\"127.0.0.1\"".to_string()));
-        assert_single_hit(query_from_text(format!("\"{}\"", ip_addr_1)));
-        assert_single_hit(query_from_text(format!("\"{}\"", ip_addr_2)));
-    }
-}

src/schema/document.rs

@@ -1,7 +1,6 @@
 use std::collections::{HashMap, HashSet};
 use std::io::{self, Read, Write};
 use std::mem;
-use std::net::Ipv6Addr;
 
 use common::{BinarySerializable, VInt};
 
@@ -98,11 +97,6 @@ impl Document {
         self.add_field_value(field, value);
     }
 
-    /// Add a IP address field. Internally only Ipv6Addr is used.
-    pub fn add_ip_addr(&mut self, field: Field, value: Ipv6Addr) {
-        self.add_field_value(field, value);
-    }
-
     /// Add a i64 field
     pub fn add_i64(&mut self, field: Field, value: i64) {
         self.add_field_value(field, value);
@@ -197,34 +191,6 @@ impl Document {
     pub fn get_first(&self, field: Field) -> Option<&Value> {
         self.get_all(field).next()
     }
-
-    /// Serializes stored field values.
-    pub fn serialize_stored<W: Write>(&self, schema: &Schema, writer: &mut W) -> io::Result<()> {
-        let stored_field_values = || {
-            self.field_values()
-                .iter()
-                .filter(|field_value| schema.get_field_entry(field_value.field()).is_stored())
-        };
-        let num_field_values = stored_field_values().count();
-
-        VInt(num_field_values as u64).serialize(writer)?;
-        for field_value in stored_field_values() {
-            match field_value {
-                FieldValue {
-                    field,
-                    value: Value::PreTokStr(pre_tokenized_text),
-                } => {
-                    let field_value = FieldValue {
-                        field: *field,
-                        value: Value::Str(pre_tokenized_text.text.to_string()),
-                    };
-                    field_value.serialize(writer)?;
-                }
-                field_value => field_value.serialize(writer)?,
-            };
-        }
-        Ok(())
-    }
 }
 
 impl BinarySerializable for Document {

src/schema/field_entry.rs

@@ -1,6 +1,5 @@
 use serde::{Deserialize, Serialize};
 
-use super::ip_options::IpAddrOptions;
 use crate::schema::bytes_options::BytesOptions;
 use crate::schema::{
     is_valid_field_name, DateOptions, FacetOptions, FieldType, JsonObjectOptions, NumericOptions,
@@ -61,11 +60,6 @@ impl FieldEntry {
         Self::new(field_name, FieldType::Date(date_options))
     }
 
-    /// Creates a new ip address field entry.
-    pub fn new_ip_addr(field_name: String, ip_options: IpAddrOptions) -> FieldEntry {
-        Self::new(field_name, FieldType::IpAddr(ip_options))
-    }
-
     /// Creates a field entry for a facet.
     pub fn new_facet(field_name: String, facet_options: FacetOptions) -> FieldEntry {
         Self::new(field_name, FieldType::Facet(facet_options))
@@ -120,7 +114,6 @@ impl FieldEntry {
             FieldType::Facet(ref options) => options.is_stored(),
             FieldType::Bytes(ref options) => options.is_stored(),
             FieldType::JsonObject(ref options) => options.is_stored(),
-            FieldType::IpAddr(ref options) => options.is_stored(),
         }
     }
 }

src/schema/field_type.rs

@@ -1,12 +1,8 @@
-use std::net::IpAddr;
-use std::str::FromStr;
-
 use serde::{Deserialize, Serialize};
 use serde_json::Value as JsonValue;
 use thiserror::Error;
 
-use super::ip_options::IpAddrOptions;
-use super::{Cardinality, IntoIpv6Addr};
+use super::Cardinality;
 use crate::schema::bytes_options::BytesOptions;
 use crate::schema::facet_options::FacetOptions;
 use crate::schema::{
@@ -66,11 +62,9 @@ pub enum Type {
     Bytes = b'b',
     /// Leaf in a Json object.
     Json = b'j',
-    /// IpAddr
-    IpAddr = b'p',
 }
 
-const ALL_TYPES: [Type; 10] = [
+const ALL_TYPES: [Type; 9] = [
     Type::Str,
     Type::U64,
     Type::I64,
@@ -80,7 +74,6 @@ const ALL_TYPES: [Type; 10] = [
     Type::Facet,
     Type::Bytes,
     Type::Json,
-    Type::IpAddr,
 ];
 
 impl Type {
@@ -107,7 +100,6 @@ impl Type {
             Type::Facet => "Facet",
             Type::Bytes => "Bytes",
             Type::Json => "Json",
-            Type::IpAddr => "IpAddr",
         }
     }
 
@@ -124,7 +116,6 @@ impl Type {
             b'h' => Some(Type::Facet),
             b'b' => Some(Type::Bytes),
             b'j' => Some(Type::Json),
-            b'p' => Some(Type::IpAddr),
             _ => None,
         }
     }
@@ -155,8 +146,6 @@ pub enum FieldType {
     Bytes(BytesOptions),
     /// Json object
     JsonObject(JsonObjectOptions),
-    /// IpAddr field
-    IpAddr(IpAddrOptions),
 }
 
 impl FieldType {
@@ -172,7 +161,6 @@ impl FieldType {
             FieldType::Facet(_) => Type::Facet,
             FieldType::Bytes(_) => Type::Bytes,
             FieldType::JsonObject(_) => Type::Json,
-            FieldType::IpAddr(_) => Type::IpAddr,
         }
     }
 
@@ -188,7 +176,6 @@ impl FieldType {
             FieldType::Facet(ref _facet_options) => true,
             FieldType::Bytes(ref bytes_options) => bytes_options.is_indexed(),
             FieldType::JsonObject(ref json_object_options) => json_object_options.is_indexed(),
-            FieldType::IpAddr(ref ip_addr_options) => ip_addr_options.is_indexed(),
         }
     }
 
@@ -223,7 +210,6 @@ impl FieldType {
             | FieldType::F64(ref int_options)
             | FieldType::Bool(ref int_options) => int_options.is_fast(),
             FieldType::Date(ref date_options) => date_options.is_fast(),
-            FieldType::IpAddr(ref ip_addr_options) => ip_addr_options.is_fast(),
             FieldType::Facet(_) => true,
             FieldType::JsonObject(_) => false,
         }
@@ -264,7 +250,6 @@ impl FieldType {
             FieldType::Facet(_) => false,
             FieldType::Bytes(ref bytes_options) => bytes_options.fieldnorms(),
             FieldType::JsonObject(ref _json_object_options) => false,
-            FieldType::IpAddr(ref ip_addr_options) => ip_addr_options.fieldnorms(),
         }
     }
 
@@ -309,13 +294,6 @@ impl FieldType {
             FieldType::JsonObject(ref json_obj_options) => json_obj_options
                 .get_text_indexing_options()
                 .map(TextFieldIndexing::index_option),
-            FieldType::IpAddr(ref ip_addr_options) => {
-                if ip_addr_options.is_indexed() {
-                    Some(IndexRecordOption::Basic)
-                } else {
-                    None
-                }
-            }
         }
     }
 
@@ -355,16 +333,6 @@ impl FieldType {
                         expected: "a json object",
                         json: JsonValue::String(field_text),
                     }),
-                    FieldType::IpAddr(_) => {
-                        let ip_addr: IpAddr = IpAddr::from_str(&field_text).map_err(|err| {
-                            ValueParsingError::ParseError {
-                                error: err.to_string(),
-                                json: JsonValue::String(field_text),
-                            }
-                        })?;
-
-                        Ok(Value::IpAddr(ip_addr.into_ipv6_addr()))
-                    }
                 }
             }
             JsonValue::Number(field_val_num) => match self {
@@ -412,10 +380,6 @@ impl FieldType {
                     expected: "a json object",
                     json: JsonValue::Number(field_val_num),
                 }),
-                FieldType::IpAddr(_) => Err(ValueParsingError::TypeError {
-                    expected: "a string with an ip addr",
-                    json: JsonValue::Number(field_val_num),
-                }),
             },
             JsonValue::Object(json_map) => match self {
                 FieldType::Str(_) => {

src/schema/flags.rs

@@ -37,8 +37,6 @@ pub struct FastFlag;
 ///
 /// Fast fields can be random-accessed rapidly. Fields useful for scoring, filtering
 /// or collection should be mark as fast fields.
-///
-/// See [fast fields](`crate::fastfield`).
 pub const FAST: SchemaFlagList<FastFlag, ()> = SchemaFlagList {
     head: FastFlag,
     tail: (),

src/schema/ip_options.rs

@@ -1,4 +1,3 @@
-use std::net::{IpAddr, Ipv6Addr};
 use std::ops::BitOr;
 
 use serde::{Deserialize, Serialize};
@@ -6,52 +5,25 @@ use serde::{Deserialize, Serialize};
 use super::flags::{FastFlag, IndexedFlag, SchemaFlagList, StoredFlag};
 use super::Cardinality;
 
-/// Trait to convert into an Ipv6Addr.
-pub trait IntoIpv6Addr {
-    /// Consumes the object and returns an Ipv6Addr.
-    fn into_ipv6_addr(self) -> Ipv6Addr;
-}
-
-impl IntoIpv6Addr for IpAddr {
-    fn into_ipv6_addr(self) -> Ipv6Addr {
-        match self {
-            IpAddr::V4(addr) => addr.to_ipv6_mapped(),
-            IpAddr::V6(addr) => addr,
-        }
-    }
-}
-
 /// Define how an ip field should be handled by tantivy.
 #[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize, Default)]
-pub struct IpAddrOptions {
+pub struct IpOptions {
     #[serde(skip_serializing_if = "Option::is_none")]
     fast: Option<Cardinality>,
     stored: bool,
-    indexed: bool,
-    fieldnorms: bool,
 }
 
-impl IpAddrOptions {
+impl IpOptions {
     /// Returns true iff the value is a fast field.
     pub fn is_fast(&self) -> bool {
         self.fast.is_some()
     }
 
-    /// Returns `true` if the ip address should be stored in the doc store.
+    /// Returns `true` if the json object should be stored.
     pub fn is_stored(&self) -> bool {
         self.stored
     }
 
-    /// Returns true iff the value is indexed and therefore searchable.
-    pub fn is_indexed(&self) -> bool {
-        self.indexed
-    }
-
-    /// Returns true if and only if the value is normed.
-    pub fn fieldnorms(&self) -> bool {
-        self.fieldnorms
-    }
-
     /// Returns the cardinality of the fastfield.
     ///
     /// If the field has not been declared as a fastfield, then
@@ -60,16 +32,6 @@ impl IpAddrOptions {
         self.fast
     }
 
-    /// Set the field as normed.
-    ///
-    /// Setting an integer as normed will generate
-    /// the fieldnorm data for it.
-    #[must_use]
-    pub fn set_fieldnorms(mut self) -> Self {
-        self.fieldnorms = true;
-        self
-    }
-
     /// Sets the field as stored
     #[must_use]
     pub fn set_stored(mut self) -> Self {
@@ -77,19 +39,6 @@ impl IpAddrOptions {
         self
     }
 
-    /// Set the field as indexed.
-    ///
-    /// Setting an ip address as indexed will generate
-    /// a posting list for each value taken by the ip address.
-    /// Ips are normalized to IpV6.
-    ///
-    /// This is required for the field to be searchable.
-    #[must_use]
-    pub fn set_indexed(mut self) -> Self {
-        self.indexed = true;
-        self
-    }
-
     /// Set the field as a fast field.
     ///
     /// Fast fields are designed for random access.
@@ -103,60 +52,52 @@ impl IpAddrOptions {
     }
 }
 
-impl From<()> for IpAddrOptions {
-    fn from(_: ()) -> IpAddrOptions {
-        IpAddrOptions::default()
+impl From<()> for IpOptions {
+    fn from(_: ()) -> IpOptions {
+        IpOptions::default()
     }
 }
 
-impl From<FastFlag> for IpAddrOptions {
+impl From<FastFlag> for IpOptions {
     fn from(_: FastFlag) -> Self {
-        IpAddrOptions {
-            fieldnorms: false,
-            indexed: false,
+        IpOptions {
             stored: false,
             fast: Some(Cardinality::SingleValue),
         }
     }
 }
 
-impl From<StoredFlag> for IpAddrOptions {
+impl From<StoredFlag> for IpOptions {
     fn from(_: StoredFlag) -> Self {
-        IpAddrOptions {
-            fieldnorms: false,
-            indexed: false,
+        IpOptions {
             stored: true,
             fast: None,
         }
     }
 }
 
-impl From<IndexedFlag> for IpAddrOptions {
+impl From<IndexedFlag> for IpOptions {
     fn from(_: IndexedFlag) -> Self {
-        IpAddrOptions {
-            fieldnorms: true,
-            indexed: true,
+        IpOptions {
             stored: false,
             fast: None,
         }
     }
 }
 
-impl<T: Into<IpAddrOptions>> BitOr<T> for IpAddrOptions {
-    type Output = IpAddrOptions;
+impl<T: Into<IpOptions>> BitOr<T> for IpOptions {
+    type Output = IpOptions;
 
-    fn bitor(self, other: T) -> IpAddrOptions {
+    fn bitor(self, other: T) -> IpOptions {
         let other = other.into();
-        IpAddrOptions {
-            fieldnorms: self.fieldnorms | other.fieldnorms,
-            indexed: self.indexed | other.indexed,
+        IpOptions {
             stored: self.stored | other.stored,
             fast: self.fast.or(other.fast),
         }
     }
 }
 
-impl<Head, Tail> From<SchemaFlagList<Head, Tail>> for IpAddrOptions
+impl<Head, Tail> From<SchemaFlagList<Head, Tail>> for IpOptions
 where
     Head: Clone,
     Tail: Clone,

src/schema/mod.rs

@@ -138,7 +138,7 @@ pub use self::field_type::{FieldType, Type};
 pub use self::field_value::FieldValue;
 pub use self::flags::{FAST, INDEXED, STORED};
 pub use self::index_record_option::IndexRecordOption;
-pub use self::ip_options::{IntoIpv6Addr, IpAddrOptions};
+pub use self::ip_options::IpOptions;
 pub use self::json_object_options::JsonObjectOptions;
 pub use self::named_field_document::NamedFieldDocument;
 pub use self::numeric_options::NumericOptions;

src/schema/numeric_options.rs

@@ -59,7 +59,7 @@ impl From<NumericOptionsDeser> for NumericOptions {
 }
 
 impl NumericOptions {
-    /// Returns true iff the value is stored in the doc store.
+    /// Returns true iff the value is stored.
     pub fn is_stored(&self) -> bool {
         self.stored
     }

src/schema/schema.rs

@@ -7,7 +7,6 @@ use serde::ser::SerializeSeq;
 use serde::{Deserialize, Deserializer, Serialize, Serializer};
 use serde_json::{self, Value as JsonValue};
 
-use super::ip_options::IpAddrOptions;
 use super::*;
 use crate::schema::bytes_options::BytesOptions;
 use crate::schema::field_type::ValueParsingError;
@@ -145,26 +144,6 @@ impl SchemaBuilder {
         self.add_field(field_entry)
     }
 
-    /// Adds a ip field.
-    /// Returns the associated field handle.
-    ///
-    /// # Caution
-    ///
-    /// Appending two fields with the same name
-    /// will result in the shadowing of the first
-    /// by the second one.
-    /// The first field will get a field id
-    /// but only the second one will be indexed
-    pub fn add_ip_addr_field<T: Into<IpAddrOptions>>(
-        &mut self,
-        field_name_str: &str,
-        field_options: T,
-    ) -> Field {
-        let field_name = String::from(field_name_str);
-        let field_entry = FieldEntry::new_ip_addr(field_name, field_options.into());
-        self.add_field(field_entry)
-    }
-
     /// Adds a new text field.
     /// Returns the associated field handle
     ///
@@ -619,14 +598,12 @@ mod tests {
         schema_builder.add_text_field("title", TEXT);
         schema_builder.add_text_field("author", STRING);
         schema_builder.add_u64_field("count", count_options);
-        schema_builder.add_ip_addr_field("ip", FAST | STORED);
         schema_builder.add_bool_field("is_read", is_read_options);
         let schema = schema_builder.build();
         let doc_json = r#"{
                 "title": "my title",
                 "author": "fulmicoton",
                 "count": 4,
-                "ip": "127.0.0.1",
                 "is_read": true
         }"#;
         let doc = schema.parse_document(doc_json).unwrap();
@@ -635,39 +612,6 @@ mod tests {
         assert_eq!(doc, doc_serdeser);
     }
 
-    #[test]
-    pub fn test_document_to_ipv4_json() {
-        let mut schema_builder = Schema::builder();
-        schema_builder.add_ip_addr_field("ip", FAST | STORED);
-        let schema = schema_builder.build();
-
-        // IpV4 loopback
-        let doc_json = r#"{
-                "ip": "127.0.0.1"
-        }"#;
-        let doc = schema.parse_document(doc_json).unwrap();
-        let value: serde_json::Value = serde_json::from_str(&schema.to_json(&doc)).unwrap();
-        assert_eq!(value["ip"][0], "127.0.0.1");
-
-        // Special case IpV6 loopback. We don't want to map that to IPv4
-        let doc_json = r#"{
-                "ip": "::1"
-        }"#;
-        let doc = schema.parse_document(doc_json).unwrap();
-
-        let value: serde_json::Value = serde_json::from_str(&schema.to_json(&doc)).unwrap();
-        assert_eq!(value["ip"][0], "::1");
-
-        // testing ip address of every router in the world
-        let doc_json = r#"{
-                "ip": "192.168.0.1"
-        }"#;
-        let doc = schema.parse_document(doc_json).unwrap();
-
-        let value: serde_json::Value = serde_json::from_str(&schema.to_json(&doc)).unwrap();
-        assert_eq!(value["ip"][0], "192.168.0.1");
-    }
-
     #[test]
     pub fn test_document_from_nameddoc() {
         let mut schema_builder = Schema::builder();

src/schema/term.rs

@@ -1,15 +1,24 @@
 use std::convert::TryInto;
 use std::hash::{Hash, Hasher};
-use std::net::Ipv6Addr;
 use std::{fmt, str};
 
-use fastfield_codecs::MonotonicallyMappableToU128;
-
 use super::Field;
 use crate::fastfield::FastValue;
 use crate::schema::{Facet, Type};
 use crate::{DatePrecision, DateTime};
 
+/// Size (in bytes) of the buffer of a fast value (u64, i64, f64, or date) term.
+/// <field> + <type byte> + <value len>
+///
+/// - <field> is a big endian encoded u32 field id
+/// - <type_byte>'s most significant bit expresses whether the term is a json term or not
+/// The remaining 7 bits are used to encode the type of the value.
+/// If this is a JSON term, the type is the type of the leaf of the json.
+///
+/// - <value> is,  if this is not the json term, a binary representation specific to the type.
+/// If it is a JSON Term, then it is prepended with the path that leads to this leaf value.
+const FAST_VALUE_TERM_LEN: usize = 4 + 1 + 8;
+
 /// Separates the different segments of
 /// the json path.
 pub const JSON_PATH_SEGMENT_SEP: u8 = 1u8;
@@ -27,57 +36,24 @@ pub const JSON_END_OF_PATH: u8 = 0u8;
 pub struct Term<B = Vec<u8>>(B)
 where B: AsRef<[u8]>;
 
-/// The number of bytes used as metadata by `Term`.
-const TERM_METADATA_LENGTH: usize = 5;
+impl AsMut<Vec<u8>> for Term {
+    fn as_mut(&mut self) -> &mut Vec<u8> {
+        &mut self.0
+    }
+}
 
 impl Term {
-    pub(crate) fn with_capacity(capacity: usize) -> Term {
-        let mut data = Vec::with_capacity(TERM_METADATA_LENGTH + capacity);
-        data.resize(TERM_METADATA_LENGTH, 0u8);
-        Term(data)
-    }
-
-    pub(crate) fn with_type_and_field(typ: Type, field: Field) -> Term {
-        let mut term = Self::with_capacity(8);
-        term.set_field_and_type(field, typ);
-        term
-    }
-
-    fn with_bytes_and_field_and_payload(typ: Type, field: Field, bytes: &[u8]) -> Term {
-        let mut term = Self::with_capacity(bytes.len());
-        term.set_field_and_type(field, typ);
-        term.0.extend_from_slice(bytes);
-        term
+    pub(crate) fn new() -> Term {
+        Term(Vec::with_capacity(100))
     }
 
     fn from_fast_value<T: FastValue>(field: Field, val: &T) -> Term {
-        let mut term = Self::with_type_and_field(T::to_type(), field);
+        let mut term = Term(vec![0u8; FAST_VALUE_TERM_LEN]);
+        term.set_field(T::to_type(), field);
         term.set_u64(val.to_u64());
         term
     }
 
-    /// Panics when the term is not empty... ie: some value is set.
-    /// Use `clear_with_field_and_type` in that case.
-    ///
-    /// Sets field and the type.
-    pub(crate) fn set_field_and_type(&mut self, field: Field, typ: Type) {
-        assert!(self.is_empty());
-        self.0[0..4].clone_from_slice(field.field_id().to_be_bytes().as_ref());
-        self.0[4] = typ.to_code();
-    }
-
-    /// Is empty if there are no value bytes.
-    pub fn is_empty(&self) -> bool {
-        self.0.len() == TERM_METADATA_LENGTH
-    }
-
-    /// Builds a term given a field, and a `Ipv6Addr`-value
-    pub fn from_field_ip_addr(field: Field, ip_addr: Ipv6Addr) -> Term {
-        let mut term = Self::with_type_and_field(Type::IpAddr, field);
-        term.set_ip_addr(ip_addr);
-        term
-    }
-
     /// Builds a term given a field, and a `u64`-value
     pub fn from_field_u64(field: Field, val: u64) -> Term {
         Term::from_fast_value(field, &val)
@@ -106,29 +82,31 @@ impl Term {
     /// Creates a `Term` given a facet.
     pub fn from_facet(field: Field, facet: &Facet) -> Term {
         let facet_encoded_str = facet.encoded_str();
-        Term::with_bytes_and_field_and_payload(Type::Facet, field, facet_encoded_str.as_bytes())
+        Term::create_bytes_term(Type::Facet, field, facet_encoded_str.as_bytes())
     }
 
     /// Builds a term given a field, and a string value
     pub fn from_field_text(field: Field, text: &str) -> Term {
-        Term::with_bytes_and_field_and_payload(Type::Str, field, text.as_bytes())
+        Term::create_bytes_term(Type::Str, field, text.as_bytes())
+    }
+
+    fn create_bytes_term(typ: Type, field: Field, bytes: &[u8]) -> Term {
+        let mut term = Term(vec![0u8; 5 + bytes.len()]);
+        term.set_field(typ, field);
+        term.0.extend_from_slice(bytes);
+        term
     }
 
     /// Builds a term bytes.
     pub fn from_field_bytes(field: Field, bytes: &[u8]) -> Term {
-        Term::with_bytes_and_field_and_payload(Type::Bytes, field, bytes)
+        Term::create_bytes_term(Type::Bytes, field, bytes)
     }
 
-    /// Removes the value_bytes and set the field and type code.
-    pub(crate) fn clear_with_field_and_type(&mut self, typ: Type, field: Field) {
-        self.truncate_value_bytes(0);
-        self.set_field_and_type(field, typ);
-    }
-
-    /// Removes the value_bytes and set the type code.
-    pub fn clear_with_type(&mut self, typ: Type) {
-        self.truncate_value_bytes(0);
-        self.0[4] = typ.to_code();
+    pub(crate) fn set_field(&mut self, typ: Type, field: Field) {
+        self.0.clear();
+        self.0
+            .extend_from_slice(field.field_id().to_be_bytes().as_ref());
+        self.0.push(typ.to_code());
     }
 
     /// Sets a u64 value in the term.
@@ -139,6 +117,12 @@ impl Term {
     /// the natural order of the values.
     pub fn set_u64(&mut self, val: u64) {
         self.set_fast_value(val);
+        self.set_bytes(val.to_be_bytes().as_ref());
+    }
+
+    fn set_fast_value<T: FastValue>(&mut self, val: T) {
+        self.0.resize(FAST_VALUE_TERM_LEN, 0u8);
+        self.set_bytes(val.to_u64().to_be_bytes().as_ref());
     }
 
     /// Sets a `i64` value in the term.
@@ -161,18 +145,9 @@ impl Term {
         self.set_fast_value(val);
     }
 
-    fn set_fast_value<T: FastValue>(&mut self, val: T) {
-        self.set_bytes(val.to_u64().to_be_bytes().as_ref());
-    }
-
-    /// Sets a `Ipv6Addr` value in the term.
-    pub fn set_ip_addr(&mut self, val: Ipv6Addr) {
-        self.set_bytes(val.to_u128().to_be_bytes().as_ref());
-    }
-
     /// Sets the value of a `Bytes` field.
     pub fn set_bytes(&mut self, bytes: &[u8]) {
-        self.truncate_value_bytes(0);
+        self.0.resize(5, 0u8);
         self.0.extend(bytes);
     }
 
@@ -181,22 +156,18 @@ impl Term {
         self.set_bytes(text.as_bytes());
     }
 
-    /// Truncates the value bytes of the term. Value and field type stays the same.
-    pub fn truncate_value_bytes(&mut self, len: usize) {
-        self.0.truncate(len + TERM_METADATA_LENGTH);
+    /// Removes the value_bytes and set the type code.
+    pub fn clear_with_type(&mut self, typ: Type) {
+        self.truncate(5);
+        self.0[4] = typ.to_code();
     }
 
-    /// Returns the value bytes as mutable slice
-    pub fn value_bytes_mut(&mut self) -> &mut [u8] {
-        &mut self.0[TERM_METADATA_LENGTH..]
+    /// Truncate the term right after the field and the type code.
+    pub fn truncate(&mut self, len: usize) {
+        self.0.truncate(len);
     }
 
-    /// The length of the bytes.
-    pub fn len_bytes(&self) -> usize {
-        self.0.len() - TERM_METADATA_LENGTH
-    }
-
-    /// Appends value bytes to the Term.
+    /// Truncate the term right after the field and the type code.
     pub fn append_bytes(&mut self, bytes: &[u8]) {
         self.0.extend_from_slice(bytes);
     }
@@ -322,6 +293,9 @@ where B: AsRef<[u8]>
     /// Returns `None` if the field is not of string type
     /// or if the bytes are not valid utf-8.
     pub fn as_str(&self) -> Option<&str> {
+        if self.as_slice().len() < 5 {
+            return None;
+        }
         if self.typ() != Type::Str {
             return None;
         }
@@ -333,6 +307,9 @@ where B: AsRef<[u8]>
     /// Returns `None` if the field is not of facet type
     /// or if the bytes are not valid utf-8.
     pub fn as_facet(&self) -> Option<Facet> {
+        if self.as_slice().len() < 5 {
+            return None;
+        }
         if self.typ() != Type::Facet {
             return None;
         }
@@ -344,6 +321,9 @@ where B: AsRef<[u8]>
     ///
     /// Returns `None` if the field is not of bytes type.
     pub fn as_bytes(&self) -> Option<&[u8]> {
+        if self.as_slice().len() < 5 {
+            return None;
+        }
         if self.typ() != Type::Bytes {
             return None;
         }
@@ -357,7 +337,7 @@ where B: AsRef<[u8]>
     /// If the term is a u64, its value is encoded according
     /// to `byteorder::LittleEndian`.
     pub fn value_bytes(&self) -> &[u8] {
-        &self.0.as_ref()[TERM_METADATA_LENGTH..]
+        &self.0.as_ref()[5..]
     }
 
     /// Returns the underlying `&[u8]`.
@@ -435,9 +415,6 @@ fn debug_value_bytes(typ: Type, bytes: &[u8], f: &mut fmt::Formatter) -> fmt::Re
                 debug_value_bytes(typ, bytes, f)?;
             }
         }
-        Type::IpAddr => {
-            write!(f, "")?; // TODO change once we actually have IP address terms.
-        }
     }
     Ok(())
 }
@@ -471,18 +448,6 @@ mod tests {
         assert_eq!(term.as_str(), Some("test"))
     }
 
-    /// Size (in bytes) of the buffer of a fast value (u64, i64, f64, or date) term.
-    /// <field> + <type byte> + <value len>
-    ///
-    /// - <field> is a big endian encoded u32 field id
-    /// - <type_byte>'s most significant bit expresses whether the term is a json term or not
-    /// The remaining 7 bits are used to encode the type of the value.
-    /// If this is a JSON term, the type is the type of the leaf of the json.
-    ///
-    /// - <value> is,  if this is not the json term, a binary representation specific to the type.
-    /// If it is a JSON Term, then it is prepended with the path that leads to this leaf value.
-    const FAST_VALUE_TERM_LEN: usize = 4 + 1 + 8;
-
     #[test]
     pub fn test_term_u64() {
         let mut schema_builder = Schema::builder();
@@ -490,7 +455,7 @@ mod tests {
         let term = Term::from_field_u64(count_field, 983u64);
         assert_eq!(term.field(), count_field);
         assert_eq!(term.typ(), Type::U64);
-        assert_eq!(term.as_slice().len(), FAST_VALUE_TERM_LEN);
+        assert_eq!(term.as_slice().len(), super::FAST_VALUE_TERM_LEN);
         assert_eq!(term.as_u64(), Some(983u64))
     }
 
@@ -501,7 +466,7 @@ mod tests {
         let term = Term::from_field_bool(bool_field, true);
         assert_eq!(term.field(), bool_field);
         assert_eq!(term.typ(), Type::Bool);
-        assert_eq!(term.as_slice().len(), FAST_VALUE_TERM_LEN);
+        assert_eq!(term.as_slice().len(), super::FAST_VALUE_TERM_LEN);
         assert_eq!(term.as_bool(), Some(true))
     }
 }

src/schema/value.rs

@@ -1,5 +1,4 @@
 use std::fmt;
-use std::net::Ipv6Addr;
 
 use serde::de::Visitor;
 use serde::{Deserialize, Deserializer, Serialize, Serializer};
@@ -33,8 +32,6 @@ pub enum Value {
     Bytes(Vec<u8>),
     /// Json object value.
     JsonObject(serde_json::Map<String, serde_json::Value>),
-    /// IpV6 Address. Internally there is no IpV4, it needs to be converted to `Ipv6Addr`.
-    IpAddr(Ipv6Addr),
 }
 
 impl Eq for Value {}
@@ -51,16 +48,8 @@ impl Serialize for Value {
             Value::Bool(b) => serializer.serialize_bool(b),
             Value::Date(ref date) => time::serde::rfc3339::serialize(&date.into_utc(), serializer),
             Value::Facet(ref facet) => facet.serialize(serializer),
-            Value::Bytes(ref bytes) => serializer.serialize_str(&base64::encode(bytes)),
+            Value::Bytes(ref bytes) => serializer.serialize_bytes(bytes),
             Value::JsonObject(ref obj) => obj.serialize(serializer),
-            Value::IpAddr(ref obj) => {
-                // Ensure IpV4 addresses get serialized as IpV4, but excluding IpV6 loopback.
-                if let Some(ip_v4) = obj.to_ipv4_mapped() {
-                    ip_v4.serialize(serializer)
-                } else {
-                    obj.serialize(serializer)
-                }
-            }
         }
     }
 }
@@ -212,16 +201,6 @@ impl Value {
             None
         }
     }
-
-    /// Returns the ip addr, provided the value is of the `Ip` type.
-    /// (Returns None if the value is not of the `Ip` type)
-    pub fn as_ip_addr(&self) -> Option<Ipv6Addr> {
-        if let Value::IpAddr(val) = self {
-            Some(*val)
-        } else {
-            None
-        }
-    }
 }
 
 impl From<String> for Value {
@@ -230,12 +209,6 @@ impl From<String> for Value {
     }
 }
 
-impl From<Ipv6Addr> for Value {
-    fn from(v: Ipv6Addr) -> Value {
-        Value::IpAddr(v)
-    }
-}
-
 impl From<u64> for Value {
     fn from(v: u64) -> Value {
         Value::U64(v)
@@ -315,10 +288,8 @@ impl From<serde_json::Value> for Value {
 
 mod binary_serialize {
     use std::io::{self, Read, Write};
-    use std::net::Ipv6Addr;
 
     use common::{f64_to_u64, u64_to_f64, BinarySerializable};
-    use fastfield_codecs::MonotonicallyMappableToU128;
 
     use super::Value;
     use crate::schema::Facet;
@@ -335,7 +306,6 @@ mod binary_serialize {
     const EXT_CODE: u8 = 7;
     const JSON_OBJ_CODE: u8 = 8;
     const BOOL_CODE: u8 = 9;
-    const IP_CODE: u8 = 10;
 
     // extended types
 
@@ -396,10 +366,6 @@ mod binary_serialize {
                     serde_json::to_writer(writer, &map)?;
                     Ok(())
                 }
-                Value::IpAddr(ref ip) => {
-                    IP_CODE.serialize(writer)?;
-                    ip.to_u128().serialize(writer)
-                }
             }
         }
 
@@ -470,11 +436,6 @@ mod binary_serialize {
                     let json_map = <serde_json::Map::<String, serde_json::Value> as serde::Deserialize>::deserialize(&mut de)?;
                     Ok(Value::JsonObject(json_map))
                 }
-                IP_CODE => {
-                    let value = u128::deserialize(reader)?;
-                    Ok(Value::IpAddr(Ipv6Addr::from_u128(value)))
-                }
-
                 _ => Err(io::Error::new(
                     io::ErrorKind::InvalidData,
                     format!("No field type is associated with code {:?}", type_code),
@@ -487,52 +448,9 @@ mod binary_serialize {
 #[cfg(test)]
 mod tests {
     use super::Value;
-    use crate::schema::{BytesOptions, Schema};
     use crate::time::format_description::well_known::Rfc3339;
     use crate::time::OffsetDateTime;
-    use crate::{DateTime, Document};
-
-    #[test]
-    fn test_parse_bytes_doc() {
-        let mut schema_builder = Schema::builder();
-        let bytes_options = BytesOptions::default();
-        let bytes_field = schema_builder.add_bytes_field("my_bytes", bytes_options);
-        let schema = schema_builder.build();
-        let mut doc = Document::default();
-        doc.add_bytes(bytes_field, "this is a test".as_bytes());
-        let json_string = schema.to_json(&doc);
-        assert_eq!(json_string, r#"{"my_bytes":["dGhpcyBpcyBhIHRlc3Q="]}"#);
-    }
-
-    #[test]
-    fn test_parse_empty_bytes_doc() {
-        let mut schema_builder = Schema::builder();
-        let bytes_options = BytesOptions::default();
-        let bytes_field = schema_builder.add_bytes_field("my_bytes", bytes_options);
-        let schema = schema_builder.build();
-        let mut doc = Document::default();
-        doc.add_bytes(bytes_field, "".as_bytes());
-        let json_string = schema.to_json(&doc);
-        assert_eq!(json_string, r#"{"my_bytes":[""]}"#);
-    }
-
-    #[test]
-    fn test_parse_many_bytes_doc() {
-        let mut schema_builder = Schema::builder();
-        let bytes_options = BytesOptions::default();
-        let bytes_field = schema_builder.add_bytes_field("my_bytes", bytes_options);
-        let schema = schema_builder.build();
-        let mut doc = Document::default();
-        doc.add_bytes(
-            bytes_field,
-            "A bigger test I guess\nspanning on multiple lines\nhoping this will work".as_bytes(),
-        );
-        let json_string = schema.to_json(&doc);
-        assert_eq!(
-            json_string,
-            r#"{"my_bytes":["QSBiaWdnZXIgdGVzdCBJIGd1ZXNzCnNwYW5uaW5nIG9uIG11bHRpcGxlIGxpbmVzCmhvcGluZyB0aGlzIHdpbGwgd29yaw=="]}"#
-        );
-    }
+    use crate::DateTime;
 
     #[test]
     fn test_serialize_date() {

src/store/index/block.rs

@@ -1,7 +1,7 @@
 use std::io;
 use std::ops::Range;
 
-use common::{read_u32_vint, VInt};
+use common::VInt;
 
 use crate::store::index::{Checkpoint, CHECKPOINT_PERIOD};
 use crate::DocId;
@@ -85,15 +85,15 @@ impl CheckpointBlock {
             return Err(io::Error::new(io::ErrorKind::UnexpectedEof, ""));
         }
         self.checkpoints.clear();
-        let len = read_u32_vint(data);
+        let len = VInt::deserialize_u64(data)? as usize;
         if len == 0 {
             return Ok(());
         }
-        let mut doc = read_u32_vint(data);
-        let mut start_offset = read_u32_vint(data) as usize;
+        let mut doc = VInt::deserialize_u64(data)? as DocId;
+        let mut start_offset = VInt::deserialize_u64(data)? as usize;
         for _ in 0..len {
-            let num_docs = read_u32_vint(data);
-            let block_num_bytes = read_u32_vint(data) as usize;
+            let num_docs = VInt::deserialize_u64(data)? as DocId;
+            let block_num_bytes = VInt::deserialize_u64(data)? as usize;
             self.checkpoints.push(Checkpoint {
                 doc_range: doc..doc + num_docs,
                 byte_range: start_offset..start_offset + block_num_bytes,

src/store/mod.rs

@@ -96,7 +96,7 @@ pub mod tests {
                 let mut doc = Document::default();
                 doc.add_field_value(field_body, LOREM.to_string());
                 doc.add_field_value(field_title, format!("Doc {i}"));
-                store_writer.store(&doc, &schema).unwrap();
+                store_writer.store(&doc).unwrap();
             }
             store_writer.close().unwrap();
         }

src/store/writer.rs

@@ -1,11 +1,11 @@
-use std::io;
+use std::io::{self, Write};
 
 use common::BinarySerializable;
 
 use super::compressors::Compressor;
 use super::StoreReader;
 use crate::directory::WritePtr;
-use crate::schema::{Document, Schema};
+use crate::schema::Document;
 use crate::store::store_compressor::BlockCompressor;
 use crate::DocId;
 
@@ -20,6 +20,7 @@ pub struct StoreWriter {
     compressor: Compressor,
     block_size: usize,
     num_docs_in_current_block: DocId,
+    intermediary_buffer: Vec<u8>,
     current_block: Vec<u8>,
     doc_pos: Vec<u32>,
     block_compressor: BlockCompressor,
@@ -41,6 +42,7 @@ impl StoreWriter {
             compressor,
             block_size,
             num_docs_in_current_block: 0,
+            intermediary_buffer: Vec::new(),
             doc_pos: Vec::new(),
             current_block: Vec::new(),
             block_compressor,
@@ -53,7 +55,9 @@ impl StoreWriter {
 
     /// The memory used (inclusive childs)
     pub fn mem_usage(&self) -> usize {
-        self.current_block.capacity() + self.doc_pos.capacity() * std::mem::size_of::<u32>()
+        self.intermediary_buffer.capacity()
+            + self.current_block.capacity()
+            + self.doc_pos.capacity() * std::mem::size_of::<u32>()
     }
 
     /// Checks if the current block is full, and if so, compresses and flushes it.
@@ -95,9 +99,15 @@ impl StoreWriter {
     ///
     /// The document id is implicitly the current number
     /// of documents.
-    pub fn store(&mut self, document: &Document, schema: &Schema) -> io::Result<()> {
+    pub fn store(&mut self, stored_document: &Document) -> io::Result<()> {
+        self.intermediary_buffer.clear();
+        stored_document.serialize(&mut self.intermediary_buffer)?;
+        // calling store bytes would be preferable for code reuse, but then we can't use
+        // intermediary_buffer due to the borrow checker
+        // a new buffer costs ~1% indexing performance
         self.doc_pos.push(self.current_block.len() as u32);
-        document.serialize_stored(schema, &mut self.current_block)?;
+        self.current_block
+            .write_all(&self.intermediary_buffer[..])?;
         self.num_docs_in_current_block += 1;
         self.check_flush_block()?;
         Ok(())

src/termdict/sstable_termdict/sstable/sstable_index.rs

@@ -13,7 +13,7 @@ pub struct SSTableIndex {
 
 impl SSTableIndex {
     pub(crate) fn load(data: &[u8]) -> Result<SSTableIndex, DataCorruption> {
-        ciborium::de::from_reader(data)
+        serde_cbor::de::from_slice(data)
             .map_err(|_| DataCorruption::comment_only("SSTable index is corrupted"))
     }
 
@@ -85,9 +85,9 @@ impl SSTableIndexBuilder {
         })
     }
 
-    pub fn serialize<W: std::io::Write>(&self, wrt: W) -> io::Result<()> {
-        ciborium::ser::into_writer(&self.index, wrt)
-            .map_err(|err| io::Error::new(io::ErrorKind::Other, err))
+    pub fn serialize(&self, wrt: &mut dyn io::Write) -> io::Result<()> {
+        serde_cbor::ser::to_writer(wrt, &self.index).unwrap();
+        Ok(())
     }
 }
 

src/termdict/sstable_termdict/termdict.rs

@@ -24,8 +24,6 @@ impl SSTable for TermInfoSSTable {
     type Reader = TermInfoReader;
     type Writer = TermInfoWriter;
 }
-
-/// Builder for the new term dictionary.
 pub struct TermDictionaryBuilder<W: io::Write> {
     sstable_writer: Writer<W, TermInfoWriter>,
 }
@@ -140,7 +138,6 @@ impl TermDictionary {
         })
     }
 
-    /// Creates a term dictionary from the supplied bytes.
     pub fn from_bytes(owned_bytes: OwnedBytes) -> crate::Result<TermDictionary> {
         TermDictionary::open(FileSlice::new(Arc::new(owned_bytes)))
     }
@@ -232,19 +229,19 @@ impl TermDictionary {
         Ok(None)
     }
 
-    /// Returns a range builder, to stream all of the terms
-    /// within an interval.
+    // Returns a range builder, to stream all of the terms
+    // within an interval.
     pub fn range(&self) -> TermStreamerBuilder<'_> {
         TermStreamerBuilder::new(self, AlwaysMatch)
     }
 
-    /// A stream of all the sorted terms.
+    // A stream of all the sorted terms.
     pub fn stream(&self) -> io::Result<TermStreamer<'_>> {
         self.range().into_stream()
     }
 
-    /// Returns a search builder, to stream all of the terms
-    /// within the Automaton
+    // Returns a search builder, to stream all of the terms
+    // within the Automaton
     pub fn search<'a, A: Automaton + 'a>(&'a self, automaton: A) -> TermStreamerBuilder<'a, A>
     where A::State: Clone {
         TermStreamerBuilder::<A>::new(self, automaton)