Improve the FacetLevelF64 serialization

This commit is contained in:
Clément Renault 2020-11-18 18:40:08 +01:00
parent ced0c29c56
commit 9e2cbe3362
No known key found for this signature in database
GPG Key ID: 92ADA4E935E71FA4

View File

@ -13,8 +13,14 @@ impl<'a> heed::BytesDecode<'a> for FacetLevelValueF64Codec {
let (field_id, bytes) = bytes.split_first()?; let (field_id, bytes) = bytes.split_first()?;
let (level, bytes) = bytes.split_first()?; let (level, bytes) = bytes.split_first()?;
let left = bytes[16..24].try_into().ok().map(f64::from_be_bytes)?; let (left, right) = if *level != 0 {
let right = bytes[24..].try_into().ok().map(f64::from_be_bytes)?; let left = bytes[16..24].try_into().ok().map(f64::from_be_bytes)?;
let right = bytes[24..].try_into().ok().map(f64::from_be_bytes)?;
(left, right)
} else {
let left = bytes[8..].try_into().ok().map(f64::from_be_bytes)?;
(left, left)
};
Some((*field_id, *level, left, right)) Some((*field_id, *level, left, right))
} }
@ -26,24 +32,38 @@ impl heed::BytesEncode<'_> for FacetLevelValueF64Codec {
fn bytes_encode((field_id, level, left, right): &Self::EItem) -> Option<Cow<[u8]>> { fn bytes_encode((field_id, level, left, right): &Self::EItem) -> Option<Cow<[u8]>> {
let mut buffer = [0u8; 32]; let mut buffer = [0u8; 32];
// Write the globally ordered floats. let len = if *level != 0 {
let bytes = f64_into_bytes(*left)?; // Write the globally ordered floats.
buffer[..8].copy_from_slice(&bytes[..]); let bytes = f64_into_bytes(*left)?;
buffer[..8].copy_from_slice(&bytes[..]);
let bytes = f64_into_bytes(*right)?; let bytes = f64_into_bytes(*right)?;
buffer[8..16].copy_from_slice(&bytes[..]); buffer[8..16].copy_from_slice(&bytes[..]);
// Then the f64 values just to be able to read them back. // Then the f64 values just to be able to read them back.
let bytes = left.to_be_bytes(); let bytes = left.to_be_bytes();
buffer[16..24].copy_from_slice(&bytes[..]); buffer[16..24].copy_from_slice(&bytes[..]);
let bytes = right.to_be_bytes(); let bytes = right.to_be_bytes();
buffer[24..].copy_from_slice(&bytes[..]); buffer[24..].copy_from_slice(&bytes[..]);
let mut bytes = Vec::with_capacity(buffer.len() + 2); 32 // length
} else {
// Write the globally ordered floats.
let bytes = f64_into_bytes(*left)?;
buffer[..8].copy_from_slice(&bytes[..]);
// Then the f64 values just to be able to read them back.
let bytes = left.to_be_bytes();
buffer[8..16].copy_from_slice(&bytes[..]);
16 // length
};
let mut bytes = Vec::with_capacity(len + 2);
bytes.push(*field_id); bytes.push(*field_id);
bytes.push(*level); bytes.push(*level);
bytes.extend_from_slice(&buffer[..]); bytes.extend_from_slice(&buffer[..len]);
Some(Cow::Owned(bytes)) Some(Cow::Owned(bytes))
} }
} }
@ -55,8 +75,12 @@ mod tests {
#[test] #[test]
fn globally_ordered_f64() { fn globally_ordered_f64() {
let bytes = FacetLevelValueF64Codec::bytes_encode(&(3, 0, -32.0, 32.0)).unwrap(); let bytes = FacetLevelValueF64Codec::bytes_encode(&(3, 0, 32.0, 0.0)).unwrap();
let (name, level, left, right) = FacetLevelValueF64Codec::bytes_decode(&bytes).unwrap(); let (name, level, left, right) = FacetLevelValueF64Codec::bytes_decode(&bytes).unwrap();
assert_eq!((name, level, left, right), (3, 0, -32.0, 32.0)); assert_eq!((name, level, left, right), (3, 0, 32.0, 32.0));
let bytes = FacetLevelValueF64Codec::bytes_encode(&(3, 1, -32.0, 32.0)).unwrap();
let (name, level, left, right) = FacetLevelValueF64Codec::bytes_decode(&bytes).unwrap();
assert_eq!((name, level, left, right), (3, 1, -32.0, 32.0));
} }
} }