Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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/scalar/scalar.go
Original file line number Diff line number Diff line change
Expand Up @@ -679,6 +679,11 @@ func GetScalar(arr arrow.Array, idx int) (Scalar, error) {
for i := range children {
child, err := GetScalar(arr.Field(i), idx)
if err != nil {
for _, child := range children[:i] {
if releasable, ok := child.(Releasable); ok {
releasable.Release()
}
}
return nil, err
}
children[i] = child
Expand Down
24 changes: 24 additions & 0 deletions arrow/scalar/scalar_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -1388,6 +1388,30 @@ func TestGetScalarIndexOutOfRange(t *testing.T) {
assert.ErrorIs(t, err, arrow.ErrIndex)
}

func TestGetScalarReleasesPartialStructChildrenOnError(t *testing.T) {
mem := memory.NewCheckedAllocator(memory.NewGoAllocator())
defer mem.AssertSize(t, 0)

dt := arrow.StructOf(
arrow.Field{Name: "values", Type: arrow.ListOf(arrow.PrimitiveTypes.Int32)},
arrow.Field{Name: "view", Type: arrow.BinaryTypes.StringView},
)
builder := array.NewStructBuilder(mem, dt)
defer builder.Release()

builder.Append(true)
listBuilder := builder.FieldBuilder(0).(*array.ListBuilder)
listBuilder.Append(true)
listBuilder.ValueBuilder().(*array.Int32Builder).Append(1)
builder.FieldBuilder(1).(*array.StringViewBuilder).Append("unsupported")

arr := builder.NewStructArray()
defer arr.Release()

_, err := scalar.GetScalar(arr, 0)
require.Error(t, err)
}

func TestDictionaryScalarValidateErrors(t *testing.T) {
mem := memory.NewCheckedAllocator(memory.DefaultAllocator)
defer mem.AssertSize(t, 0)
Expand Down
Loading