Skip to content

feat(parquet-variant): add Dictionary and REE variant_to_arrow support #10014

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

Open
mneetika wants to merge 1 commit into
base: main
Choose a base branch
from
Open

feat(parquet-variant): add Dictionary and REE variant_to_arrow support #10014

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
80 changes: 79 additions & 1 deletion parquet-variant-compute/src/variant_get.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -368,7 +368,7 @@ mod test {
Time64NanosecondArray,
};
use arrow::buffer::{NullBuffer, OffsetBuffer, ScalarBuffer};
use arrow::compute::CastOptions;
use arrow::compute::{CastOptions, cast};
use arrow::datatypes::DataType::{Int16, Int32, Int64};
use arrow::datatypes::i256;
use arrow::util::display::FormatOptions;
Expand Down Expand Up @@ -3911,6 +3911,84 @@ mod test {
}
}

#[test]
fn get_variant_as_dictionary() {
let variant_array: ArrayRef = ArrayRef::from(VariantArray::from_iter(vec![
Some(Variant::from("apple")),
Some(Variant::from("banana")),
None,
Some(Variant::from("apple")),
]));
let data_type = DataType::Dictionary(Box::new(DataType::Int32), Box::new(DataType::Utf8));
let options = GetOptions::new().with_as_type(Some(FieldRef::from(Field::new(
"dict",
data_type.clone(),
true,
))));

let result = variant_get(&variant_array, options).unwrap();
assert_eq!(result.data_type(), &data_type);

let decoded = cast(result.as_ref(), &DataType::Utf8).unwrap();
let expected = StringArray::from(vec![Some("apple"), Some("banana"), None, Some("apple")]);
assert_eq!(decoded.as_ref(), &expected);
}

#[test]
fn get_variant_as_numeric_dictionary() {
let variant_array: ArrayRef = ArrayRef::from(VariantArray::from_iter(vec![
Some(Variant::from(42)),
Some(Variant::from(7)),
None,
Some(Variant::from(42)),
]));
let data_type = DataType::Dictionary(Box::new(DataType::Int16), Box::new(DataType::Int32));
let options = GetOptions::new().with_as_type(Some(FieldRef::from(Field::new(
"dict",
data_type.clone(),
true,
))));

let result = variant_get(&variant_array, options).unwrap();
assert_eq!(result.data_type(), &data_type);

let decoded = cast(result.as_ref(), &DataType::Int32).unwrap();
let expected = Int32Array::from(vec![Some(42), Some(7), None, Some(42)]);
assert_eq!(decoded.as_ref(), &expected);
}

#[test]
fn get_variant_as_run_end_encoded() {
let variant_array: ArrayRef = ArrayRef::from(VariantArray::from_iter(vec![
Some(Variant::from("apple")),
Some(Variant::from("apple")),
None,
Some(Variant::from("banana")),
Some(Variant::from("banana")),
]));
let run_ends = Arc::new(Field::new("run_ends", DataType::Int32, false));
let values = Arc::new(Field::new("values", DataType::Utf8, true));
let data_type = DataType::RunEndEncoded(run_ends, values);
let options = GetOptions::new().with_as_type(Some(FieldRef::from(Field::new(
"ree",
data_type.clone(),
true,
))));

let result = variant_get(&variant_array, options).unwrap();
assert_eq!(result.data_type(), &data_type);

let decoded = cast(result.as_ref(), &DataType::Utf8).unwrap();
let expected = StringArray::from(vec![
Some("apple"),
Some("apple"),
None,
Some("banana"),
Some("banana"),
]);
assert_eq!(decoded.as_ref(), &expected);
}

