Skip to content

Use Avro 1.8-compatible Schema constructors in Storage Write API translator #34281

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
Abacn merged 3 commits into from
Mar 14, 2025
Merged

Use Avro 1.8-compatible Schema constructors in Storage Write API translator #34281

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1f80837
Use Schema builder APIs compatible with Avro 1.8 in Storage Write API…
clairemcginty Mar 13, 2025
94401f1
Suppress nullness check
clairemcginty Mar 13, 2025
135d129
Update CHANGES.md
clairemcginty Mar 13, 2025
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
1 change: 1 addition & 0 deletions CHANGES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@
* (Python) Fixed occasional pipeline stuckness that was affecting Python 3.11 users ([#33966](https://github.com/apache/beam/issues/33966)).
* (Java) Fixed TIME field encodings for BigQuery Storage API writes on GenericRecords ([#34059](https://github.com/apache/beam/pull/34059)).
* (Java) Fixed a race condition in JdbcIO which could cause hangs trying to acquire a connection ([#34058](https://github.com/apache/beam/pull/34058)).
* (Java) Fix BigQuery Storage Write compatibility with Avro 1.8 ([#34281](https://github.com/apache/beam/pull/34281)).

## Security Fixes
* Fixed (CVE-YYYY-NNNN)[https://www.cve.org/CVERecord?id=CVE-YYYY-NNNN] (Java/Python/Go) ([#X](https://github.com/apache/beam/issues/X)).
Expand Down
9 changes: 6 additions & 3 deletions ...src/main/java/org/apache/beam/sdk/io/gcp/bigquery/AvroGenericRecordToStorageApiProto.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -311,6 +311,7 @@ public static DynamicMessage messageFromGenericRecord(
return builder.build();
}

@SuppressWarnings("nullness")
private static TableFieldSchema fieldDescriptorFromAvroField(org.apache.avro.Schema.Field field) {
@Nullable Schema schema = field.schema();
Preconditions.checkNotNull(schema, "Unexpected null schema!");
Expand Down Expand Up @@ -350,10 +351,11 @@ private static TableFieldSchema fieldDescriptorFromAvroField(org.apache.avro.Sch
throw new RuntimeException("Unexpected null element type!");
}
TableFieldSchema keyFieldSchema =
fieldDescriptorFromAvroField(new Schema.Field("key", keyType, "key of the map entry"));
fieldDescriptorFromAvroField(
new Schema.Field("key", keyType, "key of the map entry", null));
Copy link
Contributor Author

@clairemcginty clairemcginty Mar 13, 2025

Choose a reason for hiding this comment

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

a null value is what Avro 1.11 defaults to, so there's no behavior change here: https://github.com/apache/avro/blob/release-1.11.4/lang/java/avro/src/main/java/org/apache/avro/Schema.java#L588-L589

TableFieldSchema valueFieldSchema =
fieldDescriptorFromAvroField(
new Schema.Field("value", valueType, "value of the map entry"));
new Schema.Field("value", valueType, "value of the map entry", null));
builder =
builder
.setType(TableFieldSchema.Type.STRUCT)
Expand All @@ -371,7 +373,8 @@ private static TableFieldSchema fieldDescriptorFromAvroField(org.apache.avro.Sch
elementType.getType() != Schema.Type.UNION,
"Multiple non-null union types are not supported.");
TableFieldSchema unionFieldSchema =
fieldDescriptorFromAvroField(new Schema.Field(field.name(), elementType, field.doc()));
fieldDescriptorFromAvroField(
new Schema.Field(field.name(), elementType, field.doc(), null));
builder =
builder
.setType(unionFieldSchema.getType())
Expand Down
Loading