rename get_u64 to ge_val

This commit is contained in:
Pascal Seitz
2022-08-26 09:56:25 +02:00
parent 02c3252d1e
commit fd60e6fe08
7 changed files with 10 additions and 10 deletions

View File

@@ -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);
}

View File

@@ -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]

View File

@@ -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(

View File

@@ -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<dyn Iterator<Item = u64> + '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 \

View File

@@ -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
}

View File

@@ -40,8 +40,8 @@ impl<C: FastFieldCodecReader + FastFieldCodecDeserializer + Clone> FastFieldCode
impl<C: FastFieldCodecReader + Clone> FastFieldCodecReader for GCDFastFieldCodec<C> {
#[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

View File

@@ -228,7 +228,7 @@ impl<Item: FastValue, C: FastFieldCodecReader + FastFieldCodecDeserializer>
#[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)
}