Skip to content

fix(avro): correctly set nullability for ListType #709

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
zeroshade merged 2 commits into from
Mar 13, 2026
Merged

fix(avro): correctly set nullability for ListType #709

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6622b8a
chore(avro): gofmt short var declaration
Mar 13, 2026
79871ae
fix(avro): correctly set nullability for ListType
Mar 13, 2026
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
5 changes: 5 additions & 0 deletions arrow/avro/reader_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,11 @@ func TestReader(t *testing.T) {
Type: arrow.BinaryTypes.Binary,
Nullable: true,
},
{
Name: "nullable_remote_ips",
Type: arrow.ListOfNonNullable(arrow.BinaryTypes.Binary),
Nullable: true,
},
{
Name: "person",
Type: arrow.StructOf(
Expand Down
10 changes: 6 additions & 4 deletions arrow/avro/schema.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ func arrowSchemafromAvro(n *schemaNode) {
k := strconv.FormatInt(int64(index), 10)
symbols[k] = symbol
}
var dt = arrow.DictionaryType{IndexType: arrow.PrimitiveTypes.Uint64, ValueType: arrow.BinaryTypes.String, Ordered: false}
dt := arrow.DictionaryType{IndexType: arrow.PrimitiveTypes.Uint64, ValueType: arrow.BinaryTypes.String, Ordered: false}
sl := int64(len(symbols))
switch {
case sl <= math.MaxUint8:
Expand All @@ -125,12 +125,14 @@ func arrowSchemafromAvro(n *schemaNode) {
} else {
arrowSchemafromAvro(c)
}
var typ *arrow.ListType
switch c.arrowField.Nullable {
case true:
n.arrowField = arrow.Field{Name: n.name, Type: arrow.ListOfField(c.arrowField), Metadata: c.arrowField.Metadata}
typ = arrow.ListOfField(c.arrowField)
case false:
n.arrowField = arrow.Field{Name: n.name, Type: arrow.ListOfNonNullable(c.arrowField.Type), Metadata: c.arrowField.Metadata}
typ = arrow.ListOfNonNullable(c.arrowField.Type)
}
n.arrowField = buildArrowField(n, typ, c.arrowField.Metadata)
case "map":
n.schemaCache.Add(n.schema.(*avro.MapSchema).Values().(avro.NamedSchema).Name(), n.schema.(*avro.MapSchema).Values())
c := n.newChild(n.name, n.schema.(*avro.MapSchema).Values())
Expand Down Expand Up @@ -160,7 +162,7 @@ func arrowSchemafromAvro(n *schemaNode) {
n.arrowField = buildArrowField(n, avroPrimitiveToArrowType(string(st)), arrow.Metadata{})
}
case "float", "double", "boolean":
n.arrowField = arrow.Field{Name: n.name, Type: avroPrimitiveToArrowType(string(st)), Nullable: n.nullable}
n.arrowField = buildArrowField(n, avroPrimitiveToArrowType(string(st)), arrow.Metadata{})
case "<ref>":
refSchema := n.schemaCache.Get(string(n.schema.(*avro.RefSchema).Schema().Name()))
if refSchema == nil {
Expand Down
5 changes: 5 additions & 0 deletions arrow/avro/schema_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,11 @@ func TestSchemaStringEqual(t *testing.T) {
Type: arrow.BinaryTypes.Binary,
Nullable: true,
},
{
Name: "nullable_remote_ips",
Type: arrow.ListOfNonNullable(arrow.BinaryTypes.Binary),
Nullable: true,
},
{
Name: "person",
Type: arrow.StructOf(
Expand Down
10 changes: 10 additions & 0 deletions arrow/avro/testdata/alltypes.avsc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,16 @@
"bytes"
]
},
{
"name": "nullable_remote_ips",
"type": [
"null",
{
"type": "array",
"items": "bytes"
}
]
},
{
"name": "person",
"type": {
Expand Down
17 changes: 9 additions & 8 deletions arrow/avro/testdata/testdata.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,7 @@ type Example struct {
Fraction *float64 `avro:"fraction" json:"fraction"`
IsEmergency bool `avro:"is_emergency" json:"is_emergency"`
RemoteIP *ByteArray `avro:"remote_ip" json:"remote_ip"`
NullableRemoteIPS *[]ByteArray `avro:"nullable_remote_ips" json:"nullable_remote_ips"`
Person PersonData `avro:"person" json:"person"`
DecimalField DecimalType `avro:"decimalField" json:"decimalField"`
Decimal256Field DecimalType `avro:"decimal256Field" json:"decimal256Field"`
Expand Down Expand Up @@ -215,12 +216,12 @@ func sampleData() Example {
InheritNamespace: "d",
Md5: MD5{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15},
},
ID: 42,
BigID: 42000000000,
Temperature: func() *float32 { v := float32(36.6); return &v }(),
Fraction: func() *float64 { v := float64(0.75); return &v }(),
IsEmergency: true,
RemoteIP: func() *ByteArray { v := ByteArray{192, 168, 1, 1}; return &v }(),
ID: 42,
BigID: 42000000000,
Temperature: func() *float32 { v := float32(36.6); return &v }(),
Fraction: func() *float64 { v := float64(0.75); return &v }(),
IsEmergency: true,
RemoteIP: func() *ByteArray { v := ByteArray{192, 168, 1, 1}; return &v }(),
Person: PersonData{
Lastname: "Doe",
Address: AddressUSRecord{
Expand Down Expand Up @@ -248,7 +249,7 @@ func sampleData() Example {

func writeOCFSampleData(td string, data Example) string {
path := filepath.Join(td, sampleAvroFileName)
ocfFile, err := os.OpenFile(path, os.O_CREATE|os.O_WRONLY|os.O_TRUNC, 0644)
ocfFile, err := os.OpenFile(path, os.O_CREATE|os.O_WRONLY|os.O_TRUNC, 0o644)
if err != nil {
log.Fatal(err)
}
Expand All @@ -272,7 +273,7 @@ func writeOCFSampleData(td string, data Example) string {

func writeJSONSampleData(td string, data Example) string {
path := filepath.Join(td, sampleJSONFileName)
jsonFile, err := os.OpenFile(path, os.O_CREATE|os.O_WRONLY|os.O_TRUNC, 0644)
jsonFile, err := os.OpenFile(path, os.O_CREATE|os.O_WRONLY|os.O_TRUNC, 0o644)
if err != nil {
log.Fatal(err)
}
Expand Down