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
18 changes: 17 additions & 1 deletion arrow/scalar/parse.go
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,17 @@ func ToScalar(val interface{}, mem memory.Allocator) (Scalar, error) {
case reflect.Struct:
scalars := make([]Scalar, 0, v.Type().NumField())
fields := make([]string, 0, v.Type().NumField())
success := false
defer func() {
if success {
return
}
for _, child := range scalars {
if releasable, ok := child.(Releasable); ok {
releasable.Release()
}
}
}()
for i := 0; i < v.Type().NumField(); i++ {
fld := v.Type().Field(i)
tag := fld.Tag.Get("compute")
Expand All @@ -162,7 +173,12 @@ func ToScalar(val interface{}, mem memory.Allocator) (Scalar, error) {
fields = append(fields, "_type_name")
}

return NewStructScalarWithNames(scalars, fields)
out, err := NewStructScalarWithNames(scalars, fields)
if err != nil {
return nil, err
}
success = true
return out, nil
case reflect.Slice:
return createListScalar(v, mem)
default:
Expand Down
16 changes: 16 additions & 0 deletions arrow/scalar/scalar_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -1410,6 +1410,11 @@ func (v valueFromScalarTarget) FromStructScalar(*scalar.Struct) error {
return nil
}

type PartialScalarTest struct {
Good []string
Bad []complex64
}

func TestToScalar(t *testing.T) {
ot := &OptionValTest{ToType: arrow.BinaryTypes.String, Allow: true}
sc, err := scalar.ToScalar(ot, memory.DefaultAllocator)
Expand Down Expand Up @@ -1515,6 +1520,17 @@ func TestFromScalarMetadataDoesNotPrependEmptyEntries(t *testing.T) {
assert.Equal(t, meta.Values(), out.FieldMeta[0].Values())
}

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

_, err := scalar.ToScalar(PartialScalarTest{
Good: []string{"retained before error"},
Bad: []complex64{complex(1, 2)},
}, mem)
require.Error(t, err)
}

var dictIndexTypes = []arrow.DataType{
arrow.PrimitiveTypes.Int8,
arrow.PrimitiveTypes.Uint8,
Expand Down
Loading