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
22 changes: 18 additions & 4 deletions arrow/array/json_reader.go
Original file line number Diff line number Diff line change
Expand Up @@ -184,19 +184,29 @@ func (r *JSONReader) readNext() bool {
}

func (r *JSONReader) nextall() bool {
n := 0
for r.readNext() {
n++
}

r.cur = r.bldr.NewRecordBatch()
return r.cur.NumRows() > 0
if r.schema.NumFields() == 0 {
r.cur = NewRecordBatch(r.schema, nil, int64(n))
} else {
r.cur = r.bldr.NewRecordBatch()
}
return n > 0
}

func (r *JSONReader) next1() bool {
if !r.readNext() {
return false
}

r.cur = r.bldr.NewRecordBatch()
if r.schema.NumFields() == 0 {
r.cur = NewRecordBatch(r.schema, nil, 1)
} else {
r.cur = r.bldr.NewRecordBatch()
}
return true
}

Expand All @@ -210,7 +220,11 @@ func (r *JSONReader) nextn() bool {
}

if n > 0 {
r.cur = r.bldr.NewRecordBatch()
if r.schema.NumFields() == 0 {
r.cur = NewRecordBatch(r.schema, nil, int64(n))
} else {
r.cur = r.bldr.NewRecordBatch()
}
}
return n > 0
}
Expand Down
28 changes: 28 additions & 0 deletions arrow/array/json_reader_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,34 @@ func TestJSONReaderAll(t *testing.T) {
assert.False(t, rdr.Next())
}

func TestJSONReaderPreservesRowsForEmptySchema(t *testing.T) {
schema := arrow.NewSchema(nil, nil)
mem := memory.NewCheckedAllocator(memory.NewGoAllocator())
defer mem.AssertSize(t, 0)

t.Run("one row per batch", func(t *testing.T) {
rdr := array.NewJSONReader(strings.NewReader("{} {}"), schema, array.WithAllocator(mem))
defer rdr.Release()

assert.True(t, rdr.Next())
assert.EqualValues(t, 1, rdr.RecordBatch().NumRows())
assert.True(t, rdr.Next())
assert.EqualValues(t, 1, rdr.RecordBatch().NumRows())
assert.False(t, rdr.Next())
assert.NoError(t, rdr.Err())
})

t.Run("all rows in one batch", func(t *testing.T) {
rdr := array.NewJSONReader(strings.NewReader("{} {}"), schema, array.WithAllocator(mem), array.WithChunk(-1))
defer rdr.Release()

assert.True(t, rdr.Next())
assert.EqualValues(t, 2, rdr.RecordBatch().NumRows())
assert.False(t, rdr.Next())
assert.NoError(t, rdr.Err())
})
}

func TestJSONReaderChunked(t *testing.T) {
schema := arrow.NewSchema([]arrow.Field{
{Name: "region", Type: arrow.BinaryTypes.String, Nullable: true},
Expand Down
Loading