ScalarValue::Array

encodings/fastlanes/src/for/vtable/mod.rs

@@ -132,9 +132,9 @@ impl VTable for FoRVTable {
         dtype: &DType,
         _len: usize,
         _buffers: &[BufferHandle],
-        _session: &VortexSession,
+        session: &VortexSession,
     ) -> VortexResult<Self::Metadata> {
-        let scalar_value = ScalarValue::from_proto_bytes(bytes, dtype)?;
+        let scalar_value = ScalarValue::from_proto_bytes(bytes, dtype, session)?;
         Scalar::try_new(dtype.clone(), scalar_value)
     }
 

encodings/sequence/src/array.rs

@@ -322,7 +322,7 @@ impl VTable for SequenceVTable {
         dtype: &DType,
         _len: usize,
         _buffers: &[BufferHandle],
-        _session: &VortexSession,
+        session: &VortexSession,
     ) -> VortexResult<Self::Metadata> {
         let prost =
             <ProstMetadata<ProstSequenceMetadata> as DeserializeMetadata>::deserialize(bytes)?;
@@ -336,6 +336,7 @@ impl VTable for SequenceVTable {
                 .as_ref()
                 .ok_or_else(|| vortex_err!("base required"))?,
             &DType::Primitive(ptype, NonNullable),
+            session,
         )?
         .as_primitive()
         .pvalue()
@@ -347,6 +348,7 @@ impl VTable for SequenceVTable {
                 .as_ref()
                 .ok_or_else(|| vortex_err!("multiplier required"))?,
             &DType::Primitive(ptype, NonNullable),
+            session,
         )?
         .as_primitive()
         .pvalue()

encodings/sparse/src/lib.rs

@@ -164,7 +164,7 @@ impl VTable for SparseVTable {
         dtype: &DType,
         _len: usize,
         buffers: &[BufferHandle],
-        _session: &VortexSession,
+        session: &VortexSession,
     ) -> VortexResult<Self::Metadata> {
         let prost_patches =
             <ProstMetadata<ProstPatchesMetadata> as DeserializeMetadata>::deserialize(bytes)?;
@@ -176,7 +176,7 @@ impl VTable for SparseVTable {
         }
         let scalar_bytes: &[u8] = &buffers[0].clone().try_to_host_sync()?;
 
-        let scalar_value = ScalarValue::from_proto_bytes(scalar_bytes, dtype)?;
+        let scalar_value = ScalarValue::from_proto_bytes(scalar_bytes, dtype, session)?;
         let fill_value = Scalar::try_new(dtype.clone(), scalar_value)?;
 
         Ok(SparseMetadata {

vortex-array/src/arrays/constant/vtable/mod.rs

@@ -122,7 +122,7 @@ impl VTable for ConstantVTable {
         dtype: &DType,
         _len: usize,
         buffers: &[BufferHandle],
-        _session: &VortexSession,
+        session: &VortexSession,
     ) -> VortexResult<Self::Metadata> {
         vortex_ensure!(
             buffers.len() == 1,
@@ -133,7 +133,7 @@ impl VTable for ConstantVTable {
         let buffer = buffers[0].clone().try_to_host_sync()?;
         let bytes: &[u8] = buffer.as_ref();
 
-        let scalar_value = ScalarValue::from_proto_bytes(bytes, dtype)?;
+        let scalar_value = ScalarValue::from_proto_bytes(bytes, dtype, session)?;
         let scalar = Scalar::try_new(dtype.clone(), scalar_value)?;
 
         Ok(scalar)

vortex-array/src/arrays/fixed_size_list/vtable/operations.rs

@@ -6,22 +6,14 @@ use vortex_error::VortexResult;
 use crate::arrays::FixedSizeListArray;
 use crate::arrays::FixedSizeListVTable;
 use crate::scalar::Scalar;
+use crate::scalar::ScalarValue;
 use crate::vtable::OperationsVTable;
 
 impl OperationsVTable<FixedSizeListVTable> for FixedSizeListVTable {
     fn scalar_at(array: &FixedSizeListArray, index: usize) -> VortexResult<Scalar> {
         // By the preconditions we know that the list scalar is not null.
         let list = array.fixed_size_list_elements_at(index)?;
-        let children_elements: Vec<Scalar> = (0..list.len())
-            .map(|i| list.scalar_at(i))
-            .collect::<VortexResult<_>>()?;
-
-        debug_assert_eq!(children_elements.len(), array.list_size() as usize);
-
-        Ok(Scalar::fixed_size_list(
-            list.dtype().clone(),
-            children_elements,
-            array.dtype().nullability(),
-        ))
+        let scalar_value = ScalarValue::Array(list);
+        Scalar::try_new(array.dtype().clone(), Some(scalar_value))
     }
 }

vortex-array/src/arrays/list/vtable/operations.rs

@@ -1,27 +1,19 @@
 // SPDX-License-Identifier: Apache-2.0
 // SPDX-FileCopyrightText: Copyright the Vortex contributors
 
-use std::sync::Arc;
-
 use vortex_error::VortexResult;
 
 use crate::arrays::ListArray;
 use crate::arrays::ListVTable;
 use crate::scalar::Scalar;
+use crate::scalar::ScalarValue;
 use crate::vtable::OperationsVTable;
 
 impl OperationsVTable<ListVTable> for ListVTable {
     fn scalar_at(array: &ListArray, index: usize) -> VortexResult<Scalar> {
         // By the preconditions we know that the list scalar is not null.
-        let elems = array.list_elements_at(index)?;
-        let scalars: Vec<Scalar> = (0..elems.len())
-            .map(|i| elems.scalar_at(i))
-            .collect::<VortexResult<_>>()?;
-
-        Ok(Scalar::list(
-            Arc::new(elems.dtype().clone()),
-            scalars,
-            array.dtype().nullability(),
-        ))
+        let list = array.list_elements_at(index)?;
+        let scalar_value = ScalarValue::Array(list);
+        Scalar::try_new(array.dtype().clone(), Some(scalar_value))
     }
 }

vortex-array/src/arrays/listview/vtable/operations.rs

@@ -1,27 +1,19 @@
 // SPDX-License-Identifier: Apache-2.0
 // SPDX-FileCopyrightText: Copyright the Vortex contributors
 
-use std::sync::Arc;
-
 use vortex_error::VortexResult;
 
 use crate::arrays::ListViewArray;
 use crate::arrays::ListViewVTable;
 use crate::scalar::Scalar;
+use crate::scalar::ScalarValue;
 use crate::vtable::OperationsVTable;
 
 impl OperationsVTable<ListViewVTable> for ListViewVTable {
     fn scalar_at(array: &ListViewArray, index: usize) -> VortexResult<Scalar> {
         // By the preconditions we know that the list scalar is not null.
         let list = array.list_elements_at(index)?;
-        let children: Vec<Scalar> = (0..list.len())
-            .map(|i| list.scalar_at(i))
-            .collect::<VortexResult<_>>()?;
-
-        Ok(Scalar::list(
-            Arc::new(list.dtype().clone()),
-            children,
-            array.dtype.nullability(),
-        ))
+        let scalar_value = ScalarValue::Array(list);
+        Scalar::try_new(array.dtype().clone(), Some(scalar_value))
     }
 }