Skip to content

Retain the type of field while copying the default values. #109

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 2 commits into from
May 24, 2022
Merged

Retain the type of field while copying the default values. #109

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
14c2a77
Retain the type of field while copying the default values.
maluchari May 18, 2022
bea9504
Addressed review comments
maluchari May 23, 2022
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
7 changes: 2 additions & 5 deletions core/src/main/java/org/apache/iceberg/avro/BuildAvroProjection.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,13 +92,10 @@ public Schema record(Schema record, List<String> names, Iterable<Schema.Field> s

if (avroField != null) {
// if the expectedField has a defaultValue, but the avroField does not, we need to
// create a newField to copy over the non-null default value
// create a newField to copy over the non-null default value.
if (expectedField.hasDefaultValue() && !AvroSchemaUtil.hasNonNullDefaultValue(avroField)) {
Schema newFiledSchema = (expectedField.isOptional()) ?
AvroSchemaUtil.toOption(AvroSchemaUtil.convert(expectedField.type()), true) :
AvroSchemaUtil.convert(expectedField.type());
Schema.Field newField =
new Schema.Field(avroField.name(), newFiledSchema, avroField.doc(), expectedField.getDefaultValue());
new Schema.Field(avroField.name(), avroField.schema(), avroField.doc(), expectedField.getDefaultValue());
Copy link
Member

@rzhang10 rzhang10 May 20, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If the avroField is nullable avro schema, and the default value here is not null, the constructed avro schema will be invalid, please still retain the logic of making AvroSchemaUtil.toOption with putting null the second element in the avro union.

newField.addProp(AvroSchemaUtil.FIELD_ID_PROP, expectedField.fieldId());
updatedFields.add(newField);
hasChange = true;
Expand Down