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
10 changes: 8 additions & 2 deletions compiler/semantic/op.go
Original file line number Diff line number Diff line change
Expand Up @@ -161,9 +161,15 @@ func (t *translator) fileScanColumns(op *sem.FileScan) ([]string, bool) {
return nil, false
}
defer sr.Close()
cols, err := parquetio.TopLevelFieldNames(sr)
op.Type = parquetio.Type(t.sctx, sr)
return cols, err == nil
if op.Type == nil {
return nil, false
}
var cols []string
for _, f := range op.Type.(*super.TypeRecord).Fields {
cols = append(cols, f.Name)
}
return cols, true
}

func (t *translator) semFromExpr(entity *ast.ExprEntity, args []ast.OpArg, seq sem.Seq) (sem.Seq, string) {
Expand Down
23 changes: 0 additions & 23 deletions sio/parquetio/reader.go
Original file line number Diff line number Diff line change
Expand Up @@ -65,26 +65,3 @@ func Type(sctx *super.Context, r io.Reader) super.Type {
}
return nil
}

func TopLevelFieldNames(r io.Reader) ([]string, error) {
ras, ok := r.(parquet.ReaderAtSeeker)
if !ok {
return nil, errors.New("reader cannot seek")
}
pr, err := file.NewParquetReader(ras)
if err != nil {
return nil, err
}
var cols []string
var last string
schema := pr.MetaData().Schema
for i := range schema.NumColumns() {
name := schema.Column(i).ColumnPath()[0]
if name == last {
continue
}
cols = append(cols, name)
last = name
}
return cols, nil
}