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
41 changes: 22 additions & 19 deletions sio/parquetio/vectorreader.go
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ type VectorReader struct {
metadataColIndexes []int
metadataFilters []expr.Evaluator
nextRowGroup *atomic.Int64
rr pqarrow.RecordReader
rrs []pqarrow.RecordReader
vbs []vectorBuilder
}

Expand Down Expand Up @@ -68,24 +68,26 @@ func NewVectorReader(ctx context.Context, sctx *super.Context, r io.Reader, p sb
var metadataColIndexes []int
var metadataFilters []expr.Evaluator
if p != nil {
_, projection, err := p.MetaFilter()
filter, projection, err := p.MetaFilter()
if err != nil {
return nil, err
}
paths := projection.Paths()
for i, p := range paths {
// Trim trailing "max" or "min".
paths[i] = p[:len(p)-1]
}
colIndexes := columnIndexes(pr.MetaData().Schema, paths)
// Remove duplicates created above by trimming "max" and "min".
metadataColIndexes = slices.Compact(colIndexes)
for range concurrentReaders {
filter, _, err := p.MetaFilter()
if err != nil {
return nil, err
if filter != nil {
paths := projection.Paths()
for i, p := range paths {
// Trim trailing "max" or "min".
paths[i] = p[:len(p)-1]
}
colIndexes := columnIndexes(pr.MetaData().Schema, paths)
// Remove duplicates created above by trimming "max" and "min".
metadataColIndexes = slices.Compact(colIndexes)
for range concurrentReaders {
filter, _, err := p.MetaFilter()
if err != nil {
return nil, err
}
metadataFilters = append(metadataFilters, filter)
}
metadataFilters = append(metadataFilters, filter)
}
}
var vbs []vectorBuilder
Expand All @@ -101,6 +103,7 @@ func NewVectorReader(ctx context.Context, sctx *super.Context, r io.Reader, p sb
metadataColIndexes: metadataColIndexes,
metadataFilters: metadataFilters,
nextRowGroup: &atomic.Int64{},
rrs: make([]pqarrow.RecordReader, concurrentReaders),
vbs: vbs,
}, nil
}
Expand All @@ -117,7 +120,7 @@ func (p *VectorReader) ConcurrentPull(done bool, id int) (vector.Any, error) {
if err := p.ctx.Err(); err != nil {
return nil, err
}
if p.rr == nil {
if p.rrs[id] == nil {
pr := p.fr.ParquetReader()
rowGroup := int(p.nextRowGroup.Add(1) - 1)
if rowGroup >= pr.NumRowGroups() {
Expand All @@ -134,12 +137,12 @@ func (p *VectorReader) ConcurrentPull(done bool, id int) (vector.Any, error) {
if err != nil {
return nil, err
}
p.rr = rr
p.rrs[id] = rr
}
rec, err := p.rr.Read()
rec, err := p.rrs[id].Read()
if err != nil {
if err == io.EOF {
p.rr = nil
p.rrs[id] = nil
continue
}
return nil, err
Expand Down
12 changes: 12 additions & 0 deletions sio/parquetio/ztests/aggregate.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
script: |
super -s -c 'from conn.parquet | aggregate count()'

vector: true

inputs:
- name: conn.parquet

outputs:
- name: stdout
data: |
10::uint64