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

Jump to bottom

Return new ReflectData for both reflect datum reader and writer #28280

Merged
merged 2 commits into from
Sep 1, 2023
Merged

Return new ReflectData for both reflect datum reader and writer #28280

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a310298
Return new ReflectData for both reflect datum reader and writer
RustedBones Sep 1, 2023
73e6027
Add nullness supress warning
RustedBones Sep 1, 2023
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
25 changes: 10 additions & 15 deletions ...xtensions/avro/src/main/java/org/apache/beam/sdk/extensions/avro/io/AvroDatumFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
import org.apache.avro.generic.GenericRecord;
import org.apache.avro.io.DatumReader;
import org.apache.avro.io.DatumWriter;
import org.apache.avro.reflect.ReflectData;
import org.apache.avro.reflect.ReflectDatumReader;
import org.apache.avro.reflect.ReflectDatumWriter;
import org.apache.avro.specific.SpecificDatumReader;
Expand All @@ -33,6 +34,9 @@
import org.checkerframework.checker.nullness.qual.Nullable;

/** Create {@link DatumReader} and {@link DatumWriter} for given schemas. */
@SuppressWarnings({
"nullness" // TODO(https://github.com/apache/beam/issues/20497)
})
public abstract class AvroDatumFactory<T>
implements AvroSource.DatumReaderFactory<T>, AvroSink.DatumWriterFactory<T> {

Expand Down Expand Up @@ -168,25 +172,16 @@ public ReflectDatumFactory(Class<T> type) {

@Override
public DatumReader<T> apply(Schema writer, Schema reader) {
// create the datum writer using the Class<T> api.
// avro will load the proper class loader
ReflectDatumReader<T> datumReader = new ReflectDatumReader<>(type);
datumReader.setExpected(reader);
datumReader.setSchema(writer);
// for backward compat, add logical type support by default
AvroUtils.addLogicalTypeConversions(datumReader.getData());
return datumReader;
ReflectData data = new ReflectData(type.getClassLoader());
AvroUtils.addLogicalTypeConversions(data);
return new ReflectDatumReader<>(writer, reader, data);
}

@Override
public DatumWriter<T> apply(Schema writer) {
// create the datum writer using the Class<T> api.
// avro will load the proper class loader
ReflectDatumWriter<T> datumWriter = new ReflectDatumWriter<>(type);
datumWriter.setSchema(writer);
// for backward compat, add logical type support by default
AvroUtils.addLogicalTypeConversions(datumWriter.getData());
return datumWriter;
ReflectData data = new ReflectData(type.getClassLoader());
AvroUtils.addLogicalTypeConversions(data);
return new ReflectDatumWriter<>(writer, data);
}

public static <T> ReflectDatumFactory<T> of(Class<T> type) {
Expand Down
Loading