stuff

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

Author: AdamGS

encodings/parquet-variant/src/lib.rs

@@ -29,8 +29,6 @@ mod kernel;
 mod operations;
 mod validity;
 mod variant_get;
-#[cfg(test)]
-mod variant_get_tests;
 mod vtable;
 
 pub use array::ParquetVariantArrayExt;

…dings/parquet-variant/src/variant_get.rs …s/parquet-variant/src/variant_get/mod.rsencodings/parquet-variant/src/variant_get.rs renamed to encodings/parquet-variant/src/variant_get/mod.rs encodings/parquet-variant/src/variant_get.rs renamed to encodings/parquet-variant/src/variant_get/mod.rs

@@ -13,17 +13,26 @@ use parquet_variant_compute::VariantArray as ArrowVariantArray;
 use vortex_array::ArrayRef;
 use vortex_array::ArrayView;
 use vortex_array::ExecutionCtx;
+use vortex_array::IntoArray;
+use vortex_array::arrays::VariantArray;
 use vortex_array::arrays::scalar_fn::ExactScalarFn;
 use vortex_array::arrays::scalar_fn::ScalarFnArrayView;
+use vortex_array::arrow::FromArrowArray;
+use vortex_array::dtype::DType;
 use vortex_array::dtype::FieldName;
+use vortex_array::dtype::Nullability;
 use vortex_array::kernel::ExecuteParentKernel;
 use vortex_array::scalar_fn::fns::variant_get::VariantGet;
+use vortex_array::validity::Validity;
+use vortex_buffer::BitBuffer;
 use vortex_error::VortexResult;
 use vortex_error::vortex_err;
 
 use crate::ParquetVariant;
 use crate::ParquetVariantArrayExt;
-use crate::ParquetVariantData;
+
+#[cfg(test)]
+mod tests;
 
 #[derive(Debug)]
 pub(crate) struct VariantGetExecuteParent;
@@ -63,7 +72,7 @@ fn variant_get_impl(
     let arrow_result = parquet_variant_compute::variant_get(&inner, options)
         .map_err(|e| vortex_err!("variant_get failed: {e}"))?;
 
-    // Convert back to Vortex
+    // Convert back to Vortex.
     let result_variant = ArrowVariantArray::try_new(
         arrow_result
             .as_any()
@@ -72,5 +81,37 @@ fn variant_get_impl(
     )
     .map_err(|e| vortex_err!("failed to create VariantArray from result: {e}"))?;
 
-    ParquetVariantData::from_arrow_variant(&result_variant)
+    // Ensure the result is always nullable (matching variant_get's return_dtype).
+    // Arrow may return a non-nullable result when no nulls are present.
+    let validity = result_variant
+        .nulls()
+        .map(|nulls| {
+            if nulls.null_count() == nulls.len() {
+                Validity::AllInvalid
+            } else {
+                Validity::from(BitBuffer::from(nulls.inner().clone()))
+            }
+        })
+        .unwrap_or(Validity::AllValid);
+
+    let metadata = ArrayRef::from_arrow(
+        result_variant.metadata_field() as &dyn arrow_array::Array,
+        false,
+    )?;
+    let value = result_variant
+        .value_field()
+        .map(|v| ArrayRef::from_arrow(v as &dyn arrow_array::Array, true))
+        .transpose()?;
+    let typed_value = result_variant
+        .typed_value_field()
+        .map(|tv| ArrayRef::from_arrow(tv.as_ref(), true))
+        .transpose()?;
+
+    let pv = ParquetVariant::try_new(validity, metadata, value, typed_value)?;
+    debug_assert_eq!(
+        pv.dtype(),
+        &DType::Variant(Nullability::Nullable),
+        "variant_get result must be nullable"
+    );
+    Ok(VariantArray::new(pv.into_array()).into_array())
 }