Skip to content
Merged
Show file tree
Hide file tree
Changes from 8 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
2 changes: 1 addition & 1 deletion parquet-variant-compute/benches/variant_kernels.rs
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ fn benchmark_batch_json_string_to_variant(c: &mut Criterion) {

pub fn variant_get_bench(c: &mut Criterion) {
let variant_array = create_primitive_variant_array(8192);
let input: ArrayRef = Arc::new(variant_array);
let input = ArrayRef::from(variant_array);

let options = GetOptions {
path: vec![].into(),
Expand Down
2 changes: 1 addition & 1 deletion parquet-variant-compute/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ mod variant_array_builder;
pub mod variant_get;
mod variant_to_arrow;

pub use variant_array::{ShreddingState, VariantArray};
pub use variant_array::{ShreddingState, VariantArray, VariantType};
pub use variant_array_builder::{VariantArrayBuilder, VariantValueArrayBuilder};

pub use cast_to_variant::{cast_to_variant, cast_to_variant_with_options};
Expand Down
23 changes: 8 additions & 15 deletions parquet-variant-compute/src/shred_variant.rs
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ use crate::variant_to_arrow::{
make_primitive_variant_to_arrow_row_builder, PrimitiveVariantToArrowRowBuilder,
};
use crate::{VariantArray, VariantValueArrayBuilder};
use arrow::array::{Array as _, ArrayRef, BinaryViewArray, NullBufferBuilder};
use arrow::array::{ArrayRef, BinaryViewArray, NullBufferBuilder};
use arrow::buffer::NullBuffer;
use arrow::compute::CastOptions;
use arrow::datatypes::{DataType, Fields};
Expand Down Expand Up @@ -310,7 +310,7 @@ impl<'a> VariantToShreddedObjectVariantRowBuilder<'a> {
let (value, typed_value, nulls) = typed_value_builder.finish()?;
let array =
ShreddedVariantFieldArray::from_parts(Some(value), Some(typed_value), nulls);
builder = builder.with_field(field_name, Arc::new(array), false);
builder = builder.with_field(field_name, ArrayRef::from(array), false);
}
if let Some(nulls) = self.typed_value_nulls.finish() {
builder = builder.with_nulls(nulls);
Expand All @@ -327,7 +327,7 @@ impl<'a> VariantToShreddedObjectVariantRowBuilder<'a> {
mod tests {
use super::*;
use crate::VariantArrayBuilder;
use arrow::array::{Float64Array, Int64Array};
use arrow::array::{Array, Float64Array, Int64Array};
use arrow::datatypes::{DataType, Field, Fields};
use parquet_variant::{Variant, VariantBuilder, VariantBuilderExt as _};
use std::sync::Arc;
Expand Down Expand Up @@ -556,18 +556,11 @@ mod tests {
.unwrap();

// Extract score and age fields from typed_value struct
let score_field = typed_value
.column_by_name("score")
.unwrap()
.as_any()
.downcast_ref::<crate::variant_array::ShreddedVariantFieldArray>()
.unwrap();
let age_field = typed_value
.column_by_name("age")
.unwrap()
.as_any()
.downcast_ref::<crate::variant_array::ShreddedVariantFieldArray>()
.unwrap();
let score_field =
ShreddedVariantFieldArray::try_new(typed_value.column_by_name("score").unwrap())
.unwrap();
let age_field =
ShreddedVariantFieldArray::try_new(typed_value.column_by_name("age").unwrap()).unwrap();

let score_value = score_field
.value_field()
Expand Down
Loading
Loading