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
36 changes: 31 additions & 5 deletions runtime/exec/environment.go
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,13 @@ func (c *closePuller) Pull(done bool) (sbuf.Batch, error) {
}

func (e *Environment) VectorOpen(ctx context.Context, sctx *super.Context, path, format string, p sbuf.Pushdown, concurrentReaders int) (VectorConcurrentPuller, error) {
if format != "csup" && format != "fjson" && format != "parquet" {
sbufPuller, err := e.Open(ctx, sctx, path, format, p)
if err != nil {
return nil, err
}
return sbuf.NewDematerializer(sctx, sbufPuller), nil
}
if path == "-" {
path = "stdio:stdin"
}
Expand All @@ -192,13 +199,32 @@ func (e *Environment) VectorOpen(ctx context.Context, sctx *super.Context, path,
case "fjson":
puller = fjsonio.NewVectorReader(ctx, sctx, reader, p, concurrentReaders)
default:
var sbufPuller sbuf.Puller
sbufPuller, err = e.Open(ctx, sctx, path, format, p)
puller = sbuf.NewDematerializer(sctx, sbufPuller)
panic(format)
}
if err != nil {
reader.Close()
return nil, err
return nil, fmt.Errorf("%s: %w", path, err)
}
return &errorPrefixConcurrentPuller{puller, path}, nil
}

type errorPrefixConcurrentPuller struct {
VectorConcurrentPuller
prefix string
}

func (e *errorPrefixConcurrentPuller) ConcurrentPull(done bool, id int) (vector.Any, error) {
vec, err := e.VectorConcurrentPuller.ConcurrentPull(done, id)
if err != nil {
err = fmt.Errorf("%s: %w", e.prefix, err)
}
return vec, err
}

func (e *errorPrefixConcurrentPuller) Pull(done bool) (vector.Any, error) {
vec, err := e.VectorConcurrentPuller.Pull(done)
if err != nil {
err = fmt.Errorf("%s: %w", e.prefix, err)
}
return puller, nil
return vec, err
}
4 changes: 4 additions & 0 deletions sio/csupio/vectorreader.go
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,10 @@ func NewVectorReader(ctx context.Context, sctx *super.Context, r io.Reader, p sb
if !ok {
return nil, errors.New("Super Columnar requires a seekable input")
}
var buf [1]byte
if _, err := ra.ReadAt(buf[:], 0); err != nil {
return nil, errors.New("Super Columnar requires a seekable input")
}
var metaFilters []*metafilter
if p != nil {
filter, _, err := p.MetaFilter()
Expand Down
2 changes: 2 additions & 0 deletions sio/csupio/ztests/stdin-error.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ script: |
super -f csup -o t.csup in.sup
! cat t.csup | super -i csup -

vector: true

inputs:
- name: in.sup
data: |
Expand Down
2 changes: 2 additions & 0 deletions sio/fjsonio/ztests/parser-error.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
# Test parse error on EOF.
spq: pass

vector: true

input-flags: '-i fjson'

input: |
Expand Down
Loading