Skip to content

[fix](parquet) return error if schema changed in complex types #31128

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

Merged
yiguolei merged 1 commit into from
Feb 19, 2024
Merged

[fix](parquet) return error if schema changed in complex types #31128

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
15 changes: 12 additions & 3 deletions be/src/vec/exec/format/parquet/vparquet_column_reader.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -418,7 +418,7 @@ Status ScalarColumnReader::_read_nested_column(ColumnPtr& doris_column, DataType
}
RETURN_IF_ERROR(_chunk_reader->decode_values(data_column, type, select_vector, is_dict_filter));
if (ancestor_nulls != 0) {
static_cast<void>(_chunk_reader->skip_values(ancestor_nulls, false));
RETURN_IF_ERROR(_chunk_reader->skip_values(ancestor_nulls, false));
}

if (!align_rows) {
Expand Down Expand Up @@ -608,6 +608,9 @@ Status ArrayColumnReader::read_column_data(ColumnPtr& doris_column, DataTypePtr&
}
data_column = doris_column->assume_mutable();
}
if (remove_nullable(type)->get_type_id() != TypeIndex::Array) {
return Status::Corruption("Wrong data type for column '{}'", _field_schema->name);
}

ColumnPtr& element_column = static_cast<ColumnArray&>(*data_column).get_data_ptr();
DataTypePtr& element_type = const_cast<DataTypePtr&>(
Expand Down Expand Up @@ -654,6 +657,9 @@ Status MapColumnReader::read_column_data(ColumnPtr& doris_column, DataTypePtr& t
}
data_column = doris_column->assume_mutable();
}
if (remove_nullable(type)->get_type_id() != TypeIndex::Map) {
return Status::Corruption("Wrong data type for column '{}'", _field_schema->name);
}

auto& map = static_cast<ColumnMap&>(*data_column);
DataTypePtr& key_type = const_cast<DataTypePtr&>(
Expand Down Expand Up @@ -717,6 +723,9 @@ Status StructColumnReader::read_column_data(ColumnPtr& doris_column, DataTypePtr
}
data_column = doris_column->assume_mutable();
}
if (remove_nullable(type)->get_type_id() != TypeIndex::Struct) {
return Status::Corruption("Wrong data type for column '{}'", _field_schema->name);
}

auto& doris_struct = static_cast<ColumnStruct&>(*data_column);
if (_child_readers.size() != doris_struct.tuple_size()) {
Expand All @@ -731,7 +740,7 @@ Status StructColumnReader::read_column_data(ColumnPtr& doris_column, DataTypePtr
size_t field_rows = 0;
bool field_eof = false;
if (i == 0) {
static_cast<void>(_child_readers[i]->read_column_data(
RETURN_IF_ERROR(_child_readers[i]->read_column_data(
doris_field, doris_type, select_vector, batch_size, &field_rows, &field_eof,
is_dict_filter));
*read_rows = field_rows;
Expand All @@ -740,7 +749,7 @@ Status StructColumnReader::read_column_data(ColumnPtr& doris_column, DataTypePtr
while (field_rows < *read_rows && !field_eof) {
size_t loop_rows = 0;
select_vector.reset();
static_cast<void>(_child_readers[i]->read_column_data(
RETURN_IF_ERROR(_child_readers[i]->read_column_data(
doris_field, doris_type, select_vector, *read_rows - field_rows, &loop_rows,
&field_eof, is_dict_filter));
field_rows += loop_rows;
Expand Down