Skip to content

Commit 00a0774

Browse files
committed
Fix build after AVRO-3230
This explicitly enables and disables fastreader to ensure both are tested.
1 parent b48e4f4 commit 00a0774

File tree

3 files changed

+12
-4
lines changed

3 files changed

+12
-4
lines changed

lang/java/avro/src/test/java/org/apache/avro/TestReadingWritingDataInEvolvedSchemas.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -438,7 +438,9 @@ private Record decodeGenericBlob(Schema expectedSchema, Schema schemaOfBlob, byt
438438
if (blob == null) {
439439
return null;
440440
}
441-
GenericDatumReader<Record> reader = new GenericDatumReader<>();
441+
GenericData data = new GenericData();
442+
data.setFastReaderEnabled(true);
443+
GenericDatumReader<Record> reader = new GenericDatumReader<>(null, null, data);
442444
reader.setExpected(expectedSchema);
443445
reader.setSchema(schemaOfBlob);
444446
Decoder decoder = encoderType == EncoderType.BINARY ? DecoderFactory.get().binaryDecoder(blob, null)

lang/java/avro/src/test/java/org/apache/avro/TestSchemaCompatibilityEnumDefaults.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@
2727
import static org.junit.jupiter.api.Assertions.assertThrows;
2828

2929
import java.io.ByteArrayOutputStream;
30+
import java.util.concurrent.Callable;
31+
3032
import org.apache.avro.generic.GenericData;
3133
import org.apache.avro.generic.GenericDatumReader;
3234
import org.apache.avro.generic.GenericDatumWriter;
@@ -127,8 +129,9 @@ private GenericRecord serializeWithWriterThenDeserializeWithReader(Schema writer
127129
byte[] bytes = baos.toByteArray();
128130
Decoder decoder = DecoderFactory.get().resolvingDecoder(writerSchema, readerSchema,
129131
DecoderFactory.get().binaryDecoder(bytes, null));
130-
DatumReader<Object> datumReader = new GenericDatumReader<>(readerSchema);
132+
GenericData data = new GenericData();
133+
data.setFastReaderEnabled(false);
134+
DatumReader<Object> datumReader = new GenericDatumReader<>(readerSchema, readerSchema, data);
131135
return (GenericRecord) datumReader.read(null, decoder);
132136
}
133-
134137
}

lang/java/avro/src/test/java/org/apache/avro/TestUnionError.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
import org.apache.avro.generic.GenericRecord;
2424
import org.apache.avro.io.BinaryDecoder;
2525
import org.apache.avro.io.BinaryEncoder;
26+
import org.apache.avro.io.DatumReader;
2627
import org.apache.avro.io.DecoderFactory;
2728
import org.apache.avro.io.EncoderFactory;
2829

@@ -77,7 +78,9 @@ void unionErrorMessage() throws IOException {
7778
InputStream ins = new ByteArrayInputStream(outs.toByteArray());
7879
BinaryDecoder decoder = DecoderFactory.get().binaryDecoder(ins, null);
7980

80-
GenericDatumReader<GenericRecord> datumReader = new GenericDatumReader<>(writerSchema, readerSchema);
81+
GenericData data = new GenericData();
82+
data.setFastReaderEnabled(false);
83+
GenericDatumReader<GenericRecord> datumReader = new GenericDatumReader<>(writerSchema, readerSchema, data);
8184
AvroTypeException avroException = assertThrows(AvroTypeException.class, () -> datumReader.read(null, decoder));
8285
assertEquals("Field \"c\" content mismatch: Found B, expecting union[A, float]", avroException.getMessage());
8386
}

0 commit comments

Comments
 (0)