Skip to content

GH-3215: Make the order of encodings in column metadata deterministic #3216

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

GH-3215: Make the order of encodings in column metadata deterministic #3216

Show file tree
Hide file tree
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
4 changes: 3 additions & 1 deletion ...et-hadoop/src/main/java/org/apache/parquet/format/converter/ParquetMetadataConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -665,11 +665,13 @@ private void addRowGroup(
rowGroups.add(rowGroup);
}

private List<Encoding> toFormatEncodings(Set<org.apache.parquet.column.Encoding> encodings) {
// Visible for testing
List<Encoding> toFormatEncodings(Set<org.apache.parquet.column.Encoding> encodings) {
List<Encoding> converted = new ArrayList<Encoding>(encodings.size());
for (org.apache.parquet.column.Encoding encoding : encodings) {
converted.add(getEncoding(encoding));
}
Collections.sort(converted);
return converted;
}

Expand Down
14 changes: 14 additions & 0 deletions ...adoop/src/test/java/org/apache/parquet/format/converter/TestParquetMetadataConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -756,6 +756,20 @@ public void testEncodingsCache() {
assertEquals("java.util.Collections$UnmodifiableSet", res3.getClass().getName());
}

@Test
public void testEncodingsOrder() {
ParquetMetadataConverter parquetMetadataConverter = new ParquetMetadataConverter();

Set<org.apache.parquet.column.Encoding> columnEncodings =
new HashSet<>(Arrays.asList(org.apache.parquet.column.Encoding.values()));

// Assert that the encodings are returned in ascending ordinal order
List<org.apache.parquet.format.Encoding> formatEncodings = parquetMetadataConverter.toFormatEncodings(columnEncodings);
for (int i=1; i<formatEncodings.size(); i++) {
assertTrue(formatEncodings.get(i - 1).ordinal() < formatEncodings.get(i).ordinal());
}
}

@Test
public void testBinaryStatsV1() {
testBinaryStats(StatsHelper.V1);
Expand Down