Skip to content

[Variant] Define and use VariantDecimalType trait #8562

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 9 commits into from
Oct 14, 2025
Merged

[Variant] Define and use VariantDecimalType trait #8562

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
32bc99c
[Variant] Define and use VariantDecimalType trait
scovich Oct 2, 2025
9f83ab8
additional cleanup
scovich Oct 7, 2025
bd7f3a7
better approach to MAX_UNSCALED_VALUE
scovich Oct 7, 2025
e6c88b9
simpler macro
scovich Oct 10, 2025
3f66de4
simpler phantoms
scovich Oct 10, 2025
be9e2c9
another tweak
scovich Oct 10, 2025
0b9c5df
minimize diff
scovich Oct 10, 2025
a731191
tiny tweak
scovich Oct 10, 2025
6c0823a
Merge remote-tracking branch 'oss/main' into variant-decimal-trait
scovich Oct 10, 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
120 changes: 52 additions & 68 deletions parquet-variant-compute/src/arrow_to_variant.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,25 +15,22 @@
// specific language governing permissions and limitations
// under the License.

use crate::type_conversion::{CastOptions, decimal_to_variant_decimal};
use crate::type_conversion::CastOptions;
use arrow::array::{
Array, AsArray, FixedSizeListArray, GenericBinaryArray, GenericListArray, GenericListViewArray,
GenericStringArray, OffsetSizeTrait, PrimitiveArray,
};
use arrow::compute::kernels::cast;
use arrow::datatypes::{
ArrowNativeType, ArrowPrimitiveType, ArrowTemporalType, ArrowTimestampType, Date32Type,
Date64Type, Float16Type, Float32Type, Float64Type, Int8Type, Int16Type, Int32Type, Int64Type,
RunEndIndexType, Time32MillisecondType, Time32SecondType, Time64MicrosecondType,
Time64NanosecondType, TimestampMicrosecondType, TimestampMillisecondType,
TimestampNanosecondType, TimestampSecondType, UInt8Type, UInt16Type, UInt32Type, UInt64Type,
self as datatypes, ArrowNativeType, ArrowPrimitiveType, ArrowTemporalType, ArrowTimestampType,
DecimalType, RunEndIndexType,
};
use arrow::temporal_conversions::{as_date, as_datetime, as_time};
use arrow_schema::{ArrowError, DataType, TimeUnit};
use chrono::{DateTime, TimeZone, Utc};
use parquet_variant::{
ObjectFieldBuilder, Variant, VariantBuilderExt, VariantDecimal4, VariantDecimal8,
VariantDecimal16,
VariantDecimal16, VariantDecimalType,
};
use std::collections::HashMap;
use std::ops::Range;
Expand All @@ -46,31 +43,31 @@ use std::ops::Range;
pub(crate) enum ArrowToVariantRowBuilder<'a> {
Null(NullArrowToVariantBuilder),
Boolean(BooleanArrowToVariantBuilder<'a>),
PrimitiveInt8(PrimitiveArrowToVariantBuilder<'a, Int8Type>),
PrimitiveInt16(PrimitiveArrowToVariantBuilder<'a, Int16Type>),
PrimitiveInt32(PrimitiveArrowToVariantBuilder<'a, Int32Type>),
PrimitiveInt64(PrimitiveArrowToVariantBuilder<'a, Int64Type>),
PrimitiveUInt8(PrimitiveArrowToVariantBuilder<'a, UInt8Type>),
PrimitiveUInt16(PrimitiveArrowToVariantBuilder<'a, UInt16Type>),
PrimitiveUInt32(PrimitiveArrowToVariantBuilder<'a, UInt32Type>),
PrimitiveUInt64(PrimitiveArrowToVariantBuilder<'a, UInt64Type>),
PrimitiveFloat16(PrimitiveArrowToVariantBuilder<'a, Float16Type>),
PrimitiveFloat32(PrimitiveArrowToVariantBuilder<'a, Float32Type>),
PrimitiveFloat64(PrimitiveArrowToVariantBuilder<'a, Float64Type>),
Decimal32(Decimal32ArrowToVariantBuilder<'a>),
Decimal64(Decimal64ArrowToVariantBuilder<'a>),
Decimal128(Decimal128ArrowToVariantBuilder<'a>),
PrimitiveInt8(PrimitiveArrowToVariantBuilder<'a, datatypes::Int8Type>),
PrimitiveInt16(PrimitiveArrowToVariantBuilder<'a, datatypes::Int16Type>),
PrimitiveInt32(PrimitiveArrowToVariantBuilder<'a, datatypes::Int32Type>),
PrimitiveInt64(PrimitiveArrowToVariantBuilder<'a, datatypes::Int64Type>),
PrimitiveUInt8(PrimitiveArrowToVariantBuilder<'a, datatypes::UInt8Type>),
PrimitiveUInt16(PrimitiveArrowToVariantBuilder<'a, datatypes::UInt16Type>),
PrimitiveUInt32(PrimitiveArrowToVariantBuilder<'a, datatypes::UInt32Type>),
PrimitiveUInt64(PrimitiveArrowToVariantBuilder<'a, datatypes::UInt64Type>),
PrimitiveFloat16(PrimitiveArrowToVariantBuilder<'a, datatypes::Float16Type>),
PrimitiveFloat32(PrimitiveArrowToVariantBuilder<'a, datatypes::Float32Type>),
PrimitiveFloat64(PrimitiveArrowToVariantBuilder<'a, datatypes::Float64Type>),
Decimal32(DecimalArrowToVariantBuilder<'a, datatypes::Decimal32Type, VariantDecimal4>),
Decimal64(DecimalArrowToVariantBuilder<'a, datatypes::Decimal64Type, VariantDecimal8>),
Decimal128(DecimalArrowToVariantBuilder<'a, datatypes::Decimal128Type, VariantDecimal16>),
Decimal256(Decimal256ArrowToVariantBuilder<'a>),
TimestampSecond(TimestampArrowToVariantBuilder<'a, TimestampSecondType>),
TimestampMillisecond(TimestampArrowToVariantBuilder<'a, TimestampMillisecondType>),
TimestampMicrosecond(TimestampArrowToVariantBuilder<'a, TimestampMicrosecondType>),
TimestampNanosecond(TimestampArrowToVariantBuilder<'a, TimestampNanosecondType>),
Date32(DateArrowToVariantBuilder<'a, Date32Type>),
Date64(DateArrowToVariantBuilder<'a, Date64Type>),
Time32Second(TimeArrowToVariantBuilder<'a, Time32SecondType>),
Time32Millisecond(TimeArrowToVariantBuilder<'a, Time32MillisecondType>),
Time64Microsecond(TimeArrowToVariantBuilder<'a, Time64MicrosecondType>),
Time64Nanosecond(TimeArrowToVariantBuilder<'a, Time64NanosecondType>),
TimestampSecond(TimestampArrowToVariantBuilder<'a, datatypes::TimestampSecondType>),
TimestampMillisecond(TimestampArrowToVariantBuilder<'a, datatypes::TimestampMillisecondType>),
TimestampMicrosecond(TimestampArrowToVariantBuilder<'a, datatypes::TimestampMicrosecondType>),
TimestampNanosecond(TimestampArrowToVariantBuilder<'a, datatypes::TimestampNanosecondType>),
Date32(DateArrowToVariantBuilder<'a, datatypes::Date32Type>),
Date64(DateArrowToVariantBuilder<'a, datatypes::Date64Type>),
Time32Second(TimeArrowToVariantBuilder<'a, datatypes::Time32SecondType>),
Time32Millisecond(TimeArrowToVariantBuilder<'a, datatypes::Time32MillisecondType>),
Time64Microsecond(TimeArrowToVariantBuilder<'a, datatypes::Time64MicrosecondType>),
Time64Nanosecond(TimeArrowToVariantBuilder<'a, datatypes::Time64NanosecondType>),
Binary(BinaryArrowToVariantBuilder<'a, i32>),
LargeBinary(BinaryArrowToVariantBuilder<'a, i64>),
BinaryView(BinaryViewArrowToVariantBuilder<'a>),
Expand All @@ -87,9 +84,9 @@ pub(crate) enum ArrowToVariantRowBuilder<'a> {
Map(MapArrowToVariantBuilder<'a>),
Union(UnionArrowToVariantBuilder<'a>),
Dictionary(DictionaryArrowToVariantBuilder<'a>),
RunEndEncodedInt16(RunEndEncodedArrowToVariantBuilder<'a, Int16Type>),
RunEndEncodedInt32(RunEndEncodedArrowToVariantBuilder<'a, Int32Type>),
RunEndEncodedInt64(RunEndEncodedArrowToVariantBuilder<'a, Int64Type>),
RunEndEncodedInt16(RunEndEncodedArrowToVariantBuilder<'a, datatypes::Int16Type>),
RunEndEncodedInt32(RunEndEncodedArrowToVariantBuilder<'a, datatypes::Int32Type>),
RunEndEncodedInt64(RunEndEncodedArrowToVariantBuilder<'a, datatypes::Int64Type>),
}

impl<'a> ArrowToVariantRowBuilder<'a> {
Expand Down Expand Up @@ -174,13 +171,13 @@ pub(crate) fn make_arrow_to_variant_row_builder<'a>(
DataType::Float32 => PrimitiveFloat32(PrimitiveArrowToVariantBuilder::new(array)),
DataType::Float64 => PrimitiveFloat64(PrimitiveArrowToVariantBuilder::new(array)),
DataType::Decimal32(_, scale) => {
Decimal32(Decimal32ArrowToVariantBuilder::new(array, options, *scale))
Decimal32(DecimalArrowToVariantBuilder::new(array, options, *scale))
}
DataType::Decimal64(_, scale) => {
Decimal64(Decimal64ArrowToVariantBuilder::new(array, options, *scale))
Decimal64(DecimalArrowToVariantBuilder::new(array, options, *scale))
}
DataType::Decimal128(_, scale) => {
Decimal128(Decimal128ArrowToVariantBuilder::new(array, options, *scale))
Decimal128(DecimalArrowToVariantBuilder::new(array, options, *scale))
}
DataType::Decimal256(_, scale) => {
Decimal256(Decimal256ArrowToVariantBuilder::new(array, options, *scale))
Expand Down Expand Up @@ -320,26 +317,28 @@ pub(crate) fn make_arrow_to_variant_row_builder<'a>(
// worth the trouble, tho, because it makes for some pretty bulky and unwieldy macro expansions.
macro_rules! define_row_builder {
(
struct $name:ident<$lifetime:lifetime $(, $generic:ident: $bound:path )?>
struct $name:ident<$lifetime:lifetime $(, $generic:ident $( : $bound:path )? )*>
Copy link
Contributor Author

@scovich scovich Oct 10, 2025

Choose a reason for hiding this comment

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

Make the bound optional, because decimals use the where clause instead for better readability.

Copy link
Contributor Author

@scovich scovich Oct 10, 2025

Choose a reason for hiding this comment

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

Also allow multiple generic params instead of just one

$( where $where_path:path: $where_bound:path $(,)? )?
$({ $($field:ident: $field_type:ty),+ $(,)? })?,
$({ $( $field:ident: $field_type:ty ),+ $(,)? })?,
|$array_param:ident| -> $array_type:ty { $init_expr:expr }
$(, |$value:ident| $(-> Option<$option_ty:ty>)? $value_transform:expr)?
$(, |$value:ident| $(-> Option<$option_ty:ty>)? $value_transform:expr )?
) => {
pub(crate) struct $name<$lifetime $(, $generic: $bound )?>
pub(crate) struct $name<$lifetime $(, $generic: $( $bound )? )*>
$( where $where_path: $where_bound )?
{
array: &$lifetime $array_type,
$( $( $field: $field_type, )+ )?
_phantom: std::marker::PhantomData<($( $generic, )*)>, // capture all type params
Copy link
Contributor Author

@scovich scovich Oct 10, 2025

Choose a reason for hiding this comment

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

Capture all generic params automatically (decimal needs this, doesn't hurt other types)

}

impl<$lifetime $(, $generic: $bound+ )?> $name<$lifetime $(, $generic)?>
impl<$lifetime $(, $generic: $( $bound )? )*> $name<$lifetime $(, $generic)*>
$( where $where_path: $where_bound )?
{
pub(crate) fn new($array_param: &$lifetime dyn Array $(, $( $field: $field_type ),+ )?) -> Self {
pub(crate) fn new($array_param: &$lifetime dyn Array $( $(, $field: $field_type )+ )?) -> Self {
Self {
array: $init_expr,
$( $( $field, )+ )?
_phantom: std::marker::PhantomData,
}
}

Expand Down Expand Up @@ -401,43 +400,27 @@ define_row_builder!(
);

define_row_builder!(
struct Decimal32ArrowToVariantBuilder<'a> {
options: &'a CastOptions,
scale: i8,
},
|array| -> arrow::array::Decimal32Array { array.as_primitive() },
|value| -> Option<_> { decimal_to_variant_decimal!(value, scale, i32, VariantDecimal4) }
);

define_row_builder!(
struct Decimal64ArrowToVariantBuilder<'a> {
options: &'a CastOptions,
scale: i8,
},
|array| -> arrow::array::Decimal64Array { array.as_primitive() },
|value| -> Option<_> { decimal_to_variant_decimal!(value, scale, i64, VariantDecimal8) }
);

define_row_builder!(
struct Decimal128ArrowToVariantBuilder<'a> {
struct DecimalArrowToVariantBuilder<'a, A: DecimalType, V>
where
V: VariantDecimalType<Native = A::Native>,
{
options: &'a CastOptions,
scale: i8,
},
|array| -> arrow::array::Decimal128Array { array.as_primitive() },
|value| -> Option<_> { decimal_to_variant_decimal!(value, scale, i128, VariantDecimal16) }
|array| -> PrimitiveArray<A> { array.as_primitive() },
|value| -> Option<_> { V::try_new_with_signed_scale(value, *scale).ok() }
);

// Decimal256 needs a two-stage conversion via i128
define_row_builder!(
struct Decimal256ArrowToVariantBuilder<'a> {
options: &'a CastOptions,
scale: i8,
},
|array| -> arrow::array::Decimal256Array { array.as_primitive() },
|value| -> Option<_> {
// Decimal256 needs special handling - convert to i128 if possible
value.to_i128().and_then(|i128_val| {
decimal_to_variant_decimal!(i128_val, scale, i128, VariantDecimal16)
})
let value = value.to_i128();
value.and_then(|v| VariantDecimal16::try_new_with_signed_scale(v, *scale).ok())
}
);

Expand Down Expand Up @@ -911,6 +894,7 @@ mod tests {
use super::*;
use crate::{VariantArray, VariantArrayBuilder};
use arrow::array::{ArrayRef, BooleanArray, Int32Array, StringArray};
use arrow::datatypes::Int32Type;
use std::sync::Arc;

/// Builds a VariantArray from an Arrow array using the row builder.
Expand Down
19 changes: 0 additions & 19 deletions parquet-variant-compute/src/type_conversion.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,22 +150,3 @@ macro_rules! primitive_conversion_single_value {
}};
}
pub(crate) use primitive_conversion_single_value;

/// Convert a decimal value to a `VariantDecimal`
macro_rules! decimal_to_variant_decimal {
Copy link
Contributor Author

@scovich scovich Oct 10, 2025

Choose a reason for hiding this comment

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

Replaced by VariantDecimalType::try_new_with_signed_scale

($v:ident, $scale:expr, $value_type:ty, $variant_type:ty) => {{
let (v, scale) = if *$scale < 0 {
// For negative scale, we need to multiply the value by 10^|scale|
// For example: 123 with scale -2 becomes 12300 with scale 0
let multiplier = <$value_type>::pow(10, (-*$scale) as u32);
(<$value_type>::checked_mul($v, multiplier), 0u8)
} else {
(Some($v), *$scale as u8)
};

// Return an Option to allow callers to decide whether to error (strict)
// or append null (non-strict) on conversion failure
v.and_then(|v| <$variant_type>::try_new(v, scale).ok())
}};
}
pub(crate) use decimal_to_variant_decimal;
Loading
Loading