Skip to content

fix: panic in arrow table buffer #5549

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
mhilton merged 1 commit into from
Aug 7, 2025
Merged

fix: panic in arrow table buffer #5549

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion arrow/table_buffer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ type TableBuffer struct {
var _ flux.ColReader = (*TableBuffer)(nil)

func (t *TableBuffer) Len() int {
if len(t.Columns) == 0 {
if len(t.Values) == 0 {
return 0
}
return t.Values[0].Len()
Expand Down
2 changes: 1 addition & 1 deletion execute/table/buffered_builder.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ func (b *BufferedBuilder) appendBuffer(cr flux.ColReader, mem memory.Allocator)
func (b *BufferedBuilder) normalizeTableSchema(cols []flux.ColMeta, mem memory.Allocator) error {
// If there are no columns set for this builder, inherit the ones
// that were passed in.
if b.Columns == nil {
if len(b.Columns) == 0 {
b.Columns = cols
return nil
}
Expand Down
41 changes: 41 additions & 0 deletions execute/table/buffered_builder_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import (
"testing"

"github.com/influxdata/flux"
"github.com/influxdata/flux/execute"
"github.com/influxdata/flux/execute/table"
"github.com/influxdata/flux/execute/table/static"
"github.com/influxdata/flux/memory"
Expand Down Expand Up @@ -183,3 +184,43 @@ func TestBufferedBuilder_AppendTable(t *testing.T) {
})
}
}

func TestBufferedBuilder_AppendTable_EmptyTable(t *testing.T) {
mem := memory.DefaultAllocator

gk := execute.NewGroupKey(nil, nil)
emptyTable := execute.NewEmptyTable(gk, []flux.ColMeta{})
b := table.NewBufferedBuilder(gk, mem)

// Append an empty table to the builder.
err := b.AppendTable(emptyTable)
if err != nil {
t.Fatalf("unexpected error: %s", err)
}
in := static.TableGroup{
static.Table{
static.Times("_time", "2020-01-01T00:00:00Z", 10, 20, 30, 40, 50),
static.Floats("_value", 3, 8, 2, 4, 11, 6),
},
}
err = in.Do(func(tbl flux.Table) error {
return b.AppendTable(tbl)
})
if err != nil {
t.Fatalf("unexpected error: %s", err)
}

want := static.Table{
static.Times("_time", "2020-01-01T00:00:00Z", 10, 20, 30, 40, 50),
static.Floats("_value", 3, 8, 2, 4, 11, 6),
}

out, err := b.Table()
if err != nil {
t.Fatalf("unexpected error: %s", err)
}

if diff := table.Diff(want, table.Iterator{out}); diff != "" {
t.Fatalf("unexpected diff -want/+got:\n%s", diff)
}
}