Skip to content
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

Jump to bottom

Add FixedLengthByteArrayReader Remove ComplexObjectArrayReader #2528

Merged
merged 6 commits into from
Aug 25, 2022
Merged

Add FixedLengthByteArrayReader Remove ComplexObjectArrayReader #2528

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f70cde3
Remove ComplexObjectArrayReader add FixedLengthByteArrayReader
tustvold Aug 22, 2022
cbe5d7e
Add Interval support
tustvold Aug 23, 2022
b371f13
Add more test
tustvold Aug 23, 2022
3d284d3
Handle all null array
tustvold Aug 23, 2022
cde2ea7
Merge remote-tracking branch 'upstream/master' into remove-complex-ob…
tustvold Aug 24, 2022
99acf96
Review feedback
tustvold Aug 25, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
80 changes: 10 additions & 70 deletions parquet/src/arrow/array_reader/builder.rs
View file
Open in desktop
Expand Up @@ -17,26 +17,20 @@

use std::sync::Arc;

use arrow::datatypes::{DataType, IntervalUnit, SchemaRef};
use arrow::datatypes::{DataType, SchemaRef};

use crate::arrow::array_reader::empty_array::make_empty_array_reader;
use crate::arrow::array_reader::fixed_len_byte_array::make_fixed_len_byte_array_reader;
use crate::arrow::array_reader::{
make_byte_array_dictionary_reader, make_byte_array_reader, ArrayReader,
ComplexObjectArrayReader, ListArrayReader, MapArrayReader, NullArrayReader,
PrimitiveArrayReader, RowGroupCollection, StructArrayReader,
};
use crate::arrow::buffer::converter::{
DecimalArrayConverter, DecimalFixedLengthByteArrayConverter,
FixedLenBinaryConverter, FixedSizeArrayConverter, IntervalDayTimeArrayConverter,
IntervalDayTimeConverter, IntervalYearMonthArrayConverter,
IntervalYearMonthConverter,
ListArrayReader, MapArrayReader, NullArrayReader, PrimitiveArrayReader,
RowGroupCollection, StructArrayReader,
};
use crate::arrow::schema::{convert_schema, ParquetField, ParquetFieldType};
use crate::arrow::ProjectionMask;
use crate::basic::Type as PhysicalType;
use crate::data_type::{
BoolType, DoubleType, FixedLenByteArrayType, FloatType, Int32Type,
Int64Type, Int96Type,
BoolType, DoubleType, FloatType, Int32Type, Int64Type, Int96Type,
};
use crate::errors::Result;
use crate::schema::types::{ColumnDescriptor, ColumnPath, Type};
Expand Down Expand Up @@ -127,14 +121,12 @@ fn build_primitive_reader(
field: &ParquetField,
row_groups: &dyn RowGroupCollection,
) -> Result<Box<dyn ArrayReader>> {
let (col_idx, primitive_type, type_len) = match &field.field_type {
let (col_idx, primitive_type) = match &field.field_type {
ParquetFieldType::Primitive {
col_idx,
primitive_type,
} => match primitive_type.as_ref() {
Type::PrimitiveType { type_length, .. } => {
(*col_idx, primitive_type.clone(), *type_length)
}
Type::PrimitiveType { .. } => (*col_idx, primitive_type.clone()),
Type::GroupType { .. } => unreachable!(),
},
_ => unreachable!(),
Expand Down Expand Up @@ -204,61 +196,9 @@ fn build_primitive_reader(
}
_ => make_byte_array_reader(page_iterator, column_desc, arrow_type),
},
PhysicalType::FIXED_LEN_BYTE_ARRAY => match field.arrow_type {
DataType::Decimal128(precision, scale) => {
let converter = DecimalFixedLengthByteArrayConverter::new(
DecimalArrayConverter::new(precision, scale),
);
Ok(Box::new(ComplexObjectArrayReader::<
FixedLenByteArrayType,
DecimalFixedLengthByteArrayConverter,
>::new(
page_iterator,
column_desc,
converter,
arrow_type,
)?))
}
DataType::Interval(IntervalUnit::DayTime) => {
let converter =
IntervalDayTimeConverter::new(IntervalDayTimeArrayConverter {});
Ok(Box::new(ComplexObjectArrayReader::<
FixedLenByteArrayType,
_,
>::new(
page_iterator,
column_desc,
converter,
arrow_type,
)?))
}
DataType::Interval(IntervalUnit::YearMonth) => {
let converter =
IntervalYearMonthConverter::new(IntervalYearMonthArrayConverter {});
Ok(Box::new(ComplexObjectArrayReader::<
FixedLenByteArrayType,
_,
>::new(
page_iterator,
column_desc,
converter,
arrow_type,
)?))
}
_ => {
let converter =
FixedLenBinaryConverter::new(FixedSizeArrayConverter::new(type_len));
Ok(Box::new(ComplexObjectArrayReader::<
FixedLenByteArrayType,
FixedLenBinaryConverter,
>::new(
page_iterator,
column_desc,
converter,
arrow_type,
)?))
}
},
PhysicalType::FIXED_LEN_BYTE_ARRAY => {
make_fixed_len_byte_array_reader(page_iterator, column_desc, arrow_type)
}
}
}

Expand Down