plan: fix a bug when 'only_full_group_by' is set in sql_mode #6734
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -1286,6 +1286,14 @@ func checkExprInGroupBy(p LogicalPlan, expr ast.ExprNode, offset int, loc string | |
| } | ||
|
|
||
| func (b *planBuilder) checkOnlyFullGroupBy(p LogicalPlan, fields []*ast.SelectField, orderBy *ast.OrderByClause, gby *ast.GroupByClause, from ast.ResultSetNode, where ast.ExprNode) { | ||
| if gby != nil { | ||
| b.checkOnlyFullGroupByWithGroupClause(p, fields, orderBy, gby, from, where) | ||
| return | ||
| } | ||
| b.checkOnlyFullGroupByWithOutGroupClause(p, fields) | ||
| } | ||
|
|
||
| func (b *planBuilder) checkOnlyFullGroupByWithGroupClause(p LogicalPlan, fields []*ast.SelectField, orderBy *ast.OrderByClause, gby *ast.GroupByClause, from ast.ResultSetNode, where ast.ExprNode) { | ||
| gbyCols := make(map[*expression.Column]struct{}, len(fields)) | ||
| gbyExprs := make([]ast.ExprNode, 0, len(fields)) | ||
| schema := p.Schema() | ||
|
|
@@ -1342,6 +1350,51 @@ func (b *planBuilder) checkOnlyFullGroupBy(p LogicalPlan, fields []*ast.SelectFi | |
| } | ||
| } | ||
|
|
||
| func (b *planBuilder) checkOnlyFullGroupByWithOutGroupClause(p LogicalPlan, fields []*ast.SelectField) { | ||
| resolver := colResolverForOnlyFullGroupBy{} | ||
| //for idx, field := range fields { | ||
|
|
||
| for idx, field := range fields { | ||
| resolver.exprIdx = idx | ||
| field.Accept(&resolver) | ||
| if err := resolver.Check(); err != nil { | ||
| b.err = err | ||
|
|
||
| return | ||
| } | ||
| } | ||
| } | ||
|
|
||
| type colResolverForOnlyFullGroupBy struct { | ||
|
|
||
| firstNonAggCol *ast.ColumnName | ||
| exprIdx int | ||
| firstNonAggColIdex int | ||
| hasAggFunc bool | ||
| } | ||
|
|
||
| func (c *colResolverForOnlyFullGroupBy) Enter(node ast.Node) (ast.Node, bool) { | ||
| switch node.(type) { | ||
|
There was a problem hiding this comment. use |
||
| case *ast.AggregateFuncExpr: | ||
| c.hasAggFunc = true | ||
| return node, true | ||
| case *ast.ColumnNameExpr: | ||
| if c.firstNonAggCol == nil { | ||
| c.firstNonAggCol, c.firstNonAggColIdex = node.(*ast.ColumnNameExpr).Name, c.exprIdx | ||
| } | ||
| return node, true | ||
| } | ||
| return node, false | ||
| } | ||
|
|
||
| func (c *colResolverForOnlyFullGroupBy) Leave(node ast.Node) (ast.Node, bool) { | ||
| return node, true | ||
| } | ||
|
|
||
| func (c *colResolverForOnlyFullGroupBy) Check() error { | ||
| if c.hasAggFunc && c.firstNonAggCol != nil { | ||
|
There was a problem hiding this comment. How about There was a problem hiding this comment. No, this situation is not handled by this checker. ColumnRefs in predicates is not affected under this circumstance because predicates are processed prior to aggregations. There was a problem hiding this comment. At least, this PR is an improvement. @shenli |
||
| return ErrMixOfGroupFuncAndFields.GenByArgs(c.firstNonAggColIdex+1, c.firstNonAggCol.Name.O) | ||
| } | ||
| return nil | ||
| } | ||
|
|
||
| type colResolver struct { | ||
| p LogicalPlan | ||
| cols map[*expression.Column]struct{} | ||
|
|
@@ -1512,10 +1565,11 @@ func (b *planBuilder) buildSelect(sel *ast.SelectStmt) LogicalPlan { | |
| if b.err != nil { | ||
| return nil | ||
| } | ||
| } | ||
| if b.ctx.GetSessionVars().SQLMode.HasOnlyFullGroupBy() && sel.From != nil { | ||
| b.checkOnlyFullGroupBy(p, sel.Fields.Fields, sel.OrderBy, sel.GroupBy, sel.From.TableRefs, sel.Where) | ||
| } | ||
|
|
||
| // We must resolve having and order by clause before build projection, | ||
| // because when the query is "select a+1 as b from t having sum(b) < 0", we must replace sum(b) to sum(a+1), | ||
| // which only can be done before building projection and extracting Agg functions. | ||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please check this error.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done. @zimulala PTAL :)