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

Fix ParquetFooter parsing of legacy array-of-struct format #1475

Merged
merged 1 commit into from
Oct 4, 2023
Merged

Fix ParquetFooter parsing of legacy array-of-struct format #1475

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
23 changes: 16 additions & 7 deletions src/main/cpp/src/NativeParquetJni.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2022, NVIDIA CORPORATION.
* Copyright (c) 2022-2023, NVIDIA CORPORATION.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -290,7 +290,6 @@ class column_pruner {
// with _tuple appended then the repeated type is the element type and elements are required.
// 4. Otherwise, the repeated field's type is the element type with the repeated field's
// repetition.

if (!is_group) {
if (!list_schema_item.__isset.repetition_type ||
list_schema_item.repetition_type != parquet::format::FieldRepetitionType::REPEATED) {
Expand All @@ -303,11 +302,21 @@ class column_pruner {
schema_map,
schema_num_children);
}
if (!list_schema_item.__isset.converted_type ||
list_schema_item.converted_type != parquet::format::ConvertedType::LIST) {
throw std::runtime_error("expected a list type, but it was not found.");
auto num_list_children = get_num_children(list_schema_item);
if (num_list_children > 1) {
if (!list_schema_item.__isset.repetition_type ||
list_schema_item.repetition_type != parquet::format::FieldRepetitionType::REPEATED) {
throw std::runtime_error("expected list item to be repeating");
}
return found.filter_schema(schema,
ignore_case,
current_input_schema_index,
next_input_chunk_index,
chunk_map,
schema_map,
schema_num_children);
}
if (get_num_children(list_schema_item) != 1) {
if (num_list_children != 1) {
throw std::runtime_error("the structure of the outer list group is not standard");
}

Expand Down Expand Up @@ -436,7 +445,7 @@ class column_pruner {
* Each column_pruner is responsible to parse out from schema what it holds and skip anything
* that does not match. chunk_map, schema_map, and schema_num_children are the final outputs.
* current_input_schema_index and next_input_chunk_index are also outputs but are state that is
* passed to each child and returned when it comsumes comething.
* passed to each child and returned when it consumes something.
*/
void filter_schema(std::vector<parquet::format::SchemaElement> const& schema,
bool const ignore_case,
Expand Down