Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions parquet-variant-compute/src/variant_array.rs
Original file line number Diff line number Diff line change
Expand Up @@ -590,6 +590,11 @@ impl StructArrayBuilder {
/// returns the non-null element at index as a Variant
fn typed_value_to_variant(typed_value: &ArrayRef, index: usize) -> Variant<'_, '_> {
match typed_value.data_type() {
DataType::Boolean => {
let boolean_array = typed_value.as_boolean();
let value = boolean_array.value(index);
Variant::from(value)
}
DataType::Int8 => {
primitive_conversion_single_value!(Int8Type, typed_value, index)
}
Expand Down
63 changes: 63 additions & 0 deletions parquet-variant-compute/src/variant_get.rs
Original file line number Diff line number Diff line change
Expand Up @@ -472,6 +472,23 @@ mod test {
numeric_partially_shredded_test!(f64, partially_shredded_float64_variant_array);
}

#[test]
fn get_variant_partially_shredded_bool_as_variant() {
let array = partially_shredded_bool_variant_array();
let options = GetOptions::new();
let result = variant_get(&array, options).unwrap();

// expect the result is a VariantArray
let result: &VariantArray = result.as_any().downcast_ref().unwrap();
assert_eq!(result.len(), 4);

// Expect the values are the same as the original values
assert_eq!(result.value(0), Variant::from(true));
assert!(!result.is_valid(1));
assert_eq!(result.value(2), Variant::from("n/a"));
assert_eq!(result.value(3), Variant::from(false));
}

/// Shredding: extract a value as an Int32Array
#[test]
fn get_variant_shredded_int32_as_int32_safe_cast() {
Expand Down Expand Up @@ -874,6 +891,52 @@ mod test {
f64
);

/// Return a VariantArray that represents a partially "shredded" variant for bool
fn partially_shredded_bool_variant_array() -> ArrayRef {
let (metadata, string_value) = {
let mut builder = parquet_variant::VariantBuilder::new();
builder.append_value("n/a");
builder.finish()
};

let nulls = NullBuffer::from(vec![
true, // row 0 non null
false, // row 1 is null
true, // row 2 non null
true, // row 3 non null
]);

// metadata is the same for all rows
let metadata = BinaryViewArray::from_iter_values(std::iter::repeat_n(&metadata, 4));

// See https://docs.google.com/document/d/1pw0AWoMQY3SjD7R4LgbPvMjG_xSCtXp3rZHkVp9jpZ4/edit?disco=AAABml8WQrY
// about why row1 is an empty but non null, value.
let values = BinaryViewArray::from(vec![
None, // row 0 is shredded, so no value
Some(b"" as &[u8]), // row 1 is null, so empty value (why?)
Some(&string_value), // copy the string value "N/A"
None, // row 3 is shredded, so no value
]);

let typed_value = arrow::array::BooleanArray::from(vec![
Some(true), // row 0 is shredded, so it has a value
None, // row 1 is null, so no value
None, // row 2 is a string, so no typed value
Some(false), // row 3 is shredded, so it has a value
]);

let struct_array = StructArrayBuilder::new()
.with_field("metadata", Arc::new(metadata))
Copy link
Contributor

Choose a reason for hiding this comment

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

It's worth noting that Once this PR is merged, it should be rewritten.

Copy link
Contributor

Choose a reason for hiding this comment

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

Thank you -- I will resolve the conflict

.with_field("typed_value", Arc::new(typed_value))
.with_field("value", Arc::new(values))
.with_nulls(nulls)
.build();

Arc::new(
VariantArray::try_new(Arc::new(struct_array)).expect("should create variant array"),
)
}

/// Builds struct arrays from component fields
///
/// TODO: move to arrow crate
Expand Down
Loading