Skip to content

Commit 095a046

Browse files
committed
refactor(arreflect): remove dead opts tagOpts parameter from appendValue
The parameter was never read — all routing is determined by the concrete builder type passed in, which already encodes dict/listview/temporal intent via applyEncodingOpts. All 10 call sites passed tagOpts{} or fm.Opts (ignored), now pass only (builder, value).
1 parent 2e35ae5 commit 095a046

2 files changed

Lines changed: 12 additions & 12 deletions

File tree

arrow/array/arreflect/reflect_go_to_arrow.go

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ func buildPrimitiveArray(vals reflect.Value, mem memory.Allocator) (arrow.Array,
9696
b.Reserve(vals.Len())
9797

9898
if err := iterSlice(vals, isPtr, b.AppendNull, func(v reflect.Value) error {
99-
return appendValue(b, v, tagOpts{})
99+
return appendValue(b, v)
100100
}); err != nil {
101101
return nil, err
102102
}
@@ -239,7 +239,7 @@ func buildDecimalArray(vals reflect.Value, opts tagOpts, mem memory.Allocator) (
239239
func appendStructFields(sb *array.StructBuilder, v reflect.Value, fields []fieldMeta) error {
240240
sb.Append(true)
241241
for fi, fm := range fields {
242-
if err := appendValue(sb.FieldBuilder(fi), v.FieldByIndex(fm.Index), fm.Opts); err != nil {
242+
if err := appendValue(sb.FieldBuilder(fi), v.FieldByIndex(fm.Index)); err != nil {
243243
return fmt.Errorf("struct field %q: %w", fm.Name, err)
244244
}
245245
}
@@ -338,7 +338,7 @@ func appendDecimalValue(b array.Builder, v reflect.Value) error {
338338
return nil
339339
}
340340

341-
func appendValue(b array.Builder, v reflect.Value, opts tagOpts) error {
341+
func appendValue(b array.Builder, v reflect.Value) error {
342342
for v.Kind() == reflect.Ptr {
343343
if v.IsNil() {
344344
b.AppendNull()
@@ -400,7 +400,7 @@ func appendValue(b array.Builder, v reflect.Value, opts tagOpts) error {
400400
tb.Append(true)
401401
vb := tb.ValueBuilder()
402402
for i := 0; i < v.Len(); i++ {
403-
if err := appendValue(vb, v.Index(i), tagOpts{}); err != nil {
403+
if err := appendValue(vb, v.Index(i)); err != nil {
404404
return err
405405
}
406406
}
@@ -412,10 +412,10 @@ func appendValue(b array.Builder, v reflect.Value, opts tagOpts) error {
412412
kb := tb.KeyBuilder()
413413
ib := tb.ItemBuilder()
414414
for _, key := range v.MapKeys() {
415-
if err := appendValue(kb, key, tagOpts{}); err != nil {
415+
if err := appendValue(kb, key); err != nil {
416416
return err
417417
}
418-
if err := appendValue(ib, v.MapIndex(key), tagOpts{}); err != nil {
418+
if err := appendValue(ib, v.MapIndex(key)); err != nil {
419419
return err
420420
}
421421
}
@@ -500,7 +500,7 @@ func appendListElement(b array.Builder, v reflect.Value) error {
500500
return fmt.Errorf("unexpected list builder type %T: %w", b, ErrUnsupportedType)
501501
}
502502
for i := 0; i < v.Len(); i++ {
503-
if err := appendValue(vb, v.Index(i), tagOpts{}); err != nil {
503+
if err := appendValue(vb, v.Index(i)); err != nil {
504504
return err
505505
}
506506
}
@@ -553,7 +553,7 @@ func buildListLikeArray(vals reflect.Value, mem memory.Allocator, isView bool) (
553553
}
554554
beginRow(outer.Len())
555555
for j := 0; j < outer.Len(); j++ {
556-
if err := appendValue(vb, outer.Index(j), tagOpts{}); err != nil {
556+
if err := appendValue(vb, outer.Index(j)); err != nil {
557557
return nil, fmt.Errorf("%s [%d][%d]: %w", label, i, j, err)
558558
}
559559
}
@@ -604,10 +604,10 @@ func buildMapArray(vals reflect.Value, mem memory.Allocator) (arrow.Array, error
604604
}
605605
mb.Append(true)
606606
for _, key := range m.MapKeys() {
607-
if err := appendValue(kb, key, tagOpts{}); err != nil {
607+
if err := appendValue(kb, key); err != nil {
608608
return fmt.Errorf("map key: %w", err)
609609
}
610-
if err := appendValue(ib, m.MapIndex(key), tagOpts{}); err != nil {
610+
if err := appendValue(ib, m.MapIndex(key)); err != nil {
611611
return fmt.Errorf("map value: %w", err)
612612
}
613613
}
@@ -647,7 +647,7 @@ func buildFixedSizeListArray(vals reflect.Value, mem memory.Allocator) (arrow.Ar
647647
if err := iterSlice(vals, isPtr, appendNullIdx, func(elem reflect.Value) error {
648648
fb.Append(true)
649649
for j := 0; j < int(n); j++ {
650-
if err := appendValue(vb, elem.Index(j), tagOpts{}); err != nil {
650+
if err := appendValue(vb, elem.Index(j)); err != nil {
651651
return fmt.Errorf("fixed-size list element [%d][%d]: %w", idx, j, err)
652652
}
653653
}

arrow/array/arreflect/reflect_go_to_arrow_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -408,7 +408,7 @@ func TestBuildFixedSizeListArray(t *testing.T) {
408408
defer bldr.Release()
409409

410410
var nilSlice []int32
411-
err := appendValue(bldr, reflect.ValueOf(&nilSlice).Elem(), tagOpts{})
411+
err := appendValue(bldr, reflect.ValueOf(&nilSlice).Elem())
412412
require.NoError(t, err)
413413

414414
bldr.Append(true)

0 commit comments

Comments
 (0)