database/tidb
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

planner/core: do not change window ast when building plan (#12347)

Browse Source
This commit is contained in:
Haibin Xie
2019-09-26 14:16:31 +08:00
committed by pingcap-github-bot
parent 16ad8b9d54
commit 80fd5e4080
2 changed files with 40 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
planner/core/logical_plan_builder.go
View File

@ -3527,7 +3527,10 @@ func (b *PlanBuilder) checkOriginWindowSpecs(funcs []*ast.WindowFuncExpr, orderB
if f.FromLast {
return ErrNotSupportedYet.GenWithStackByArgs("FROM LAST")
}
spec := f.Spec
spec := &f.Spec
if f.Spec.Name.L != "" {
spec = b.windowSpecs[f.Spec.Name.L]
}
if spec.Frame == nil {
continue
}
@ -3548,11 +3551,11 @@ func (b *PlanBuilder) checkOriginWindowSpecs(funcs []*ast.WindowFuncExpr, orderB
return ErrWindowFrameIllegal.GenWithStackByArgs(getWindowName(spec.Name.O))
}
err := b.checkOriginWindowFrameBound(&start, &spec, orderByItems)
err := b.checkOriginWindowFrameBound(&start, spec, orderByItems)
if err != nil {
return err
}
err = b.checkOriginWindowFrameBound(&end, &spec, orderByItems)
err = b.checkOriginWindowFrameBound(&end, spec, orderByItems)
if err != nil {
return err
}
@ -3660,7 +3663,6 @@ func (b *PlanBuilder) groupWindowFuncs(windowFuncs []*ast.WindowFuncExpr) (map[*
if !ok {
return nil, ErrWindowNoSuchWindow.GenWithStackByArgs(windowFunc.Spec.Name.O)
}
windowFunc.Spec = *spec
newSpec, updated := b.handleDefaultFrame(spec, windowFunc.F)
if !updated {
groupedWindow[spec] = append(groupedWindow[spec], windowFunc)

45
planner/core/logical_plan_test.go
View File

@ -23,6 +23,7 @@ import (
. "github.com/pingcap/check"
"github.com/pingcap/parser"
"github.com/pingcap/parser/ast"
"github.com/pingcap/parser/format"
"github.com/pingcap/parser/model"
"github.com/pingcap/parser/mysql"
"github.com/pingcap/parser/terror"
@ -2546,26 +2547,48 @@ func (s *testPlanSuite) TestWindowFunction(c *C) {
ctx := context.TODO()
for i, tt := range tests {
comment := Commentf("case:%v sql:%s", i, tt.sql)
stmt, err := s.ParseOneStmt(tt.sql, "", "")
c.Assert(err, IsNil, comment)
Preprocess(s.ctx, stmt, s.is)
builder := NewPlanBuilder(MockContext(), s.is, &BlockHintProcessor{})
p, err := builder.Build(ctx, stmt)
p, stmt, err := s.optimize(ctx, tt.sql)
if err != nil {
c.Assert(err.Error(), Equals, tt.result, comment)
continue
}
c.Assert(ToString(p), Equals, tt.result, comment)
var sb strings.Builder
// After restore, the result should be the same.
err = stmt.Restore(format.NewRestoreCtx(format.DefaultRestoreFlags, &sb))
c.Assert(err, IsNil)
p, err = logicalOptimize(ctx, builder.optFlag, p.(LogicalPlan))
c.Assert(err, IsNil)
lp, ok := p.(LogicalPlan)
c.Assert(ok, IsTrue)
p, err = physicalOptimize(lp)
c.Assert(err, IsNil)
p, _, err = s.optimize(ctx, sb.String())
if err != nil {
c.Assert(err.Error(), Equals, tt.result, comment)
continue
}
c.Assert(ToString(p), Equals, tt.result, comment)
}
}
func (s *testPlanSuite) optimize(ctx context.Context, sql string) (PhysicalPlan, ast.Node, error) {
stmt, err := s.ParseOneStmt(sql, "", "")
if err != nil {
return nil, nil, err
}
err = Preprocess(s.ctx, stmt, s.is)
if err != nil {
return nil, nil, err
}
builder := NewPlanBuilder(MockContext(), s.is, &BlockHintProcessor{})
p, err := builder.Build(ctx, stmt)
if err != nil {
return nil, nil, err
}
p, err = logicalOptimize(ctx, builder.optFlag, p.(LogicalPlan))
if err != nil {
return nil, nil, err
}
p, err = physicalOptimize(p.(LogicalPlan))
return p.(PhysicalPlan), stmt, err
}
func byItemsToProperty(byItems []*ByItems) *property.PhysicalProperty {
pp := &property.PhysicalProperty{}
for _, item := range byItems {