plan:fix case-when and coalesce type inferer #2918
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
coocood
previously approved these changes
Mar 24, 2017
plan/typeinferer.go
Outdated
| return &currType | ||
| } | ||
|
|
||
| func aggClassType(args []ast.ExprNode, flag *uint) types.TypeClass { |
There was a problem hiding this comment.
Rename to 'aggTypeClass' it better.
plan/typeinferer.go
Outdated
| @@ -544,6 +557,20 @@ func (v *typeInferrer) convertValueToColumnTypeIfNeeded(x *ast.PatternInExpr) { | |||
| } | |||
|
|
|||
| func aggArgsType(args []ast.ExprNode) *types.FieldType { | |||
There was a problem hiding this comment.
Rename to aggFieldType is better.
plan/typeinferer.go
Outdated
| if unsigned { | ||
| ft.Flag |= mysql.UnsignedFlag | ||
| *flag |= mysql.UnsignedFlag | ||
| } |
There was a problem hiding this comment.
} else {
*flag &= ^mysql.UnsignedFlag
}
plan/typeinferer.go
Outdated
| @@ -411,7 +411,22 @@ func (v *typeInferrer) handleFuncCallExpr(x *ast.FuncCallExpr) { | |||
| chs = v.defaultCharset | |||
| tp.Flen = 40 | |||
| case ast.Coalesce: | |||
| var gotBinString bool | |||
There was a problem hiding this comment.
This can be computed and returned in aggClassType.
plan/typeinferer.go
Outdated
| currType.Charset = t.Charset | ||
| currType.Collate = t.Collate | ||
| var gotBinString = false | ||
| exprs := make([]ast.ExprNode, len(x.WhenClauses)) |
There was a problem hiding this comment.
Need a larger capacity slice for else.
plan/typeinferer.go
Outdated
| for i, w := range x.WhenClauses { | ||
| exprs[i] = w.Result | ||
| ft := w.Result.GetType() | ||
| if ft.ToClass() == types.ClassString && mysql.HasBinaryFlag(ft.Flag) { |
|
PTAL @coocood |
coocood
reviewed
Mar 24, 2017
plan/typeinferer.go
Outdated
| for _, arg := range args { | ||
| argFieldType := arg.GetType() | ||
| if argFieldType.Tp == mysql.TypeNull { | ||
| continue | ||
| } | ||
| if argFieldType.ToClass() == types.ClassString && mysql.HasBinaryFlag(argFieldType.Flag) { |
There was a problem hiding this comment.
argTypeClass := argFieldType.ToClass()
Then it can be used multiple times.
plan/typeinferer.go
Outdated
| ft.Charset, ft.Collate = types.DefaultCharsetForType(ft.Tp) | ||
| return ft | ||
| if tpClass == types.ClassString && !gotBinString { | ||
| *flag &= ^uint(mysql.BinaryFlag) |
There was a problem hiding this comment.
This is repeated work.
Better define a function that turn flag on and off like
func setTypeFlag(*flag uint, flagItem uint, on bool)
|
LGTM |
Conflicts: plan/typeinferer_test.go �:q!
Conflicts: plan/typeinferer_test.go �:q!
XuHuaiyu
force-pushed
the
xhy/infer-case
branch
from
81a0375 to
0f21c32
Compare
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.
fix issue #2911
refer to MySQL:
https://github.com/mysql/mysql-server/blob/5.7/sql/item_cmpfunc.cc#L4341
https://github.com/mysql/mysql-server/blob/5.7/sql/item_cmpfunc.cc#L4037
PTAL @coocood @shenli @hanfei1991 @tiancaiamao @zimulala