wip

Signed-off-by: Joe Isaacs <joe.isaacs@live.co.uk>

Author: joseph-isaacs

encodings/zstd/src/zstd_buffers.rs

@@ -53,7 +53,6 @@ impl ZstdBuffers {
     }
 
     pub fn compress(array: &ArrayRef, level: i32) -> VortexResult<ZstdBuffersArray> {
-        let encoding_id = array.encoding_id();
         let metadata = array
             .metadata()?
             .ok_or_else(|| vortex_err!("Array does not support serialization"))?;
@@ -74,6 +73,7 @@ impl ZstdBuffers {
             compressed_buffers.push(BufferHandle::new_host(ByteBuffer::from(compressed)));
         }
 
+        let encoding_id = array.encoding_id().clone();
         let data = ZstdBuffersData {
             inner_encoding_id: encoding_id,
             inner_metadata: metadata,

vortex-array/public-api.lock

@@ -21504,7 +21504,7 @@ pub fn vortex_array::Array<V>::data(&self) -> &<V as vortex_array::VTable>::Arra
 
 pub fn vortex_array::Array<V>::dtype(&self) -> &vortex_array::dtype::DType
 
-pub fn vortex_array::Array<V>::encoding_id(&self) -> vortex_array::ArrayId
+pub fn vortex_array::Array<V>::encoding_id(&self) -> &vortex_array::ArrayId
 
 pub fn vortex_array::Array<V>::into_data(self) -> <V as vortex_array::VTable>::ArrayData
 
@@ -21680,7 +21680,7 @@ pub fn vortex_array::ArrayRef::downcast<V: vortex_array::VTable>(self) -> vortex
 
 pub fn vortex_array::ArrayRef::dtype(&self) -> &vortex_array::dtype::DType
 
-pub fn vortex_array::ArrayRef::encoding_id(&self) -> vortex_array::ArrayId
+pub fn vortex_array::ArrayRef::encoding_id(&self) -> &vortex_array::ArrayId
 
 pub fn vortex_array::ArrayRef::execute_parent(&self, parent: &vortex_array::ArrayRef, child_idx: usize, ctx: &mut vortex_array::ExecutionCtx) -> vortex_error::VortexResult<core::option::Option<vortex_array::ArrayRef>>
 
@@ -22128,7 +22128,7 @@ pub fn vortex_array::ArrayView<'a, V>::data(&self) -> &'a <V as vortex_array::VT
 
 pub fn vortex_array::ArrayView<'a, V>::dtype(&self) -> &vortex_array::dtype::DType
 
-pub fn vortex_array::ArrayView<'a, V>::encoding_id(&self) -> vortex_array::ArrayId
+pub fn vortex_array::ArrayView<'a, V>::encoding_id(&self) -> &vortex_array::ArrayId
 
 pub fn vortex_array::ArrayView<'a, V>::into_owned(self) -> vortex_array::Array<V>
 

vortex-array/src/array/typed.rs

@@ -87,11 +87,6 @@ pub(crate) struct ArrayInner<V: VTable> {
 }
 
 impl<V: VTable> ArrayInner<V> {
-    /// Returns the encoding ID.
-    pub fn encoding_id(&self) -> &ArrayId {
-        &self.encoding_id
-    }
-
     /// Create a new inner array from explicit construction parameters.
     #[doc(hidden)]
     pub fn try_new(new: ArrayParts<V>) -> VortexResult<Self> {
@@ -275,7 +270,7 @@ impl<V: VTable> Array<V> {
 
     /// Returns the encoding ID.
     pub fn encoding_id(&self) -> &ArrayId {
-        &self.inner.encoding_id()
+        &self.downcast_inner().encoding_id
     }
 
     /// Returns the statistics.

vortex-array/src/array/view.rs

@@ -62,7 +62,7 @@ impl<'a, V: VTable> ArrayView<'a, V> {
     }
 
     pub fn encoding_id(&self) -> &ArrayId {
-        &self.array.encoding_id()
+        self.array.encoding_id()
     }
 
     pub fn statistics(&self) -> StatsSetRef<'_> {

vortex-array/src/normalize.rs

@@ -37,7 +37,7 @@ impl ArrayRef {
     }
 
     fn normalize_with_error(&self, allowed: &[Id]) -> VortexResult<()> {
-        if !allowed.contains(&self.encoding_id()) {
+        if !allowed.contains(self.encoding_id()) {
             vortex_bail!(AssertionFailed: "normalize forbids encoding ({})", self.encoding_id())
         }
 

vortex-array/src/serde.rs

@@ -192,7 +192,7 @@ impl<'a> ArrayNodeFlatBuffer<'a> {
     ) -> VortexResult<WIPOffset<fba::ArrayNode<'fb>>> {
         let encoding_idx = self
             .ctx
-            .intern(&self.array.encoding_id())
+            .intern(self.array.encoding_id())
             // TODO(ngates): write_flatbuffer should return a result if this can fail.
             .ok_or_else(|| {
                 vortex_err!(

vortex-cuda/src/dynamic_dispatch/plan_builder.rs

@@ -53,14 +53,14 @@ pub struct MaterializedPlan {
 /// Checks whether the encoding of an array can be fused into a dynamic-dispatch plan.
 fn is_dyn_dispatch_compatible(array: &ArrayRef) -> bool {
     let id = array.encoding_id();
-    if id == ALP::ID {
+    if *id == ALP::ID {
         let arr = array.as_::<ALP>();
         return arr.patches().is_none() && arr.dtype().as_ptype() == PType::F32;
     }
-    if id == BitPacked::ID {
+    if *id == BitPacked::ID {
         return array.as_::<BitPacked>().patches().is_none();
     }
-    if id == Dict::ID {
+    if *id == Dict::ID {
         let arr = array.as_::<Dict>();
         // As of now the dict dyn dispatch kernel requires
         // codes and values to have the same byte width.
@@ -72,7 +72,7 @@ fn is_dyn_dispatch_compatible(array: &ArrayRef) -> bool {
             _ => false,
         };
     }
-    if id == RunEnd::ID {
+    if *id == RunEnd::ID {
         let arr = array.as_::<RunEnd>();
         // As of now the run-end dyn dispatch kernel requires
         // ends and values to have the same byte width.
@@ -84,11 +84,11 @@ fn is_dyn_dispatch_compatible(array: &ArrayRef) -> bool {
             _ => false,
         };
     }
-    id == FoR::ID
-        || id == ZigZag::ID
-        || id == Primitive::ID
-        || id == Slice::ID
-        || id == Sequence::ID
+    *id == FoR::ID
+        || *id == ZigZag::ID
+        || *id == Primitive::ID
+        || *id == Slice::ID
+        || *id == Sequence::ID
 }
 
 /// An unmaterialized stage: a source op, scalar ops, and optional source buffer reference.
@@ -361,23 +361,23 @@ impl FusedPlan {
 
         let id = array.encoding_id();
 
-        if id == BitPacked::ID {
+        if *id == BitPacked::ID {
             self.walk_bitpacked(array)
-        } else if id == FoR::ID {
+        } else if *id == FoR::ID {
             self.walk_for(array, pending_subtrees)
-        } else if id == ZigZag::ID {
+        } else if *id == ZigZag::ID {
             self.walk_zigzag(array, pending_subtrees)
-        } else if id == ALP::ID {
+        } else if *id == ALP::ID {
             self.walk_alp(array, pending_subtrees)
-        } else if id == Dict::ID {
+        } else if *id == Dict::ID {
             self.walk_dict(array, pending_subtrees)
-        } else if id == RunEnd::ID {
+        } else if *id == RunEnd::ID {
             self.walk_runend(array, pending_subtrees)
-        } else if id == Primitive::ID {
+        } else if *id == Primitive::ID {
             self.walk_primitive(array)
-        } else if id == Slice::ID {
+        } else if *id == Slice::ID {
             self.walk_slice(array, pending_subtrees)
-        } else if id == Sequence::ID {
+        } else if *id == Sequence::ID {
             self.walk_sequence(array)
         } else {
             vortex_bail!(

vortex-cuda/src/executor.rs

@@ -352,7 +352,7 @@ pub trait CudaArrayExt {
 impl CudaArrayExt for ArrayRef {
     #[allow(clippy::unwrap_in_result, clippy::unwrap_used)]
     async fn execute_cuda(self, ctx: &mut CudaExecutionCtx) -> VortexResult<Canonical> {
-        if self.encoding_id() == Struct::ID {
+        if *self.encoding_id() == Struct::ID {
             let len = self.len();
             let StructDataParts {
                 fields,

vortex-cuda/src/hybrid_dispatch/mod.rs

@@ -99,7 +99,7 @@ pub async fn try_gpu_dispatch(
         DispatchPlan::Unfused => {
             // Unfused kernel dispatch fallback.
             ctx.cuda_session()
-                .kernel(&array.encoding_id())
+                .kernel(array.encoding_id())
                 .ok_or_else(|| {
                     vortex_err!("No CUDA kernel for encoding {:?}", array.encoding_id())
                 })?

vortex-cuda/src/layout.rs

@@ -549,7 +549,7 @@ fn extract_constant_buffers(chunk: &ArrayRef) -> Vec<InlinedBuffer> {
     let mut buffer_idx = 0u32;
     for array in chunk.depth_first_traversal() {
         let n = array.nbuffers();
-        if array.encoding_id() == Constant::ID {
+        if *array.encoding_id() == Constant::ID {
             for buf in array.buffers() {
                 result.push(InlinedBuffer {
                     buffer_index: buffer_idx,