This is an automated email from the ASF dual-hosted git repository.
RyanSkraba pushed a commit to branch branch-1.12
in repository https://gitbox.apache.org/repos/asf/avro.git
The following commit(s) were added to refs/heads/branch-1.12 by this push:
new 53d7d41042 AVRO-4238: [java] Fix adding union fields with array
default value (#3730)
53d7d41042 is described below
commit 53d7d41042d99c0464988a969a1c898f95a926f4
Author: Cedric <[email protected]>
AuthorDate: Thu May 7 20:33:39 2026 +0200
AVRO-4238: [java] Fix adding union fields with array default value (#3730)
When FastReader was enabled and a field of type Union<Array, ...>
with an Array as default value was added, an AvroRuntimeException
occurred during Schema Evolution.
This change resolves this bug in FastReaderBuilder.java, allowing the
Schema Migration to succeed as specified.
---
.../java/org/apache/avro/io/FastReaderBuilder.java | 11 ++++-
.../TestReadingWritingDataInEvolvedSchemas.java | 51 ++++++++++++++--------
2 files changed, 42 insertions(+), 20 deletions(-)
diff --git
a/lang/java/avro/src/main/java/org/apache/avro/io/FastReaderBuilder.java
b/lang/java/avro/src/main/java/org/apache/avro/io/FastReaderBuilder.java
index 7bb66a7936..512c9ebf34 100644
--- a/lang/java/avro/src/main/java/org/apache/avro/io/FastReaderBuilder.java
+++ b/lang/java/avro/src/main/java/org/apache/avro/io/FastReaderBuilder.java
@@ -197,7 +197,16 @@ public class FastReaderBuilder {
} else if (defaultValue instanceof Utf8) {
return createFieldSetter(field, reusingReader((old, d) -> readUtf8(old,
(Utf8) defaultValue)));
} else if (defaultValue instanceof List && ((List<?>)
defaultValue).isEmpty()) {
- return createFieldSetter(field, reusingReader((old, d) ->
data.newArray(old, 0, field.schema())));
+ Schema arraySchema = field.schema();
+ if (arraySchema.getType() == Schema.Type.UNION) {
+ arraySchema = arraySchema.getTypes().stream()
+ .filter(nestedSchema -> nestedSchema.getType() ==
Schema.Type.ARRAY).findFirst()
+ .orElseThrow(() -> new AvroTypeException(String.format(
+ "Union schema %s has a default value of type Array, but none
of the union types is of type Array",
+ field.schema().toString())));
+ }
+ final Schema schema = arraySchema;
+ return createFieldSetter(field, reusingReader((old, d) ->
data.newArray(old, 0, schema)));
} else if (defaultValue instanceof Map && ((Map<?, ?>)
defaultValue).isEmpty()) {
return createFieldSetter(field, reusingReader((old, d) ->
data.newMap(old, 0)));
} else {
diff --git
a/lang/java/avro/src/test/java/org/apache/avro/TestReadingWritingDataInEvolvedSchemas.java
b/lang/java/avro/src/test/java/org/apache/avro/TestReadingWritingDataInEvolvedSchemas.java
index 2b392eb4ef..e72868a5bd 100644
---
a/lang/java/avro/src/test/java/org/apache/avro/TestReadingWritingDataInEvolvedSchemas.java
+++
b/lang/java/avro/src/test/java/org/apache/avro/TestReadingWritingDataInEvolvedSchemas.java
@@ -17,17 +17,14 @@
*/
package org.apache.avro;
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.nio.ByteBuffer;
import java.nio.charset.StandardCharsets;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.stream.Stream;
+
+import static java.util.Collections.emptyList;
+import static org.junit.jupiter.api.Assertions.*;
import org.apache.avro.generic.GenericData;
import org.apache.avro.generic.GenericData.EnumSymbol;
@@ -41,7 +38,6 @@ import org.apache.avro.io.DecoderFactory;
import org.apache.avro.io.Encoder;
import org.apache.avro.io.EncoderFactory;
-import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.EnumSource;
@@ -122,6 +118,11 @@ public class TestReadingWritingDataInEvolvedSchemas {
.name(FIELD_A).type().unionOf().floatType().and().doubleType().endUnion().noDefault()
//
.endRecord();
+ private static final Schema UNION_WITH_EMPTY_ARRAY_DEFAULT_RECORD =
SchemaBuilder.record(RECORD_A) //
+ .fields() //
+
.name(FIELD_A).type().unionOf().array().items(INT_RECORD).and().nullType().endUnion().arrayDefault(emptyList())
//
+ .endRecord();
+
enum EncoderType {
BINARY, JSON
}
@@ -232,9 +233,9 @@ public class TestReadingWritingDataInEvolvedSchemas {
Schema writer = UNION_INT_LONG_FLOAT_DOUBLE_RECORD;
Record record = defaultRecordWithSchema(writer, FIELD_A, 42.0);
byte[] encoded = encodeGenericBlob(record, encoderType);
- AvroTypeException exception =
Assertions.assertThrows(AvroTypeException.class,
+ AvroTypeException exception = assertThrows(AvroTypeException.class,
() -> decodeGenericBlob(FLOAT_RECORD, writer, encoded, encoderType));
- Assertions.assertEquals("Found double, expecting float",
exception.getMessage());
+ assertEquals("Found double, expecting float", exception.getMessage());
}
@ParameterizedTest
@@ -243,9 +244,9 @@ public class TestReadingWritingDataInEvolvedSchemas {
Schema writer = UNION_INT_LONG_FLOAT_DOUBLE_RECORD;
Record record = defaultRecordWithSchema(writer, FIELD_A, 42.0f);
byte[] encoded = encodeGenericBlob(record, encoderType);
- AvroTypeException exception =
Assertions.assertThrows(AvroTypeException.class,
+ AvroTypeException exception = assertThrows(AvroTypeException.class,
() -> decodeGenericBlob(LONG_RECORD, writer, encoded, encoderType));
- Assertions.assertEquals("Found float, expecting long",
exception.getMessage());
+ assertEquals("Found float, expecting long", exception.getMessage());
}
@ParameterizedTest
@@ -254,9 +255,9 @@ public class TestReadingWritingDataInEvolvedSchemas {
Schema writer = UNION_INT_LONG_FLOAT_DOUBLE_RECORD;
Record record = defaultRecordWithSchema(writer, FIELD_A, 42L);
byte[] encoded = encodeGenericBlob(record, encoderType);
- AvroTypeException exception =
Assertions.assertThrows(AvroTypeException.class,
+ AvroTypeException exception = assertThrows(AvroTypeException.class,
() -> decodeGenericBlob(INT_RECORD, writer, encoded, encoderType));
- Assertions.assertEquals("Found long, expecting int",
exception.getMessage());
+ assertEquals("Found long, expecting int", exception.getMessage());
}
@ParameterizedTest
@@ -342,9 +343,9 @@ public class TestReadingWritingDataInEvolvedSchemas {
Record record = defaultRecordWithSchema(writer, FIELD_A, new
EnumSymbol(ENUM_ABC, "C"));
byte[] encoded = encodeGenericBlob(record, encoderType);
- AvroTypeException exception =
Assertions.assertThrows(AvroTypeException.class,
+ AvroTypeException exception = assertThrows(AvroTypeException.class,
() -> decodeGenericBlob(ENUM_AB_RECORD, writer, encoded, encoderType));
- Assertions.assertEquals("No match for C", exception.getMessage());
+ assertEquals("No match for C", exception.getMessage());
}
@ParameterizedTest
@@ -363,9 +364,9 @@ public class TestReadingWritingDataInEvolvedSchemas {
assertEquals(42, decoded.get(FIELD_A));
try {
decoded.get("newTopField");
- Assertions.fail("get should throw a exception");
+ fail("get should throw a exception");
} catch (AvroRuntimeException ex) {
- Assertions.assertEquals("Not a valid schema field: newTopField",
ex.getMessage());
+ assertEquals("Not a valid schema field: newTopField", ex.getMessage());
}
}
@@ -379,9 +380,9 @@ public class TestReadingWritingDataInEvolvedSchemas {
.endRecord();
Record record = defaultRecordWithSchema(INT_RECORD, FIELD_A, 42);
byte[] encoded = encodeGenericBlob(record, encoderType);
- AvroTypeException exception =
Assertions.assertThrows(AvroTypeException.class,
+ AvroTypeException exception = assertThrows(AvroTypeException.class,
() -> decodeGenericBlob(reader, INT_RECORD, encoded, encoderType));
- Assertions.assertTrue(exception.getMessage().contains("missing required
field newField"), exception.getMessage());
+ assertTrue(exception.getMessage().contains("missing required field
newField"), exception.getMessage());
}
@ParameterizedTest
@@ -399,6 +400,18 @@ public class TestReadingWritingDataInEvolvedSchemas {
assertEquals(314, decoded.get("newFieldWithDefault"));
}
+ @ParameterizedTest
+ @EnumSource(EncoderType.class)
+ void readerWithEmptyListAsDefaultValueForUnionFieldIsApplied(EncoderType
encoderType) throws Exception {
+ Schema writer = SchemaBuilder.record(RECORD_A) //
+ .fields() //
+ .endRecord();
+ Record record = new GenericData.Record(writer);
+ byte[] encoded = encodeGenericBlob(record, encoderType);
+ Record decoded = decodeGenericBlob(UNION_WITH_EMPTY_ARRAY_DEFAULT_RECORD,
writer, encoded, encoderType);
+ assertEquals(emptyList(), decoded.get(FIELD_A));
+ }
+
@ParameterizedTest
@EnumSource(EncoderType.class)
void aliasesInSchema(EncoderType encoderType) throws Exception {
