Skip to content

Handle single type union for deep nested schema #107

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
rzhang10 merged 1 commit into from
May 13, 2022
Merged

Handle single type union for deep nested schema #107

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
2 changes: 1 addition & 1 deletion core/src/main/java/org/apache/iceberg/avro/AvroSchemaVisitor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ public static <T> T visit(Schema schema, AvroSchemaVisitor<T> visitor) {
case UNION:
List<Schema> types = schema.getTypes();
List<T> options = Lists.newArrayListWithExpectedSize(types.size());
if (AvroSchemaUtil.isOptionSchema(schema)) {
if (AvroSchemaUtil.isOptionSchema(schema) || AvroSchemaUtil.isSingleTypeUnion(schema)) {
for (Schema type : types) {
options.add(visit(type, visitor));
}
Expand Down
53 changes: 52 additions & 1 deletion spark/src/test/java/org/apache/iceberg/spark/data/TestSparkAvroUnions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ public void writeAndValidateSingleTypeUnion() throws IOException {
}

@Test
public void writeAndValidateNestedSingleTypeUnion() throws IOException {
public void writeAndValidateNestedSingleTypeUnion1() throws IOException {
org.apache.avro.Schema avroSchema = SchemaBuilder.record("root")
.fields()
.name("col1")
Expand Down Expand Up @@ -217,6 +217,57 @@ public void writeAndValidateNestedSingleTypeUnion() throws IOException {
}
}

@Test
public void writeAndValidateNestedSingleTypeUnion2() throws IOException {
org.apache.avro.Schema avroSchema = SchemaBuilder.record("root")
.fields()
.name("outerUnion")
.type()
.unionOf()
.record("r")
.fields()
.name("innerUnion")
.type()
.unionOf()
.stringType()
.endUnion()
.noDefault()
.endRecord()
.endUnion()
.noDefault()
.endRecord();

GenericData.Record unionRecord1 = new GenericData.Record(avroSchema);
GenericData.Record innerRecord1 = new GenericData.Record(avroSchema.getFields().get(0).schema().getTypes().get(0));
innerRecord1.put("innerUnion", "foo");
unionRecord1.put("outerUnion", innerRecord1);

GenericData.Record unionRecord2 = new GenericData.Record(avroSchema);
GenericData.Record innerRecord2 = new GenericData.Record(avroSchema.getFields().get(0).schema().getTypes().get(0));
innerRecord2.put("innerUnion", "bar");
unionRecord2.put("outerUnion", innerRecord2);

File testFile = temp.newFile();
try (DataFileWriter<GenericData.Record> writer = new DataFileWriter<>(new GenericDatumWriter<>())) {
writer.create(avroSchema, testFile);
writer.append(unionRecord1);
writer.append(unionRecord2);
}

Schema expectedSchema = AvroSchemaUtil.toIceberg(avroSchema);

List<InternalRow> rows;
try (AvroIterable<InternalRow> reader = Avro.read(Files.localInput(testFile))
.createReaderFunc(SparkAvroReader::new)
.project(expectedSchema)
.build()) {
rows = Lists.newArrayList(reader);

Assert.assertEquals("foo", rows.get(0).getStruct(0, 1).getUTF8String(0).toString());
Assert.assertEquals("bar", rows.get(1).getStruct(0, 1).getUTF8String(0).toString());
}
}

@Test
public void writeAndValidateSingleTypeUnionOfComplexType() throws IOException {
org.apache.avro.Schema avroSchema = SchemaBuilder.record("root")
Expand Down