Skip to content

[Variant] Implement VariantArray::value for shredded variants #8105

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Aug 23, 2025
Merged

[Variant] Implement VariantArray::value for shredded variants #8105

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
b124132
Extract type_conversion and support typed value get for DataType::Int16
klion26 Aug 11, 2025
f813b08
address comment
klion26 Aug 21, 2025
07c45ce
refine macros
klion26 Aug 21, 2025
74e0f38
refine macro
klion26 Aug 21, 2025
e1752b7
address comments
klion26 Aug 21, 2025
efa327a
fix style
klion26 Aug 21, 2025
6d1c929
fix clippy check
klion26 Aug 21, 2025
59239b3
address comments
klion26 Aug 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
174 changes: 34 additions & 140 deletions parquet-variant-compute/src/cast_to_variant.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,10 @@

use std::sync::Arc;

use crate::type_conversion::{
decimal_to_variant_decimal, generic_conversion_array, non_generic_conversion_array,
primitive_conversion_array,
};
use crate::{VariantArray, VariantArrayBuilder};
use arrow::array::{
Array, AsArray, TimestampMicrosecondArray, TimestampMillisecondArray, TimestampNanosecondArray,
Expand All @@ -35,60 +39,10 @@ use arrow::temporal_conversions::{
};
use arrow_schema::{ArrowError, DataType, TimeUnit};
use chrono::{DateTime, NaiveDate, NaiveDateTime, NaiveTime, TimeZone, Utc};
use half::f16;
use parquet_variant::{
Variant, VariantBuilder, VariantDecimal16, VariantDecimal4, VariantDecimal8,
};

/// Convert the input array of a specific primitive type to a `VariantArray`
/// row by row
macro_rules! primitive_conversion {
($t:ty, $input:expr, $builder:expr) => {{
let array = $input.as_primitive::<$t>();
for i in 0..array.len() {
if array.is_null(i) {
$builder.append_null();
continue;
}
$builder.append_variant(Variant::from(array.value(i)));
}
}};
}

/// Convert the input array to a `VariantArray` row by row, using `method`
/// requiring a generic type to downcast the generic array to a specific
/// array type and `cast_fn` to transform each element to a type compatible with Variant
macro_rules! generic_conversion {
($t:ty, $method:ident, $cast_fn:expr, $input:expr, $builder:expr) => {{
let array = $input.$method::<$t>();
for i in 0..array.len() {
if array.is_null(i) {
$builder.append_null();
continue;
}
let cast_value = $cast_fn(array.value(i));
$builder.append_variant(Variant::from(cast_value));
}
}};
}

/// Convert the input array to a `VariantArray` row by row, using `method`
/// not requiring a generic type to downcast the generic array to a specific
/// array type and `cast_fn` to transform each element to a type compatible with Variant
macro_rules! non_generic_conversion {
($method:ident, $cast_fn:expr, $input:expr, $builder:expr) => {{
let array = $input.$method();
for i in 0..array.len() {
if array.is_null(i) {
$builder.append_null();
continue;
}
let cast_value = $cast_fn(array.value(i));
$builder.append_variant(Variant::from(cast_value));
}
}};
}

fn convert_timestamp(
time_unit: &TimeUnit,
time_zone: &Option<Arc<str>>,
Expand Down Expand Up @@ -157,61 +111,6 @@ fn convert_timestamp(
}
}

/// Convert a decimal value to a `VariantDecimal`
macro_rules! decimal_to_variant_decimal {
($v:ident, $scale:expr, $value_type:ty, $variant_type:ty) => {
if *$scale < 0 {
// For negative scale, we need to multiply the value by 10^|scale|
// For example: 123 with scale -2 becomes 12300
let multiplier = (10 as $value_type).pow((-*$scale) as u32);
// Check for overflow
if $v > 0 && $v > <$value_type>::MAX / multiplier {
return Variant::Null;
}
if $v < 0 && $v < <$value_type>::MIN / multiplier {
return Variant::Null;
}
<$variant_type>::try_new($v * multiplier, 0)
.map(|v| v.into())
.unwrap_or(Variant::Null)
} else {
<$variant_type>::try_new($v, *$scale as u8)
.map(|v| v.into())
.unwrap_or(Variant::Null)
}
};
}

/// Convert arrays that don't need generic type parameters
macro_rules! cast_conversion_nongeneric {
($method:ident, $cast_fn:expr, $input:expr, $builder:expr) => {{
let array = $input.$method();
for i in 0..array.len() {
if array.is_null(i) {
$builder.append_null();
continue;
}
let cast_value = $cast_fn(array.value(i));
$builder.append_variant(Variant::from(cast_value));
}
}};
}

/// Convert string arrays using the offset size as the type parameter
macro_rules! cast_conversion_string {
($offset_type:ty, $method:ident, $cast_fn:expr, $input:expr, $builder:expr) => {{
let array = $input.$method::<$offset_type>();
for i in 0..array.len() {
if array.is_null(i) {
$builder.append_null();
continue;
}
let cast_value = $cast_fn(array.value(i));
$builder.append_variant(Variant::from(cast_value));
}
}};
}

/// Casts a typed arrow [`Array`] to a [`VariantArray`]. This is useful when you
/// need to convert a specific data type
///
Expand Down Expand Up @@ -248,59 +147,53 @@ pub fn cast_to_variant(input: &dyn Array) -> Result<VariantArray, ArrowError> {
// todo: handle other types like Boolean, Date, Timestamp, etc.
match input_type {
DataType::Boolean => {
non_generic_conversion!(as_boolean, |v| v, input, builder);
non_generic_conversion_array!(input.as_boolean(), |v| v, builder);
}

DataType::Binary => {
generic_conversion!(BinaryType, as_bytes, |v| v, input, builder);
generic_conversion_array!(BinaryType, as_bytes, |v| v, input, builder);
}
DataType::LargeBinary => {
generic_conversion!(LargeBinaryType, as_bytes, |v| v, input, builder);
generic_conversion_array!(LargeBinaryType, as_bytes, |v| v, input, builder);
}
DataType::BinaryView => {
generic_conversion!(BinaryViewType, as_byte_view, |v| v, input, builder);
generic_conversion_array!(BinaryViewType, as_byte_view, |v| v, input, builder);
}
DataType::Int8 => {
primitive_conversion!(Int8Type, input, builder);
primitive_conversion_array!(Int8Type, input, builder);
}
DataType::Int16 => {
primitive_conversion!(Int16Type, input, builder);
primitive_conversion_array!(Int16Type, input, builder);
}
DataType::Int32 => {
primitive_conversion!(Int32Type, input, builder);
primitive_conversion_array!(Int32Type, input, builder);
}
DataType::Int64 => {
primitive_conversion!(Int64Type, input, builder);
primitive_conversion_array!(Int64Type, input, builder);
}
DataType::UInt8 => {
primitive_conversion!(UInt8Type, input, builder);
primitive_conversion_array!(UInt8Type, input, builder);
}
DataType::UInt16 => {
primitive_conversion!(UInt16Type, input, builder);
primitive_conversion_array!(UInt16Type, input, builder);
}
DataType::UInt32 => {
primitive_conversion!(UInt32Type, input, builder);
primitive_conversion_array!(UInt32Type, input, builder);
}
DataType::UInt64 => {
primitive_conversion!(UInt64Type, input, builder);
primitive_conversion_array!(UInt64Type, input, builder);
}
DataType::Float16 => {
generic_conversion!(
Float16Type,
as_primitive,
|v: f16| -> f32 { v.into() },
input,
builder
);
generic_conversion_array!(Float16Type, as_primitive, f32::from, input, builder);
}
DataType::Float32 => {
primitive_conversion!(Float32Type, input, builder);
primitive_conversion_array!(Float32Type, input, builder);
}
DataType::Float64 => {
primitive_conversion!(Float64Type, input, builder);
primitive_conversion_array!(Float64Type, input, builder);
}
DataType::Decimal32(_, scale) => {
generic_conversion!(
generic_conversion_array!(
Decimal32Type,
as_primitive,
|v| decimal_to_variant_decimal!(v, scale, i32, VariantDecimal4),
Expand All @@ -309,7 +202,7 @@ pub fn cast_to_variant(input: &dyn Array) -> Result<VariantArray, ArrowError> {
);
}
DataType::Decimal64(_, scale) => {
generic_conversion!(
generic_conversion_array!(
Decimal64Type,
as_primitive,
|v| decimal_to_variant_decimal!(v, scale, i64, VariantDecimal8),
Expand All @@ -318,7 +211,7 @@ pub fn cast_to_variant(input: &dyn Array) -> Result<VariantArray, ArrowError> {
);
}
DataType::Decimal128(_, scale) => {
generic_conversion!(
generic_conversion_array!(
Decimal128Type,
as_primitive,
|v| decimal_to_variant_decimal!(v, scale, i128, VariantDecimal16),
Expand All @@ -327,7 +220,7 @@ pub fn cast_to_variant(input: &dyn Array) -> Result<VariantArray, ArrowError> {
);
}
DataType::Decimal256(_, scale) => {
generic_conversion!(
generic_conversion_array!(
Decimal256Type,
as_primitive,
|v: i256| {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

aside: L237-241 below could simplify to just:

                    v.to_i128().map_or(
                        Variant::Null, 
                        decimal_to_variant_decimal!(v, scale, i128, VariantDecimal16,
                    )

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We can't change this, because compile thinks that v passed into the macro is i256, and seems we can't cast it when calling the macro.

Copy link
Contributor

@scovich scovich Aug 21, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh, I had a silly typo, sorry --

                    v.to_i128().map_or(
                        Variant::Null, 
                        |v| decimal_to_variant_decimal!(v, scale, i128, VariantDecimal16),
                    )

(missing |v| in the closure)

Expand All @@ -345,7 +238,7 @@ pub fn cast_to_variant(input: &dyn Array) -> Result<VariantArray, ArrowError> {
);
}
DataType::FixedSizeBinary(_) => {
non_generic_conversion!(as_fixed_size_binary, |v| v, input, builder);
non_generic_conversion_array!(input.as_fixed_size_binary(), |v| v, builder);
}
DataType::Null => {
for _ in 0..input.len() {
Expand All @@ -358,7 +251,7 @@ pub fn cast_to_variant(input: &dyn Array) -> Result<VariantArray, ArrowError> {
DataType::Time32(unit) => {
match *unit {
TimeUnit::Second => {
generic_conversion!(
generic_conversion_array!(
Time32SecondType,
as_primitive,
// nano second are always 0
Expand All @@ -368,7 +261,7 @@ pub fn cast_to_variant(input: &dyn Array) -> Result<VariantArray, ArrowError> {
);
}
TimeUnit::Millisecond => {
generic_conversion!(
generic_conversion_array!(
Time32MillisecondType,
as_primitive,
|v| NaiveTime::from_num_seconds_from_midnight_opt(
Expand All @@ -391,7 +284,7 @@ pub fn cast_to_variant(input: &dyn Array) -> Result<VariantArray, ArrowError> {
DataType::Time64(unit) => {
match *unit {
TimeUnit::Microsecond => {
generic_conversion!(
generic_conversion_array!(
Time64MicrosecondType,
as_primitive,
|v| NaiveTime::from_num_seconds_from_midnight_opt(
Expand All @@ -404,7 +297,7 @@ pub fn cast_to_variant(input: &dyn Array) -> Result<VariantArray, ArrowError> {
);
}
TimeUnit::Nanosecond => {
generic_conversion!(
generic_conversion_array!(
Time64NanosecondType,
as_primitive,
|v| NaiveTime::from_num_seconds_from_midnight_opt(
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

aside: @alamb -- I'm not sure CI is running fmt against this file? At least, I've never seen it willing to omit trailing commas for non-macro invocations (L412), and it always formats multi-line lambdas with curly braces even tho I'd personally prefer it didn't:

|v| {
    NaiveTime::foo(
        a,
        b,
    )
}

Expand Down Expand Up @@ -432,13 +325,13 @@ pub fn cast_to_variant(input: &dyn Array) -> Result<VariantArray, ArrowError> {
));
}
DataType::Utf8 => {
cast_conversion_string!(i32, as_string, |v| v, input, builder);
generic_conversion_array!(i32, as_string, |v| v, input, builder);
}
DataType::LargeUtf8 => {
cast_conversion_string!(i64, as_string, |v| v, input, builder);
generic_conversion_array!(i64, as_string, |v| v, input, builder);
}
DataType::Utf8View => {
cast_conversion_nongeneric!(as_string_view, |v| v, input, builder);
non_generic_conversion_array!(input.as_string_view(), |v| v, builder);
}
DataType::Struct(_) => {
let struct_array = input.as_struct();
Expand Down Expand Up @@ -486,7 +379,7 @@ pub fn cast_to_variant(input: &dyn Array) -> Result<VariantArray, ArrowError> {
}
}
DataType::Date32 => {
generic_conversion!(
generic_conversion_array!(
Date32Type,
as_primitive,
|v: i32| -> NaiveDate { Date32Type::to_naive_date(v) },
Expand All @@ -495,7 +388,7 @@ pub fn cast_to_variant(input: &dyn Array) -> Result<VariantArray, ArrowError> {
);
}
DataType::Date64 => {
generic_conversion!(
generic_conversion_array!(
Date64Type,
as_primitive,
|v: i64| { Date64Type::to_naive_date_opt(v).unwrap() },
Expand Down Expand Up @@ -600,6 +493,7 @@ mod tests {
use arrow_schema::{
DECIMAL128_MAX_PRECISION, DECIMAL32_MAX_PRECISION, DECIMAL64_MAX_PRECISION,
};
use half::f16;
use parquet_variant::{Variant, VariantDecimal16};
use std::{sync::Arc, vec};

Expand Down
1 change: 1 addition & 0 deletions parquet-variant-compute/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
pub mod cast_to_variant;
mod from_json;
mod to_json;
mod type_conversion;
mod variant_array;
mod variant_array_builder;
pub mod variant_get;
Expand Down
Loading
Loading