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

Flink 1.20: Support default values in Parquet reader #11839

Merged
merged 1 commit into from
Jan 23, 2025
Merged

Flink 1.20: Support default values in Parquet reader #11839

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
24 changes: 16 additions & 8 deletions flink/v1.20/flink/src/main/java/org/apache/iceberg/flink/data/FlinkParquetReaders.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@ public ParquetValueReader<RowData> message(
}

@Override
@SuppressWarnings("checkstyle:CyclomaticComplexity")
public ParquetValueReader<RowData> struct(
Types.StructType expected, GroupType struct, List<ParquetValueReader<?>> fieldReaders) {
// match the expected struct's order
Expand Down Expand Up @@ -120,6 +121,7 @@ public ParquetValueReader<RowData> struct(
int defaultMaxDefinitionLevel = type.getMaxDefinitionLevel(currentPath());
for (Types.NestedField field : expectedFields) {
int id = field.fieldId();
ParquetValueReader<?> reader = readersById.get(id);
if (idToConstant.containsKey(id)) {
// containsKey is used because the constant may be null
int fieldMaxDefinitionLevel =
Expand All @@ -133,15 +135,21 @@ public ParquetValueReader<RowData> struct(
} else if (id == MetadataColumns.IS_DELETED.fieldId()) {
reorderedFields.add(ParquetValueReaders.constant(false));
types.add(null);
} else if (reader != null) {
reorderedFields.add(reader);
types.add(typesById.get(id));
} else if (field.initialDefault() != null) {
reorderedFields.add(
ParquetValueReaders.constant(
RowDataUtil.convertConstant(field.type(), field.initialDefault()),
maxDefinitionLevelsById.getOrDefault(id, defaultMaxDefinitionLevel)));
types.add(typesById.get(id));
} else if (field.isOptional()) {
reorderedFields.add(ParquetValueReaders.nulls());
types.add(null);
} else {
ParquetValueReader<?> reader = readersById.get(id);
if (reader != null) {
reorderedFields.add(reader);
types.add(typesById.get(id));
} else {
reorderedFields.add(ParquetValueReaders.nulls());
types.add(null);
}
throw new IllegalArgumentException(
String.format("Missing required field: %s", field.name()));
}
}

Expand Down
30 changes: 22 additions & 8 deletions flink/v1.20/flink/src/test/java/org/apache/iceberg/flink/data/TestFlinkParquetReader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,11 @@
public class TestFlinkParquetReader extends DataTest {
private static final int NUM_RECORDS = 100;

@Override
protected boolean supportsDefaultValues() {
return true;
}

@Test
public void testBuildReader() {
MessageType fileSchema =
Expand Down Expand Up @@ -199,41 +204,50 @@ public void testTwoLevelList() throws IOException {
}
}

private void writeAndValidate(Iterable<Record> iterable, Schema schema) throws IOException {
private void writeAndValidate(
Iterable<Record> iterable, Schema writeSchema, Schema expectedSchema) throws IOException {
File testFile = File.createTempFile("junit", null, temp.toFile());
assertThat(testFile.delete()).isTrue();

try (FileAppender<Record> writer =
Parquet.write(Files.localOutput(testFile))
.schema(schema)
.schema(writeSchema)
.createWriterFunc(GenericParquetWriter::buildWriter)
.build()) {
writer.addAll(iterable);
}

try (CloseableIterable<RowData> reader =
Parquet.read(Files.localInput(testFile))
.project(schema)
.createReaderFunc(type -> FlinkParquetReaders.buildReader(schema, type))
.project(expectedSchema)
.createReaderFunc(type -> FlinkParquetReaders.buildReader(expectedSchema, type))
.build()) {
Iterator<Record> expected = iterable.iterator();
Iterator<RowData> rows = reader.iterator();
LogicalType rowType = FlinkSchemaUtil.convert(schema);
LogicalType rowType = FlinkSchemaUtil.convert(writeSchema);
for (int i = 0; i < NUM_RECORDS; i += 1) {
assertThat(rows).hasNext();
TestHelpers.assertRowData(schema.asStruct(), rowType, expected.next(), rows.next());
TestHelpers.assertRowData(writeSchema.asStruct(), rowType, expected.next(), rows.next());
}
assertThat(rows).isExhausted();
}
}

@Override
protected void writeAndValidate(Schema schema) throws IOException {
writeAndValidate(RandomGenericData.generate(schema, NUM_RECORDS, 19981), schema);
writeAndValidate(RandomGenericData.generate(schema, NUM_RECORDS, 19981), schema, schema);
writeAndValidate(
RandomGenericData.generateDictionaryEncodableRecords(schema, NUM_RECORDS, 21124), schema);
RandomGenericData.generateDictionaryEncodableRecords(schema, NUM_RECORDS, 21124),
schema,
schema);
writeAndValidate(
RandomGenericData.generateFallbackRecords(schema, NUM_RECORDS, 21124, NUM_RECORDS / 20),
schema,
schema);
}

@Override
protected void writeAndValidate(Schema writeSchema, Schema expectedSchema) throws IOException {
writeAndValidate(RandomGenericData.generate(writeSchema, 100, 0L), writeSchema, expectedSchema);
}
}