fn invalid_time_variant_array() -> ArrayRef {
let mut builder = VariantArrayBuilder::new(3);
// 86401000000 is invalid for Time64Microsecond (max is 86400000000)
Expand Down
63 changes: 62 additions & 1 deletion parquet-variant-compute/src/variant_to_arrow.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ use arrow::array::{
StructArray,
};
use arrow::buffer::{OffsetBuffer, ScalarBuffer};
use arrow::compute::{CastOptions, DecimalCast};
use arrow::compute::{CastOptions, DecimalCast, cast_with_options};
use arrow::datatypes::{self, DataType, DecimalType};
use arrow::error::{ArrowError, Result};
use arrow_schema::{FieldRef, Fields, TimeUnit};
Expand All @@ -48,6 +48,7 @@ pub(crate) enum VariantToArrowRowBuilder<'a> {
Primitive(PrimitiveVariantToArrowRowBuilder<'a>),
Array(ArrayVariantToArrowRowBuilder<'a>),
Struct(StructVariantToArrowRowBuilder<'a>),
Encoded(EncodedVariantToArrowRowBuilder<'a>),
BinaryVariant(VariantToBinaryVariantArrowRowBuilder),

// Path extraction wrapper - contains a boxed enum for any of the above
Expand All @@ -61,6 +62,7 @@ impl<'a> VariantToArrowRowBuilder<'a> {
Primitive(b) => b.append_null(),
Array(b) => b.append_null(),
Struct(b) => b.append_null(),
Encoded(b) => b.append_null(),
BinaryVariant(b) => b.append_null(),
WithPath(path_builder) => path_builder.append_null(),
}
Expand All @@ -72,6 +74,7 @@ impl<'a> VariantToArrowRowBuilder<'a> {
Primitive(b) => b.append_value(&value),
Array(b) => b.append_value(&value),
Struct(b) => b.append_value(&value),
Encoded(b) => b.append_value(value),
BinaryVariant(b) => b.append_value(value),
WithPath(path_builder) => path_builder.append_value(value),
}
Expand All @@ -83,6 +86,7 @@ impl<'a> VariantToArrowRowBuilder<'a> {
Primitive(b) => b.finish(),
Array(b) => b.finish(),
Struct(b) => b.finish(),
Encoded(b) => b.finish(),
BinaryVariant(b) => b.finish(),
WithPath(path_builder) => path_builder.finish(),
}
Expand Down Expand Up @@ -110,6 +114,24 @@ fn make_typed_variant_to_arrow_row_builder<'a>(
ArrayVariantToArrowRowBuilder::try_new(data_type, cast_options, capacity, false)?;
Ok(Array(builder))
}
DataType::Dictionary(_, value_type) => {
let builder = EncodedVariantToArrowRowBuilder::try_new(
data_type,
value_type.as_ref(),
cast_options,
capacity,
)?;
Ok(Encoded(builder))
}
DataType::RunEndEncoded(_, value_field) => {
let builder = EncodedVariantToArrowRowBuilder::try_new(
data_type,
value_field.data_type(),
cast_options,
capacity,
)?;
Ok(Encoded(builder))
}
data_type => {
let builder =
make_primitive_variant_to_arrow_row_builder(data_type, cast_options, capacity)?;
Expand Down Expand Up @@ -331,6 +353,45 @@ impl<'a> PrimitiveVariantToArrowRowBuilder<'a> {
}
}

pub(crate) struct EncodedVariantToArrowRowBuilder<'a> {
data_type: &'a DataType,
cast_options: &'a CastOptions<'a>,
values_builder: Box<VariantToArrowRowBuilder<'a>>,
}

impl<'a> EncodedVariantToArrowRowBuilder<'a> {
fn try_new(
data_type: &'a DataType,
value_type: &'a DataType,
cast_options: &'a CastOptions,
capacity: usize,
) -> Result<Self> {
let values_builder = Box::new(make_typed_variant_to_arrow_row_builder(
value_type,
cast_options,
capacity,
)?);
Ok(Self {
data_type,
cast_options,
values_builder,
})
}

fn append_null(&mut self) -> Result<()> {
self.values_builder.append_null()
}

fn append_value(&mut self, value: Variant<'_, '_>) -> Result<bool> {
self.values_builder.append_value(value)
}

fn finish(self) -> Result<ArrayRef> {
let values = self.values_builder.finish()?;
cast_with_options(values.as_ref(), self.data_type, self.cast_options)
}
}

/// Creates a row builder that converts primitive `Variant` values into the requested Arrow data type.
pub(crate) fn make_primitive_variant_to_arrow_row_builder<'a>(
data_type: &'a DataType,
Expand Down