mbutrovich commented on code in PR #2866:
URL: https://github.com/apache/iceberg-rust/pull/2866#discussion_r3625290881
##########
crates/iceberg/src/delete_vector.rs:
##########
@@ -198,4 +288,107 @@ mod tests {
let res = dv.insert_positions(&positions);
assert!(res.is_err());
}
+
+ // Reproduces Iceberg-Java's `deletion-vector-v1` framing so tests can
round-trip through
+ // `deserialize` without a Java writer. Cross-implementation golden
fixtures produced by
+ // Iceberg-Java are tracked separately; this only checks that our decode
matches our encode.
+ fn encode_dv_blob(dv: &DeleteVector) -> Vec<u8> {
+ let mut vector = Vec::with_capacity(dv.inner.serialized_size());
+ dv.inner.serialize_into(&mut vector).unwrap();
+
+ let body_len = DV_MAGIC_BYTES + vector.len();
+ let mut blob = Vec::with_capacity(DV_LENGTH_PREFIX_BYTES + body_len +
DV_CRC_BYTES);
+ blob.extend_from_slice(&(body_len as u32).to_be_bytes());
+ blob.extend_from_slice(&DV_MAGIC);
+ blob.extend_from_slice(&vector);
+ let crc = crc32fast::hash(&blob[DV_LENGTH_PREFIX_BYTES..]);
+ blob.extend_from_slice(&crc.to_be_bytes());
+ blob
+ }
+
+ fn dv_of(positions: impl IntoIterator<Item = u64>) -> DeleteVector {
+ let mut dv = DeleteVector::default();
+ for pos in positions {
+ dv.insert(pos);
+ }
+ dv
+ }
+
+ fn sorted(dv: &DeleteVector) -> Vec<u64> {
+ let mut positions: Vec<u64> = dv.iter().collect();
+ positions.sort_unstable();
+ positions
+ }
+
+ #[test]
+ fn deserialize_roundtrip_empty() {
+ let blob = encode_dv_blob(&DeleteVector::default());
+ assert_eq!(DeleteVector::deserialize(&blob).unwrap().len(), 0);
+ }
+
+ #[test]
+ fn deserialize_roundtrip_small() {
+ let positions = [0u64, 5, 100, 1000];
+ let dv =
DeleteVector::deserialize(&encode_dv_blob(&dv_of(positions))).unwrap();
+ assert_eq!(sorted(&dv), positions);
+ }
+
+ #[test]
+ fn deserialize_roundtrip_spanning_64bit_keys() {
+ let positions = [1u64, 1 << 33, (1 << 33) + 5, 1 << 34];
+ let dv =
DeleteVector::deserialize(&encode_dv_blob(&dv_of(positions))).unwrap();
+ assert_eq!(sorted(&dv), positions);
+ }
+
+ // Java run-optimizes every deletion vector before writing, so real blobs
carry RUN
+ // containers, which use the SERIAL_COOKIE roaring layout. Force that
layout so decode
+ // exercises the run-container path rather than only array and bitmap
containers.
+ #[test]
+ fn deserialize_roundtrip_run_optimized() {
+ let mut dv = dv_of(0..10_000);
+ assert!(
+ dv.inner.optimize(),
+ "expected a dense range to run-length encode"
+ );
+ let decoded = DeleteVector::deserialize(&encode_dv_blob(&dv)).unwrap();
+ assert_eq!(decoded.len(), 10_000);
+ assert_eq!(sorted(&decoded).first(), Some(&0));
+ assert_eq!(sorted(&decoded).last(), Some(&9_999));
Review Comment:
Updated, thanks @anoopj!
##########
crates/iceberg/src/delete_vector.rs:
##########
@@ -198,4 +288,107 @@ mod tests {
let res = dv.insert_positions(&positions);
assert!(res.is_err());
}
+
+ // Reproduces Iceberg-Java's `deletion-vector-v1` framing so tests can
round-trip through
+ // `deserialize` without a Java writer. Cross-implementation golden
fixtures produced by
+ // Iceberg-Java are tracked separately; this only checks that our decode
matches our encode.
+ fn encode_dv_blob(dv: &DeleteVector) -> Vec<u8> {
Review Comment:
Updated, thanks @anoopj!
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
