changes?

Signed-off-by: Adam Gutglick <adam@spiraldb.com>

Author: AdamGS

encodings/sparse/src/canonical.rs

@@ -118,7 +118,7 @@ pub(super) fn execute_sparse(
             execute_sparse_fixed_size_list(array, *nullability, ctx)?
         }
         DType::Extension(_ext_dtype) => todo!(),
-        DType::Variant => vortex_bail!("Sparse canonicalization does not support Variant"),
+        DType::Variant(_) => vortex_bail!("Sparse canonicalization does not support Variant"),
     })
 }
 

fuzz/src/array/compare.rs

@@ -141,7 +141,7 @@ pub fn compare_canonical_array(
             )
             .into_array()
         }
-        d @ (DType::Null | DType::Extension(_) | DType::Variant) => {
+        d @ (DType::Null | DType::Extension(_) | DType::Variant(_)) => {
             unreachable!("DType {d} not supported for fuzzing")
         }
     }

fuzz/src/array/filter.rs

@@ -115,7 +115,7 @@ pub fn filter_canonical_array(array: &ArrayRef, filter: &[bool]) -> VortexResult
             }
             take_canonical_array_non_nullable_indices(array, indices.as_slice())
         }
-        d @ (DType::Null | DType::Extension(_) | DType::Variant) => {
+        d @ (DType::Null | DType::Extension(_) | DType::Variant(_)) => {
             unreachable!("DType {d} not supported for fuzzing")
         }
     }

fuzz/src/array/mod.rs

@@ -489,7 +489,7 @@ fn actions_for_dtype(dtype: &DType) -> HashSet<ActionType> {
             ActionType::iter().collect()
         }
         // Currently, no support at all
-        DType::Variant => unreachable!("Variant dtype shouldn't be fuzzed"),
+        DType::Variant(_) => unreachable!("Variant dtype shouldn't be fuzzed"),
     }
 }
 

fuzz/src/array/search_sorted.rs

@@ -131,7 +131,7 @@ pub fn search_sorted_canonical_array(
                 .collect::<VortexResult<Vec<_>>>()?;
             scalar_vals.search_sorted(&scalar.cast(array.dtype())?, side)
         }
-        d @ (DType::Null | DType::Extension(_) | DType::Variant) => {
+        d @ (DType::Null | DType::Extension(_) | DType::Variant(_)) => {
             unreachable!("DType {d} not supported for fuzzing")
         }
     }

fuzz/src/array/slice.rs

@@ -114,7 +114,7 @@ pub fn slice_canonical_array(
                 .into_array(),
             )
         }
-        d @ (DType::Null | DType::Extension(_) | DType::Variant) => {
+        d @ (DType::Null | DType::Extension(_) | DType::Variant(_)) => {
             unreachable!("DType {d} not supported for fuzzing")
         }
     }

fuzz/src/array/sort.rs

@@ -81,7 +81,7 @@ pub fn sort_canonical_array(array: &ArrayRef) -> VortexResult<ArrayRef> {
             });
             take_canonical_array_non_nullable_indices(array, &sort_indices)
         }
-        d @ (DType::Null | DType::Extension(_) | DType::Variant) => {
+        d @ (DType::Null | DType::Extension(_) | DType::Variant(_)) => {
             unreachable!("DType {d} not supported for fuzzing")
         }
     }

fuzz/src/array/take.rs

@@ -138,7 +138,7 @@ pub fn take_canonical_array(array: &ArrayRef, indices: &[Option<usize>]) -> Vort
             }
             Ok(builder.finish())
         }
-        d @ (DType::Null | DType::Extension(_) | DType::Variant) => {
+        d @ (DType::Null | DType::Extension(_) | DType::Variant(_)) => {
             unreachable!("DType {d} not supported for fuzzing")
         }
     }

vortex-array/public-api.lock

