Skip to content

compiler/rungen: use Builder.compileSortExprs #7059

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

Open
nwt wants to merge 1 commit into
base: main
Choose a base branch
from
+12 −24
Open

compiler/rungen: use Builder.compileSortExprs #7059

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
24 changes: 8 additions & 16 deletions compiler/rungen/op.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -357,27 +357,19 @@ func (b *Builder) compileLeaf(o dag.Op, parent sbuf.Puller) (sbuf.Puller, error)
case *dag.SkipOp:
return skip.New(parent, v.Count), nil
case *dag.SortOp:
var sortExprs []expr.SortExpr
for _, e := range v.Exprs {
k, err := b.compileExpr(e.Key)
if err != nil {
return nil, err
}
sortExprs = append(sortExprs, expr.NewSortExpr(k, e.Order, e.Nulls))
exprs, err := b.compileSortExprs(v.Exprs)
if err != nil {
return nil, err
}
return sort.New(b.rctx, parent, sortExprs, v.Reverse), nil
return sort.New(b.rctx, parent, exprs, v.Reverse), nil
case *dag.TailOp:
return tail.New(parent, v.Count), nil
case *dag.TopOp:
var sortExprs []expr.SortExpr
for _, dagSortExpr := range v.Exprs {
e, err := b.compileExpr(dagSortExpr.Key)
if err != nil {
return nil, err
}
sortExprs = append(sortExprs, expr.NewSortExpr(e, dagSortExpr.Order, dagSortExpr.Nulls))
exprs, err := b.compileSortExprs(v.Exprs)
if err != nil {
return nil, err
}
return top.New(b.sctx(), parent, v.Limit, sortExprs, v.Reverse), nil
return top.New(b.sctx(), parent, v.Limit, exprs, v.Reverse), nil
case *dag.UniqOp:
return uniq.New(b.rctx, parent, v.Cflag), nil
case *dag.UnnestOp:
Expand Down
12 changes: 4 additions & 8 deletions compiler/rungen/vop.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,15 +293,11 @@ func (b *Builder) compileVamLeaf(o dag.Op, parent vio.Puller) (vio.Puller, error
}
return sbuf.NewDematerializer(b.sctx(), sbufPuller), nil
case *dag.SortOp:
var sortExprs []expr.SortExpr
for _, e := range o.Exprs {
k, err := b.compileExpr(e.Key)
if err != nil {
return nil, err
}
sortExprs = append(sortExprs, expr.NewSortExpr(k, e.Order, e.Nulls))
exprs, err := b.compileSortExprs(o.Exprs)
if err != nil {
return nil, err
}
return vamop.NewSort(b.rctx, parent, sortExprs, o.Reverse), nil
return vamop.NewSort(b.rctx, parent, exprs, o.Reverse), nil
case *dag.TailOp:
return vamop.NewTail(parent, o.Count), nil
case *dag.UniqOp:
Expand Down
Loading