plan: fix concat in group statement #7448
Merged
Conversation
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
|
/run-all-tests |
zz-jason
reviewed
Aug 21, 2018
| err: nil, | ||
| }, | ||
| { | ||
| sql: "select concat(c_str, d_str) from t group by `concat(c_str,d_str)`", |
There was a problem hiding this comment.
This should not result in an error.
There was a problem hiding this comment.
this is the result of mysql:
MySQL(localhost:3306) > select concat(k1, k2) from t group by concat(k1,k2);
+----------------+
| concat(k1, k2) |
+----------------+
| 12 |
+----------------+
1 row in set (0.01 sec)There was a problem hiding this comment.
mysql> select concat(k1, k2) from t group by `concat(k1,k2)`;
ERROR 1054 (42S22): Unknown column 'concat(k1,k2)' in 'group statement'
`concat(k1,k2)` is different from concat(k1,k2).
There was a problem hiding this comment.
It'll be better to add the test case select concat(k1, k2) from t group by concat(k1,k2); here.
There was a problem hiding this comment.
@XuHuaiyu TiDB always support this case.😂
zz-jason
reviewed
Aug 21, 2018
| @@ -849,6 +849,8 @@ func matchField(f *ast.SelectField, col *ast.ColumnNameExpr, ignoreAsName bool) | |||
| if f.AsName.L == "" || ignoreAsName { | |||
| if curCol, isCol := f.Expr.(*ast.ColumnNameExpr); isCol { | |||
| return curCol.Name.Name.L == col.Name.Name.L | |||
| } else if _, isFunc := f.Expr.(*ast.FuncCallExpr); isFunc { | |||
There was a problem hiding this comment.
it's better to add a comment here to explain why we add this check and what issue it fixes.
jackysp
reviewed
Aug 21, 2018
plan/logical_plan_builder.go
Outdated
| @@ -849,6 +849,13 @@ func matchField(f *ast.SelectField, col *ast.ColumnNameExpr, ignoreAsName bool) | |||
| if f.AsName.L == "" || ignoreAsName { | |||
| if curCol, isCol := f.Expr.(*ast.ColumnNameExpr); isCol { | |||
| return curCol.Name.Name.L == col.Name.Name.L | |||
| } else if _, isFunc := f.Expr.(*ast.FuncCallExpr); isFunc { | |||
| // Fix issue 7331 | |||
| // If ther are some function call in SelectField, we | |||
CaitinChen
reviewed
Aug 21, 2018
plan/logical_plan_builder.go
Outdated
| @@ -849,6 +849,13 @@ func matchField(f *ast.SelectField, col *ast.ColumnNameExpr, ignoreAsName bool) | |||
| if f.AsName.L == "" || ignoreAsName { | |||
| if curCol, isCol := f.Expr.(*ast.ColumnNameExpr); isCol { | |||
| return curCol.Name.Name.L == col.Name.Name.L | |||
| } else if _, isFunc := f.Expr.(*ast.FuncCallExpr); isFunc { | |||
| // Fix issue 7331 | |||
| // If there are some function call in SelectField, we | |||
plan/logical_plan_builder.go
Outdated
| } else if _, isFunc := f.Expr.(*ast.FuncCallExpr); isFunc { | ||
| // Fix issue 7331 | ||
| // If there are some function call in SelectField, we | ||
| // check if ColumnNameExpr in GroupByClause match these FunctionCallExpr |
There was a problem hiding this comment.
match -> matches
these -> the?
|
PTAL @zz-jason |
imtbkcat
added
status/LGT2
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
What problem does this PR solve?
Fix #7331 to make JDBC test happy.
What is changed and how it works?
In MySQL, function name in
SelectFieldListcan be regard asColumnName.For example, in this sql:
concat(Class,petallength)inSelectFieldis aFunctionCallExpr, but it is also a column name of result table.Therefore this SQL is right.
But in TiDB,
FunctionCallExprinSelectFieldwill be ignore whenPlanBuildertry to looking forColumnNameinGroupByClause.Check List
Tests
Code changes
Side effects