@@ -10402,7 +10402,7 @@ pub vortex_array::dtype::DType::Struct(vortex_array::dtype::StructFields, vortex
 
 pub vortex_array::dtype::DType::Utf8(vortex_array::dtype::Nullability)
 
-pub vortex_array::dtype::DType::Variant
+pub vortex_array::dtype::DType::Variant(vortex_array::dtype::Nullability)
 
 impl vortex_array::dtype::DType
 
@@ -15990,6 +15990,8 @@ pub fn vortex_array::scalar::Scalar::is_null(&self) -> bool
 
 pub fn vortex_array::scalar::Scalar::is_valid(&self) -> bool
 
+pub fn vortex_array::scalar::Scalar::is_variant_null(&self) -> core::option::Option<bool>
+
 pub fn vortex_array::scalar::Scalar::is_zero(&self) -> core::option::Option<bool>
 
 pub unsafe fn vortex_array::scalar::Scalar::new_unchecked(dtype: vortex_array::dtype::DType, value: core::option::Option<vortex_array::scalar::ScalarValue>) -> Self
@@ -16040,9 +16042,9 @@ pub fn vortex_array::scalar::Scalar::as_utf8(&self) -> vortex_array::scalar::Utf
 
 pub fn vortex_array::scalar::Scalar::as_utf8_opt(&self) -> core::option::Option<vortex_array::scalar::Utf8Scalar<'_>>
 
-pub fn vortex_array::scalar::Scalar::as_variant(&self) -> &vortex_array::scalar::Scalar
+pub fn vortex_array::scalar::Scalar::as_variant(&self) -> vortex_array::scalar::VariantScalar<'_>
 
-pub fn vortex_array::scalar::Scalar::as_variant_opt(&self) -> core::option::Option<&vortex_array::scalar::Scalar>
+pub fn vortex_array::scalar::Scalar::as_variant_opt(&self) -> core::option::Option<vortex_array::scalar::VariantScalar<'_>>
 
 impl vortex_array::scalar::Scalar
 
@@ -16736,6 +16738,32 @@ impl<'a> core::hash::Hash for vortex_array::scalar::Utf8Scalar<'a>
 
 pub fn vortex_array::scalar::Utf8Scalar<'a>::hash<__H: core::hash::Hasher>(&self, state: &mut __H)
 
+pub struct vortex_array::scalar::VariantScalar<'a>
+
+impl<'a> vortex_array::scalar::VariantScalar<'a>
+
+pub fn vortex_array::scalar::VariantScalar<'a>::dtype(&self) -> &'a vortex_array::dtype::DType
+
+pub fn vortex_array::scalar::VariantScalar<'a>::is_null(&self) -> bool
+
+pub fn vortex_array::scalar::VariantScalar<'a>::is_variant_null(&self) -> core::option::Option<bool>
+
+pub fn vortex_array::scalar::VariantScalar<'a>::value(&self) -> core::option::Option<&'a vortex_array::scalar::Scalar>
+
+impl core::fmt::Display for vortex_array::scalar::VariantScalar<'_>
+
+pub fn vortex_array::scalar::VariantScalar<'_>::fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result
+
+impl<'a> core::clone::Clone for vortex_array::scalar::VariantScalar<'a>
+
+pub fn vortex_array::scalar::VariantScalar<'a>::clone(&self) -> vortex_array::scalar::VariantScalar<'a>
+
+impl<'a> core::fmt::Debug for vortex_array::scalar::VariantScalar<'a>
+
+pub fn vortex_array::scalar::VariantScalar<'a>::fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result
+
+impl<'a> core::marker::Copy for vortex_array::scalar::VariantScalar<'a>
+
 pub trait vortex_array::scalar::ScalarTruncation: core::marker::Send + core::marker::Sized
 
 pub fn vortex_array::scalar::ScalarTruncation::from_scalar(value: vortex_array::scalar::Scalar) -> vortex_error::VortexResult<core::option::Option<Self>>

vortex-array/src/arrays/arbitrary.rs

@@ -164,7 +164,7 @@ fn random_array_chunk(
         DType::Extension(..) => {
             unimplemented!("Extension arrays are not implemented")
         }
-        DType::Variant => {
+        DType::Variant(_) => {
             unimplemented!("Variant arrays are not implemented")
         }
     }