diff --git a/fastfield_codecs/benches/bench.rs b/fastfield_codecs/benches/bench.rs index 6c81a5f75..683c84485 100644 --- a/fastfield_codecs/benches/bench.rs +++ b/fastfield_codecs/benches/bench.rs @@ -38,7 +38,7 @@ mod tests { b.iter(|| { let mut sum = 0u64; for pos in value_iter() { - let val = reader.get_u64(pos as u64); + let val = reader.get_val(pos as u64); debug_assert_eq!(data[pos as usize], val); sum = sum.wrapping_add(val); } diff --git a/fastfield_codecs/src/bitpacked.rs b/fastfield_codecs/src/bitpacked.rs index c3f378e39..932511b44 100644 --- a/fastfield_codecs/src/bitpacked.rs +++ b/fastfield_codecs/src/bitpacked.rs @@ -42,7 +42,7 @@ impl FastFieldCodecDeserializer for BitpackedReader { } impl FastFieldCodecReader for BitpackedReader { #[inline] - fn get_u64(&self, doc: u64) -> u64 { + fn get_val(&self, doc: u64) -> u64 { self.min_value_u64 + self.bit_unpacker.get(doc, &self.data) } #[inline] diff --git a/fastfield_codecs/src/blockwise_linear.rs b/fastfield_codecs/src/blockwise_linear.rs index d8352adcd..cf40b27e8 100644 --- a/fastfield_codecs/src/blockwise_linear.rs +++ b/fastfield_codecs/src/blockwise_linear.rs @@ -162,7 +162,7 @@ impl FastFieldCodecDeserializer for BlockwiseLinearReader { impl FastFieldCodecReader for BlockwiseLinearReader { #[inline] - fn get_u64(&self, idx: u64) -> u64 { + fn get_val(&self, idx: u64) -> u64 { let interpolation = get_interpolation_function(idx, &self.footer.interpolations); let in_block_idx = idx - interpolation.start_pos; let calculated_value = get_calculated_value( diff --git a/fastfield_codecs/src/lib.rs b/fastfield_codecs/src/lib.rs index 923a334d9..805a9b89e 100644 --- a/fastfield_codecs/src/lib.rs +++ b/fastfield_codecs/src/lib.rs @@ -20,13 +20,13 @@ pub trait FastFieldCodecDeserializer: Sized { } pub trait FastFieldCodecReader: Sized { - fn get_u64(&self, doc: u64) -> u64; + fn get_val(&self, doc: u64) -> u64; fn min_value(&self) -> u64; fn max_value(&self) -> u64; fn num_vals(&self) -> u64; /// Returns a iterator over the data fn iter<'a>(&'a self) -> Box + 'a> { - Box::new((0..self.num_vals()).map(|idx| self.get_u64(idx))) + Box::new((0..self.num_vals()).map(|idx| self.get_val(idx))) } } @@ -198,7 +198,7 @@ mod tests { let reader = R::open_from_bytes(OwnedBytes::new(out)).unwrap(); assert_eq!(reader.num_vals(), data.len() as u64); for (doc, orig_val) in data.iter().enumerate() { - let val = reader.get_u64(doc as u64); + let val = reader.get_val(doc as u64); if val != *orig_val { panic!( "val {val:?} does not match orig_val {orig_val:?}, in data set {name}, data \ diff --git a/fastfield_codecs/src/linear.rs b/fastfield_codecs/src/linear.rs index a63440114..93ab0557a 100644 --- a/fastfield_codecs/src/linear.rs +++ b/fastfield_codecs/src/linear.rs @@ -80,7 +80,7 @@ impl FastFieldCodecDeserializer for LinearReader { impl FastFieldCodecReader for LinearReader { #[inline] - fn get_u64(&self, doc: u64) -> u64 { + fn get_val(&self, doc: u64) -> u64 { let calculated_value = get_calculated_value(self.footer.first_val, doc, self.slope); (calculated_value + self.bit_unpacker.get(doc, &self.data)) - self.footer.offset } diff --git a/src/fastfield/gcd.rs b/src/fastfield/gcd.rs index f786f67f3..492a3c4d9 100644 --- a/src/fastfield/gcd.rs +++ b/src/fastfield/gcd.rs @@ -40,8 +40,8 @@ impl FastFieldCode impl FastFieldCodecReader for GCDFastFieldCodec { #[inline] - fn get_u64(&self, doc: u64) -> u64 { - let mut data = self.reader.get_u64(doc); + fn get_val(&self, doc: u64) -> u64 { + let mut data = self.reader.get_val(doc); data *= self.gcd; data += self.min_value; data diff --git a/src/fastfield/reader.rs b/src/fastfield/reader.rs index 11726ba5d..ec9720cc3 100644 --- a/src/fastfield/reader.rs +++ b/src/fastfield/reader.rs @@ -228,7 +228,7 @@ impl #[inline] pub(crate) fn get_u64(&self, doc: u64) -> Item { - let data = self.reader.get_u64(doc); + let data = self.reader.get_val(doc); Item::from_u64(data) }