wip

Signed-off-by: Joe Isaacs <[email protected]>

Author: joseph-isaacs

encodings/alp/src/alp/array.rs

@@ -13,7 +13,8 @@ use vortex_array::vtable::{
 };
 use vortex_array::{
     Array, ArrayBufferVisitor, ArrayChildVisitor, ArrayEq, ArrayHash, ArrayRef, Canonical,
-    DeserializeMetadata, EncodingId, EncodingRef, Precision, ProstMetadata, vtable,
+    DeserializeMetadata, EncodingId, EncodingRef, Precision, ProstMetadata, SerializeMetadata,
+    vtable,
 };
 use vortex_buffer::ByteBuffer;
 use vortex_dtype::{DType, PType};
@@ -59,11 +60,13 @@ impl VTable for ALPVTable {
     }
 
     fn serialize(metadata: Self::Metadata) -> VortexResult<Option<Vec<u8>>> {
-        metadata.serialize()
+        Ok(Some(metadata.serialize()))
     }
 
     fn deserialize(buffer: &[u8]) -> VortexResult<Self::Metadata> {
-        ProstMetadata::<ALPMetadata>::deserialize(buffer)
+        Ok(ProstMetadata(
+            <ProstMetadata<ALPMetadata> as DeserializeMetadata>::deserialize(buffer)?,
+        ))
     }
 
     fn build(

encodings/alp/src/alp/mod.rs

@@ -11,7 +11,36 @@ mod array;
 mod compress;
 mod compute;
 mod ops;
-mod serde;
+
+#[cfg(test)]
+mod tests {
+    use vortex_array::ProstMetadata;
+    use vortex_array::patches::PatchesMetadata;
+    use vortex_array::test_harness::check_metadata;
+    use vortex_dtype::PType;
+
+    use crate::alp::array::ALPMetadata;
+
+    #[cfg_attr(miri, ignore)]
+    #[test]
+    fn test_alp_metadata() {
+        check_metadata(
+            "alp.metadata",
+            ProstMetadata(ALPMetadata {
+                patches: Some(PatchesMetadata::new(
+                    usize::MAX,
+                    usize::MAX,
+                    PType::U64,
+                    None,
+                    None,
+                    None,
+                )),
+                exp_e: u32::MAX,
+                exp_f: u32::MAX,
+            }),
+        );
+    }
+}
 
 pub use array::*;
 pub use compress::*;

encodings/alp/src/alp/serde.rs

@@ -16,7 +16,8 @@ use vortex_array::vtable::{
 };
 use vortex_array::{
     Array, ArrayBufferVisitor, ArrayChildVisitor, ArrayEq, ArrayHash, ArrayRef, Canonical,
-    EncodingId, EncodingRef, Precision, ProstMetadata, ToCanonical, vtable,
+    DeserializeMetadata, EncodingId, EncodingRef, Precision, ProstMetadata, SerializeMetadata,
+    ToCanonical, vtable,
 };
 use vortex_buffer::{Buffer, ByteBuffer};
 use vortex_dtype::{DType, Nullability, PType};
@@ -83,11 +84,13 @@ impl VTable for ALPRDVTable {
     }
 
     fn serialize(metadata: Self::Metadata) -> VortexResult<Option<Vec<u8>>> {
-        metadata.serialize()
+        Ok(Some(metadata.serialize()))
     }
 
     fn deserialize(buffer: &[u8]) -> VortexResult<Self::Metadata> {
-        ProstMetadata::deserialize(buffer)
+        Ok(ProstMetadata(
+            <ProstMetadata<ALPRDMetadata> as DeserializeMetadata>::deserialize(buffer)?,
+        ))
     }
 
     fn build(

encodings/alp/src/alp_rd/array.rs

@@ -12,7 +12,6 @@ use vortex_fastlanes::bitpack_compress::bitpack_encode_unchecked;
 mod array;
 mod compute;
 mod ops;
-mod serde;
 
 use std::ops::{Shl, Shr};
 

encodings/alp/src/alp_rd/mod.rs

@@ -18,7 +18,7 @@ use vortex_array::{
 };
 use vortex_buffer::ByteBuffer;
 use vortex_dtype::{DType, Nullability, PType};
-use vortex_error::{VortexResult, vortex_bail};
+use vortex_error::{VortexResult, vortex_bail, vortex_err};
 
 vtable!(DateTimeParts);
 
@@ -28,24 +28,27 @@ pub struct DateTimePartsMetadata {
     // Validity lives in the days array
     // TODO(ngates): we should actually model this with a Tuple array when we have one.
     #[prost(enumeration = "PType", tag = "1")]
-    days_ptype: i32,
+    pub days_ptype: i32,
     #[prost(enumeration = "PType", tag = "2")]
-    seconds_ptype: i32,
+    pub seconds_ptype: i32,
     #[prost(enumeration = "PType", tag = "3")]
-    subseconds_ptype: i32,
+    pub subseconds_ptype: i32,
 }
 
 impl DateTimePartsMetadata {
-    pub fn get_days_ptype(&self) -> PType {
-        PType::try_from(self.days_ptype).unwrap()
+    pub fn get_days_ptype(&self) -> VortexResult<PType> {
+        PType::try_from(self.days_ptype)
+            .map_err(|_| vortex_err!("Invalid PType {}", self.days_ptype))
     }
 
-    pub fn get_seconds_ptype(&self) -> PType {
-        PType::try_from(self.seconds_ptype).unwrap()
+    pub fn get_seconds_ptype(&self) -> VortexResult<PType> {
+        PType::try_from(self.seconds_ptype)
+            .map_err(|_| vortex_err!("Invalid PType {}", self.seconds_ptype))
     }
 
-    pub fn get_subseconds_ptype(&self) -> PType {
-        PType::try_from(self.subseconds_ptype).unwrap()
+    pub fn get_subseconds_ptype(&self) -> VortexResult<PType> {
+        PType::try_from(self.subseconds_ptype)
+            .map_err(|_| vortex_err!("Invalid PType {}", self.subseconds_ptype))
     }
 }
 
@@ -106,17 +109,17 @@ impl VTable for DateTimePartsVTable {
 
         let days = children.get(
             0,
-            &DType::Primitive(metadata.get_days_ptype(), dtype.nullability()),
+            &DType::Primitive(metadata.0.get_days_ptype()?, dtype.nullability()),
             len,
         )?;
         let seconds = children.get(
             1,
-            &DType::Primitive(metadata.get_seconds_ptype(), Nullability::NonNullable),
+            &DType::Primitive(metadata.0.get_seconds_ptype()?, Nullability::NonNullable),
             len,
         )?;
         let subseconds = children.get(
             2,
-            &DType::Primitive(metadata.get_subseconds_ptype(), Nullability::NonNullable),
+            &DType::Primitive(metadata.0.get_subseconds_ptype()?, Nullability::NonNullable),
             len,
         )?;
 

encodings/alp/src/alp_rd/serde.rs

@@ -9,5 +9,26 @@ mod canonical;
 mod compress;
 mod compute;
 mod ops;
-mod serde;
 mod timestamp;
+
+#[cfg(test)]
+mod test {
+    use vortex_array::ProstMetadata;
+    use vortex_array::test_harness::check_metadata;
+    use vortex_dtype::PType;
+
+    use crate::DateTimePartsMetadata;
+
+    #[cfg_attr(miri, ignore)]
+    #[test]
+    fn test_datetimeparts_metadata() {
+        check_metadata(
+            "datetimeparts.metadata",
+            ProstMetadata(DateTimePartsMetadata {
+                days_ptype: PType::I64 as i32,
+                seconds_ptype: PType::I64 as i32,
+                subseconds_ptype: PType::I64 as i32,
+            }),
+        );
+    }
+}

encodings/datetime-parts/src/array.rs

@@ -2,7 +2,6 @@
 // SPDX-FileCopyrightText: Copyright the Vortex contributors
 
 mod compute;
-mod serde;
 
 use std::hash::Hash;
 use std::ops::Range;
@@ -13,11 +12,11 @@ use vortex_array::serde::ArrayChildren;
 use vortex_array::stats::{ArrayStats, StatsSetRef};
 use vortex_array::vtable::{
     ArrayVTable, CanonicalVTable, NotSupported, OperationsVTable, VTable, ValidityChild,
-    ValidityHelper, ValidityVTableFromChild,
+    ValidityHelper, ValidityVTableFromChild, VisitorVTable,
 };
 use vortex_array::{
-    Array, ArrayEq, ArrayHash, ArrayRef, Canonical, DeserializeMetadata, EncodingId, EncodingRef,
-    IntoArray, Precision, ProstMetadata, SerializeMetadata, ToCanonical, vtable,
+    Array, ArrayBufferVisitor, ArrayChildVisitor, ArrayEq, ArrayHash, ArrayRef, Canonical, EncodingId, EncodingRef, IntoArray, Precision, ProstMetadata,
+    SerializeMetadata, ToCanonical, vtable,
 };
 use vortex_buffer::ByteBuffer;
 use vortex_dtype::{DType, DecimalDType, PType, match_each_signed_integer_ptype};
@@ -232,6 +231,14 @@ impl ValidityChild<DecimalBytePartsVTable> for DecimalBytePartsVTable {
     }
 }
 
+impl VisitorVTable<DecimalBytePartsVTable> for DecimalBytePartsVTable {
+    fn visit_buffers(_array: &DecimalBytePartsArray, _visitor: &mut dyn ArrayBufferVisitor) {}
+
+    fn visit_children(array: &DecimalBytePartsArray, visitor: &mut dyn ArrayChildVisitor) {
+        visitor.visit_child("msp", &array.msp);
+    }
+}
+
 #[cfg(test)]
 mod tests {
     use vortex_array::Array;