rebased

Signed-off-by: Andrew Duffy <andrew@a10y.dev>

Author: a10y

encodings/alp/public-api.lock

@@ -42,7 +42,7 @@ pub fn vortex_alp::ALP::buffer(_array: vortex_array::array::view::ArrayView<'_,
 
 pub fn vortex_alp::ALP::buffer_name(_array: vortex_array::array::view::ArrayView<'_, Self>, _idx: usize) -> core::option::Option<alloc::string::String>
 
-pub fn vortex_alp::ALP::build(dtype: &vortex_array::dtype::DType, len: usize, metadata: &Self::Metadata, _buffers: &[vortex_array::buffer::BufferHandle], children: &dyn vortex_array::serde::ArrayChildren) -> vortex_error::VortexResult<vortex_array::array::erased::ArrayRef>
+pub fn vortex_alp::ALP::build(dtype: &vortex_array::dtype::DType, len: usize, metadata: &Self::Metadata, _buffers: &[vortex_array::buffer::BufferHandle], children: &dyn vortex_array::serde::ArrayChildren) -> vortex_error::VortexResult<vortex_alp::ALPData>
 
 pub fn vortex_alp::ALP::deserialize(bytes: &[u8], _dtype: &vortex_array::dtype::DType, _len: usize, _buffers: &[vortex_array::buffer::BufferHandle], _session: &vortex_session::VortexSession) -> vortex_error::VortexResult<Self::Metadata>
 
@@ -212,7 +212,7 @@ pub fn vortex_alp::ALPRD::buffer(_array: vortex_array::array::view::ArrayView<'_
 
 pub fn vortex_alp::ALPRD::buffer_name(_array: vortex_array::array::view::ArrayView<'_, Self>, _idx: usize) -> core::option::Option<alloc::string::String>
 
-pub fn vortex_alp::ALPRD::build(dtype: &vortex_array::dtype::DType, len: usize, metadata: &Self::Metadata, _buffers: &[vortex_array::buffer::BufferHandle], children: &dyn vortex_array::serde::ArrayChildren) -> vortex_error::VortexResult<vortex_array::array::erased::ArrayRef>
+pub fn vortex_alp::ALPRD::build(dtype: &vortex_array::dtype::DType, len: usize, metadata: &Self::Metadata, _buffers: &[vortex_array::buffer::BufferHandle], children: &dyn vortex_array::serde::ArrayChildren) -> vortex_error::VortexResult<vortex_alp::ALPRDData>
 
 pub fn vortex_alp::ALPRD::deserialize(bytes: &[u8], _dtype: &vortex_array::dtype::DType, _len: usize, _buffers: &[vortex_array::buffer::BufferHandle], _session: &vortex_session::VortexSession) -> vortex_error::VortexResult<Self::Metadata>
 

encodings/alp/src/alp/array.rs

@@ -131,7 +131,7 @@ impl VTable for ALP {
         metadata: &Self::Metadata,
         _buffers: &[BufferHandle],
         children: &dyn ArrayChildren,
-    ) -> VortexResult<ArrayRef> {
+    ) -> VortexResult<ALPData> {
         let encoded_ptype = match &dtype {
             DType::Primitive(PType::F32, n) => DType::Primitive(PType::I32, *n),
             DType::Primitive(PType::F64, n) => DType::Primitive(PType::I64, *n),
@@ -153,15 +153,14 @@ impl VTable for ALP {
             })
             .transpose()?;
 
-        Ok(ALPData::try_new(
+        ALPData::try_new(
             encoded,
             Exponents {
                 e: u8::try_from(metadata.exp_e)?,
                 f: u8::try_from(metadata.exp_f)?,
             },
             patches,
-        )?
-        .into_array())
+        )
     }
 
     fn slots(array: ArrayView<'_, Self>) -> &[Option<ArrayRef>] {

encodings/alp/src/alp/compress.rs

@@ -47,7 +47,14 @@ pub fn alp_encode(parray: &PrimitiveArray, exponents: Option<Exponents>) -> Vort
     };
 
     // SAFETY: alp_encode_components_typed must return well-formed components
-    unsafe { Ok(ALP::new_unchecked(encoded, exponents, patches)) }
+    unsafe {
+        Ok(ALP::new_unchecked(
+            encoded,
+            exponents,
+            patches,
+            parray.dtype().clone(),
+        ))
+    }
 }
 
 #[expect(

encodings/alp/src/alp/compute/between.rs

@@ -38,7 +38,7 @@ impl BetweenReduce for ALP {
 
         let nullability =
             array.dtype().nullability() | lower.dtype().nullability() | upper.dtype().nullability();
-        match_each_alp_float_ptype!(array.dtype().as_ptype(), |F| {
+        match_each_alp_float_ptype!(array.ptype(), |F| {
             between_impl::<F>(
                 array,
                 F::try_from(&lower)?,

encodings/alp/src/alp/compute/cast.rs

@@ -45,7 +45,8 @@ impl CastReduce for ALP {
             // SAFETY: casting nullability doesn't alter the invariants
             unsafe {
                 Ok(Some(
-                    ALP::new_unchecked(new_encoded, array.exponents(), new_patches).into_array(),
+                    ALP::new_unchecked(new_encoded, array.exponents(), new_patches, dtype.clone())
+                        .into_array(),
                 ))
             }
         } else {

encodings/alp/src/alp/compute/filter.rs

@@ -30,6 +30,7 @@ impl FilterKernel for ALP {
                     array.encoded().filter(mask.clone())?,
                     array.exponents(),
                     patches,
+                    array.dtype().clone(),
                 )
                 .into_array(),
             ))

encodings/alp/src/alp/decompress.rs

@@ -27,8 +27,7 @@ pub fn decompress_into_array(
     array: ALPArray,
     ctx: &mut ExecutionCtx,
 ) -> VortexResult<PrimitiveArray> {
-    let dtype = array.dtype().clone();
-    let (encoded, exponents, patches) = array.into_data().into_parts();
+    let (encoded, exponents, patches, dtype) = array.into_data().into_parts();
     if let Some(ref patches) = patches
         && let Some(chunk_offsets) = patches.chunk_offsets()
     {
@@ -60,8 +59,7 @@ pub fn decompress_into_array(
 ///
 /// A `PrimitiveArray` containing the decompressed floating-point values with all patches applied.
 pub fn execute_decompress(array: ALPArray, ctx: &mut ExecutionCtx) -> VortexResult<PrimitiveArray> {
-    let dtype = array.dtype().clone();
-    let (encoded, exponents, patches) = array.into_data().into_parts();
+    let (encoded, exponents, patches, dtype) = array.into_data().into_parts();
     if let Some(ref patches) = patches
         && let Some(chunk_offsets) = patches.chunk_offsets()
     {

encodings/alp/src/alp/mod.rs

@@ -22,7 +22,7 @@ mod rules;
 
 #[cfg(test)]
 mod tests {
-    use prost::Message;
+    use vortex_array::ProstMetadata;
     use vortex_array::dtype::PType;
     use vortex_array::patches::PatchesMetadata;
     use vortex_array::test_harness::check_metadata;
@@ -34,7 +34,7 @@ mod tests {
     fn test_alp_metadata() {
         check_metadata(
             "alp.metadata",
-            &ALPMetadata {
+            ProstMetadata(ALPMetadata {
                 patches: Some(PatchesMetadata::new(
                     usize::MAX,
                     usize::MAX,
@@ -45,8 +45,7 @@ mod tests {
                 )),
                 exp_e: u32::MAX,
                 exp_f: u32::MAX,
-            }
-            .encode_to_vec(),
+            }),
         );
     }
 }

encodings/alp/src/alp/ops.rs

@@ -26,7 +26,7 @@ impl OperationsVTable<ALP> for ALP {
 
         let encoded_val = array.encoded().scalar_at(index)?;
 
-        Ok(match_each_alp_float_ptype!(array.dtype().as_ptype(), |T| {
+        Ok(match_each_alp_float_ptype!(array.ptype(), |T| {
             let encoded_val: <T as ALPFloat>::ALPInt =
                 (&encoded_val).try_into().vortex_expect("invalid ALPInt");
             Scalar::primitive(

encodings/alp/src/alp_rd/array.rs

@@ -164,7 +164,7 @@ impl VTable for ALPRD {
         metadata: &Self::Metadata,
         _buffers: &[BufferHandle],
         children: &dyn ArrayChildren,
-    ) -> VortexResult<ArrayRef> {
+    ) -> VortexResult<ALPRDData> {
         if children.len() < 2 {
             vortex_bail!(
                 "Expected at least 2 children for ALPRD encoding, found {}",
@@ -212,7 +212,7 @@ impl VTable for ALPRD {
             })
             .transpose()?;
 
-        Ok(ALPRDData::try_new(
+        ALPRDData::try_new(
             dtype.clone(),
             left_parts,
             left_parts_dictionary,
@@ -224,8 +224,7 @@ impl VTable for ALPRD {
                 )
             })?,
             left_parts_patches,
-        )?
-        .into_array())
+        )
     }
 
     fn slots(array: ArrayView<'_, Self>) -> &[Option<ArrayRef>] {