[Variant] Fix the variant shred logic#10157
Conversation
32a3f09 to
aca457f
Compare
Previously, variant_shred and variant_get reuse the same code path, causing type mismatches (e.g., bool was incorrectly shredded as int). This commit separates the shred path and ensures each type is converted correctly.
aca457f to
003214c
Compare
| impl_primitive_from_variant!(datatypes::Float32Type, as_f32); | ||
| impl_primitive_from_variant!(datatypes::Float64Type, as_f64); | ||
| impl_primitive_from_variant!(datatypes::Date32Type, as_naive_date, |v| { | ||
| enum NumericKind { |
There was a problem hiding this comment.
These code are mainly moved from Variant.rs, the change here was adding the parameter shred for from_variant and variant_to_unscaled_decimal.
sdf-jkl
left a comment
There was a problem hiding this comment.
Hey @klion26 I took a look.
Overall I like the approach but I think we can improve it.
To follow more closely the existing split between arrow-array and arrow-cast we can only keep identity accessors for just the specific type without widening/narrowing. (i.e. Variant::as_i32 only if the Variant is i32) (it'd also address the lossy cast comment below)
And as for switching between shred_variant and variant_get cast semantics, we could pass them through variant_cast_with_options and add an argument for cast semantics we use { shred, get }
| /// [specification]: https://github.com/apache/parquet-format/blob/master/VariantEncoding.md | ||
| /// [Variant Shredding specification]: https://github.com/apache/parquet-format/blob/master/VariantShredding.md | ||
| /// | ||
| /// # Casting Semantics |
There was a problem hiding this comment.
I originally thought it's a wrong idea to decouple cast from parquet-variant crate, but now I think it's very similar to how arrow-array and arrow-cast are decoupled.
| cast_options, | ||
| capacity, | ||
| NullValue::ArrayElement, | ||
| false, |
There was a problem hiding this comment.
| false, | |
| true, |
if we keep false here it preserves the old too lenient cast semantics.
The branch explicitly checks if shredded is true.
Can check with (doesn't pass):
// `VariantToListArrowRowBuilder::try_new` hardcodes `shred = false` for its element
// builder (see variant_to_arrow.rs). The struct-field path threads `shred` correctly, so this
// asymmetry is invisible without a nested-list test.
#[test]
fn test_array_shredding_does_not_cast_bool_element_to_int() {
let input = build_variant_array(vec![VariantRow::List(vec![
VariantValue::from(1i64),
VariantValue::from(true),
VariantValue::from(2i64),
])]);
let list_schema = DataType::List(Arc::new(Field::new("item", DataType::Int64, true)));
let result = shred_variant(&input, &list_schema).unwrap();
assert_eq!(result.len(), 1);
assert_list_structure_and_elements::<Int64Type, i32>(
&result,
1,
&[0, 3],
&[Some(3)],
&[None],
(
// element 1 (the bool) must NOT be shredded into typed_value ...
&[Some(1), None, Some(2)],
// ... it must be preserved verbatim in the residual `value` instead.
&[None, Some(Variant::BooleanTrue), None],
),
);
}There was a problem hiding this comment.
As, thanks for pointing this out, this was my bad, I used false as a placeholder, but did not change me all.
| cast_options, | ||
| capacity, | ||
| NullValue::ArrayElement, | ||
| false, |
There was a problem hiding this comment.
| false, | |
| true, |
same as above
| self.as_num() | ||
| match *self { | ||
| Variant::Float(i) => Some(i), | ||
| Variant::Double(i) => Some(i as f32), |
There was a problem hiding this comment.
Should shred do lossy narrowing f64 to f32?
klion26
left a comment
There was a problem hiding this comment.
@sdf-jkl Thanks for the review, I've addressed the comments, please take another look when you're free.
For the identity get for Variant::as_xx, I have thought that, but keep it as now, because the underlying physical data is the same(don't do lossless conversion), but I'm open for this question.
For the switching between shred_variant and variant_get, I left the switch logic to the definition of the builder -- here we know how to do the conversion better, variant_cast_with_options seems like a wrapper of them, so I keep as it for now.
5032777 to
55c4a7d
Compare
|
After another look of the code, I perfer the identity function for After changing to the identity function for |
|
If we go identity functions for We don't shred to unsigned types and the only path to use it would be cast in |
a2c254c to
03060f9
Compare
03060f9 to
d370f9b
Compare
|
I've update the code,
but don't remove the |
| } | ||
| } | ||
| ); | ||
| impl_primitive_from_variant!( |
There was a problem hiding this comment.
Align the cast logic with arrow-cast for Time related variant will in a followup pr
Which issue does this PR close?
What changes are included in this PR?
variant_shredandvariant_getby introduceshredflag for row builderVariant::as_xxxtotype_conversion, and these moved code will be used whenvariant_get,variant_shredwill useVariant::as_xxxVariant::as_xx()is identity function now,Variant::Int8can only be treated asint8, but notint16/int32/int64, etc.Variant::as_f16test_variant_type_shredded_correctlyAre these changes tested?
Yes, added some tests to cover the logic
Are there any user-facing changes?
Yes, some
Variant::as_xxlogic have been changed.