Skip to content
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

Jump to bottom

core: fix subQuery at projection in only_full_group #22416

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
Open

core: fix subQuery at projection in only_full_group #22416

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
073dc43
fix only full group bug
zhaoxugang Jan 16, 2021
88685c6
add test
zhaoxugang Jan 16, 2021
16549f8
fix
zhaoxugang Apr 5, 2021
fea0e68
Merge branch 'master-upstream' into fix-only-full-group
zhaoxugang Jul 3, 2021
d595aa8
Merge branch 'master' into fix-only-full-group
zhaoxugang Jul 25, 2021
437b2b0
Merge branch 'master' into fix-only-full-group
hawkingrei Jan 15, 2022
cf7910d
Merge branch 'master' into fix-only-full-group
hawkingrei Jun 11, 2022
9944d1e
Merge branch 'master' into fix-only-full-group
hawkingrei Jul 15, 2022
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
14 changes: 13 additions & 1 deletion planner/core/logical_plan_builder.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3129,7 +3129,7 @@
if field.Auxiliary {
continue
}
checkExprInGroupByOrIsSingleValue(p, getInnerFromParenthesesAndUnaryPlus(field.Expr), offset, ErrExprInSelect, gbyOrSingleValueColNames, gbyExprs, notInGbyOrSingleValueColNames)
checkExprInGroupByOrIsSingleValue(p, getInnerExpr(field.Expr), offset, ErrExprInSelect, gbyOrSingleValueColNames, gbyExprs, notInGbyOrSingleValueColNames)
}

if sel.OrderBy != nil {
Expand Down Expand Up @@ -6570,6 +6570,18 @@
})
}

func getInnerExpr(expr ast.ExprNode) ast.ExprNode {
expr = getInnerFromParenthesesAndUnaryPlus(expr)

if sqpr, ok := expr.(*ast.SubqueryExpr); ok && sqpr.Query != nil {
if selSt, ok := sqpr.Query.(*ast.SelectStmt); ok && selSt.From == nil &&
len(selSt.Fields.Fields) > 0 {
return getInnerExpr(selSt.Fields.Fields[0].Expr)
}

Check warning on line 6580 in planner/core/logical_plan_builder.go

View check run for this annotation

Codecov / codecov/patch

planner/core/logical_plan_builder.go#L6579-L6580 

Added lines #L6579 - L6580 were not covered by tests
}
return expr
}

func getInnerFromParenthesesAndUnaryPlus(expr ast.ExprNode) ast.ExprNode {
if pexpr, ok := expr.(*ast.ParenthesesExpr); ok {
return getInnerFromParenthesesAndUnaryPlus(pexpr.Expr)
Expand Down