Skip to content

ARROW-283: [C++] Account for upstream changes in parquet-cpp #131

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

Closed
wesm wants to merge 1 commit into from
Closed

ARROW-283: [C++] Account for upstream changes in parquet-cpp #131

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
22 changes: 14 additions & 8 deletions cpp/src/arrow/parquet/reader.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,28 +149,34 @@ bool FileReader::Impl::CheckForFlatColumn(const ::parquet::ColumnDescriptor* des
}

Status FileReader::Impl::GetFlatColumn(int i, std::unique_ptr<FlatColumnReader>* out) {
if (!CheckForFlatColumn(reader_->descr()->Column(i))) {
const ::parquet::SchemaDescriptor* schema = reader_->metadata()->schema_descriptor();

if (!CheckForFlatColumn(schema->Column(i))) {
return Status::Invalid("The requested column is not flat");
}
std::unique_ptr<FlatColumnReader::Impl> impl(
new FlatColumnReader::Impl(pool_, reader_->descr()->Column(i), reader_.get(), i));
new FlatColumnReader::Impl(pool_, schema->Column(i), reader_.get(), i));
*out = std::unique_ptr<FlatColumnReader>(new FlatColumnReader(std::move(impl)));
return Status::OK();
}

Status FileReader::Impl::ReadFlatColumn(int i, std::shared_ptr<Array>* out) {
std::unique_ptr<FlatColumnReader> flat_column_reader;
RETURN_NOT_OK(GetFlatColumn(i, &flat_column_reader));
return flat_column_reader->NextBatch(reader_->num_rows(), out);
return flat_column_reader->NextBatch(reader_->metadata()->num_rows(), out);
}

Status FileReader::Impl::ReadFlatTable(std::shared_ptr<Table>* table) {
const std::string& name = reader_->descr()->schema()->name();
auto descr = reader_->metadata()->schema_descriptor();

const std::string& name = descr->schema()->name();
std::shared_ptr<Schema> schema;
RETURN_NOT_OK(FromParquetSchema(reader_->descr(), &schema));
RETURN_NOT_OK(FromParquetSchema(descr, &schema));

int num_columns = reader_->metadata()->num_columns();

std::vector<std::shared_ptr<Column>> columns(reader_->num_columns());
for (int i = 0; i < reader_->num_columns(); i++) {
std::vector<std::shared_ptr<Column>> columns(num_columns);
for (int i = 0; i < num_columns; i++) {
std::shared_ptr<Array> array;
RETURN_NOT_OK(ReadFlatColumn(i, &array));
columns[i] = std::make_shared<Column>(schema->field(i), array);
Expand Down Expand Up @@ -375,7 +381,7 @@ Status FlatColumnReader::Impl::NextBatch(int batch_size, std::shared_ptr<Array>*
}

void FlatColumnReader::Impl::NextRowGroup() {
if (next_row_group_ < reader_->num_row_groups()) {
if (next_row_group_ < reader_->metadata()->num_row_groups()) {
column_reader_ = reader_->RowGroup(next_row_group_)->Column(column_index_);
next_row_group_++;
} else {
Expand Down