Skip to content

GH-38071: [C++][CI] Fix Overlap column chunk ranges for pre-buffer #38073

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
kou merged 5 commits into from
Oct 8, 2023
Merged

GH-38071: [C++][CI] Fix Overlap column chunk ranges for pre-buffer #38073

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
08cd4ce
Fix Overlap column chunk ranges for pre-buffer
mapleFU Oct 6, 2023
acf6eb0
Merge branch 'main' into parquet-dcheck-fix-on-lazy
mapleFU Oct 6, 2023
9bc42b6
tiny fixing
mapleFU Oct 6, 2023
f36532d
resolve comment to use Result in CoalesceReadRanges
mapleFU Oct 6, 2023
6992af1
Merge branch 'main' into parquet-dcheck-fix-on-lazy
mapleFU Oct 8, 2023
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
20 changes: 18 additions & 2 deletions cpp/src/parquet/file_reader.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,8 +139,10 @@ const RowGroupMetaData* RowGroupReader::metadata() const { return contents_->met
::arrow::io::ReadRange ComputeColumnChunkRange(FileMetaData* file_metadata,
int64_t source_size, int row_group_index,
int column_index) {
auto row_group_metadata = file_metadata->RowGroup(row_group_index);
auto column_metadata = row_group_metadata->ColumnChunk(column_index);
std::unique_ptr<RowGroupMetaData> row_group_metadata =
file_metadata->RowGroup(row_group_index);
std::unique_ptr<ColumnChunkMetaData> column_metadata =
row_group_metadata->ColumnChunk(column_index);

int64_t col_start = column_metadata->data_page_offset();
if (column_metadata->has_dictionary_page() &&
Expand Down Expand Up @@ -365,6 +367,20 @@ class SerializedFile : public ParquetFileReader::Contents {
ComputeColumnChunkRange(file_metadata_.get(), source_size_, row, col));
}
}
#ifndef NDEBUG
if (!ranges.empty()) {
auto copied_ranges = ranges;
std::sort(copied_ranges.begin(), copied_ranges.end(),
[](const ::arrow::io::ReadRange& a, const ::arrow::io::ReadRange& b) {
return a.offset < b.offset;
});
for (size_t i = 1; i < copied_ranges.size(); ++i) {
if (ranges[i].offset < ranges[i - 1].offset + ranges[i - 1].length) {
throw ParquetException("Overlapping column chunk ranges for prebuffer");
}
}
}
#endif
PARQUET_THROW_NOT_OK(cached_source_->Cache(ranges));
}

Expand Down