Skip to content

Commit 83ad4d1

Browse files
authored
Merge pull request #3154 from redpanda-data/avro
avro: upgrade hamba library
2 parents 8638c31 + 8a062a1 commit 83ad4d1

File tree

3 files changed

+7
-6
lines changed

3 files changed

+7
-6
lines changed

go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ require (
7474
github.com/golang-jwt/jwt/v5 v5.2.1
7575
github.com/googleapis/go-sql-spanner v1.8.0
7676
github.com/gosimple/slug v1.14.0
77-
github.com/hamba/avro/v2 v2.22.2-0.20240625062549-66aad10411d9
77+
github.com/hamba/avro/v2 v2.27.0
7878
github.com/influxdata/influxdb1-client v0.0.0-20220302092344-a9ab5670611c
7979
github.com/jackc/pgx/v4 v4.18.3
8080
github.com/jackc/pgx/v5 v5.6.0

go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -1319,8 +1319,8 @@ github.com/grpc-ecosystem/grpc-gateway/v2 v2.22.0 h1:asbCHRVmodnJTuQ3qamDwqVOIjw
13191319
github.com/grpc-ecosystem/grpc-gateway/v2 v2.22.0/go.mod h1:ggCgvZ2r7uOoQjOyu2Y1NhHmEPPzzuhWgcza5M1Ji1I=
13201320
github.com/hailocab/go-hostpool v0.0.0-20160125115350-e80d13ce29ed h1:5upAirOpQc1Q53c0bnx2ufif5kANL7bfZWcc6VJWJd8=
13211321
github.com/hailocab/go-hostpool v0.0.0-20160125115350-e80d13ce29ed/go.mod h1:tMWxXQ9wFIaZeTI9F+hmhFiGpFmhOHzyShyFUhRm0H4=
1322-
github.com/hamba/avro/v2 v2.22.2-0.20240625062549-66aad10411d9 h1:NEoabXt33PDWK4fXryK4e+XX+fSKDmmu9vg3yb9YI2M=
1323-
github.com/hamba/avro/v2 v2.22.2-0.20240625062549-66aad10411d9/go.mod h1:fQVdB2mFZBhPW1D5Abej41LMvrErARGrrdjOnKbm5yw=
1322+
github.com/hamba/avro/v2 v2.27.0 h1:IAM4lQ0VzUIKBuo4qlAiLKfqALSrFC+zi1iseTtbBKU=
1323+
github.com/hamba/avro/v2 v2.27.0/go.mod h1:jN209lopfllfrz7IGoZErlDz+AyUJ3vrBePQFZwYf5I=
13241324
github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
13251325
github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I=
13261326
github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=

internal/impl/confluent/serde_hamba_avro.go

+4-3
Original file line numberDiff line numberDiff line change
@@ -67,9 +67,10 @@ func (s *schemaRegistryDecoder) getHambaAvroDecoder(ctx context.Context, schema
6767
if err != nil {
6868
return fmt.Errorf("unable to extract bytes from message: %w", err)
6969
}
70-
var native any
71-
if err := avro.Unmarshal(codec, b, &native); err != nil {
72-
return fmt.Errorf("unable to unmarshal avro: %w", err)
70+
r := avro.NewReader(nil, 0).Reset(b)
71+
native := r.ReadNext(codec)
72+
if r.Error != nil {
73+
return fmt.Errorf("unable to unmarshal avro: %w", r.Error)
7374
}
7475
var w avroSchemaWalker
7576
w.unnestUnions = s.cfg.avro.rawUnions

0 commit comments

Comments
 (0)