Skip to content

Commit

Permalink
planner/window: fix comments (pingcap#11008)
Browse files Browse the repository at this point in the history
  • Loading branch information
gaoxingliang authored and root committed Aug 10, 2019
1 parent f0c5926 commit 82740f0
Showing 1 changed file with 4 additions and 14 deletions.
18 changes: 4 additions & 14 deletions planner/core/logical_plan_builder.go
Original file line number Diff line number Diff line change
Expand Up @@ -1200,8 +1200,8 @@ func (a *havingWindowAndOrderbyExprResolver) Enter(n ast.Node) (node ast.Node, s
return n, false
}

func (a *havingWindowAndOrderbyExprResolver) resolveFromSchema(colName *ast.ColumnName, schema *expression.Schema) (int, error) {
col, err := schema.FindColumn(colName)
func (a *havingWindowAndOrderbyExprResolver) resolveFromSchema(v *ast.ColumnNameExpr, schema *expression.Schema) (int, error) {
col, err := schema.FindColumn(v.Name)
if err != nil {
return -1, err
}
Expand Down Expand Up @@ -1253,16 +1253,6 @@ func (a *havingWindowAndOrderbyExprResolver) Leave(n ast.Node) (node ast.Node, o
}
case *ast.WindowSpec:
a.inWindowSpec = false
case *ast.ColumnName:
index, err := a.resolveFromSchema(v, a.p.Schema())
if err != nil {
a.err = err
return node, false
}
if index == -1 {
a.err = ErrUnknownColumn.GenWithStackByArgs(v.OrigColName(), clauseMsg[a.curClause])
return node, false
}
case *ast.ColumnNameExpr:
resolveFieldsFirst := true
if a.inAggFunc || a.inWindowFunc || a.inWindowSpec || (a.orderBy && a.inExpr) {
Expand All @@ -1289,7 +1279,7 @@ func (a *havingWindowAndOrderbyExprResolver) Leave(n ast.Node) (node ast.Node, o
}
if index == -1 {
if a.orderBy {
index, a.err = a.resolveFromSchema(v.Name, a.p.Schema())
index, a.err = a.resolveFromSchema(v, a.p.Schema())
} else {
index, a.err = resolveFromSelectFields(v, a.selectFields, true)
}
Expand All @@ -1298,7 +1288,7 @@ func (a *havingWindowAndOrderbyExprResolver) Leave(n ast.Node) (node ast.Node, o
// We should ignore the err when resolving from schema. Because we could resolve successfully
// when considering select fields.
var err error
index, err = a.resolveFromSchema(v.Name, a.p.Schema())
index, err = a.resolveFromSchema(v, a.p.Schema())
_ = err
if index == -1 && a.curClause != windowClause {
index, a.err = resolveFromSelectFields(v, a.selectFields, false)
Expand Down

0 comments on commit 82740f0

Please sign in to comment.