expression, parser: fix issue #3691, cast compatibility #3894
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
…scalar function
Merge branch winkyao/fix_issue_3762 into winkyao/cast_compability
…/cast_compability
…s 2, should return datum, not row
…o handle overflow gracely
…/cast_compability
XuHuaiyu
changed the title
XuHuaiyu
reviewed
Jul 28, 2017
executor/executor_test.go
Outdated
| @@ -1097,6 +1099,75 @@ func (s *testSuite) TestBuiltin(c *C) { | |||
| result = tk.MustQuery("select cast(-1 as unsigned)") | |||
| result.Check(testkit.Rows("18446744073709551615")) | |||
|
|
|||
| // Fix issue #3691, cast compabilities. | |||
There was a problem hiding this comment.
s/ compabilities/ compatibility
expression/builtin_cast.go
Outdated
| @@ -23,12 +23,16 @@ package expression | |||
|
|
|||
| import ( | |||
| "strconv" | |||
| "strings" | |||
|
|
|||
expression/builtin_cast.go
Outdated
| @@ -23,12 +23,16 @@ package expression | |||
|
|
|||
| import ( | |||
| "strconv" | |||
| "strings" | |||
|
|
|||
| "math" | |||
expression/builtin_cast.go
Outdated
| @@ -542,22 +546,24 @@ func (b *builtinCastDecimalAsIntSig) evalInt(row []types.Datum) (res int64, isNu | |||
| if isNull || err != nil { | |||
| return res, isNull, errors.Trace(err) | |||
| } | |||
|
|
|||
| // despite of unsigned or signed, Round is needed | |||
There was a problem hiding this comment.
Round is needed for both unsigned and signed.
plan/typeinfer_test.go
Outdated
| @@ -106,6 +106,7 @@ func (s *testPlanSuite) TestInferType(c *C) { | |||
| {"substr(c_binary, c_int)", mysql.TypeVarString, charset.CharsetBin, mysql.BinaryFlag, 20, types.UnspecifiedLength}, | |||
| {"uuid()", mysql.TypeVarString, charset.CharsetUTF8, 0, 36, types.UnspecifiedLength}, | |||
| {"bit_length(c_char)", mysql.TypeLonglong, charset.CharsetBin, mysql.BinaryFlag, 10, 0}, | |||
|
|
|||
sessionctx/variable/session.go
Outdated
| @@ -422,6 +423,19 @@ func (sc *StatementContext) HandleTruncate(err error) error { | |||
| return err | |||
| } | |||
|
|
|||
| // HandleOverflow treat ErrOverflow as warnings or returns the error bases on the StmtCtx.OverflowAsWarning state. | |||
| @@ -1131,6 +1131,11 @@ func ProduceDecWithSpecifiedTp(dec *MyDecimal, tp *FieldType, sc *variable.State | |||
| } | |||
| } | |||
| } | |||
|
|
|||
| if terror.ErrorEqual(err, ErrOverflow) { | |||
There was a problem hiding this comment.
should we put this check into HandleOverflow ?
There was a problem hiding this comment.
@XuHuaiyu no, because the variable.session.go should not import "types" package, because "types" use "variable" package, it will cause circle import problem
util/types/errors.go
Outdated
| @@ -37,35 +39,46 @@ var ( | |||
| ErrWrongFieldSpec = terror.ClassTypes.New(codeWrongFieldSpec, "Wrong Field Spec") | |||
| // ErrBadNumber is return when parsing an invalid binary decimal number. | |||
| ErrBadNumber = terror.ClassTypes.New(codeBadNumber, "Bad Number") | |||
| // ErrCastSignedOverflow is returned when positive out-of-range integer, and convert to it's negative complement | |||
| ErrCastSignedOverflow = terror.ClassTypes.New(codeUnknown, msgCastSignedOverflow) | |||
| // ErrCastNegIntToUnsigned is returned when a negative integer cast to unsigned | |||
There was a problem hiding this comment.
s/ ErrCastNegIntToUnsigned/ ErrCastNegIntAsUnsigned be better?
s/ cast/ be casted
s/ unsigned/ an unsigned int
add . at the end.
util/types/errors.go
Outdated
| @@ -37,35 +39,46 @@ var ( | |||
| ErrWrongFieldSpec = terror.ClassTypes.New(codeWrongFieldSpec, "Wrong Field Spec") | |||
| // ErrBadNumber is return when parsing an invalid binary decimal number. | |||
| ErrBadNumber = terror.ClassTypes.New(codeBadNumber, "Bad Number") | |||
| // ErrCastSignedOverflow is returned when positive out-of-range integer, and convert to it's negative complement | |||
There was a problem hiding this comment.
- s/ ErrCastSignedOverflow/ ErrCastAsSignedOverflow be better?
- add
.at the end
jackysp
reviewed
Jul 28, 2017
executor/prepared.go
Outdated
| // see https://dev.mysql.com/doc/refman/5.7/en/sql-mode.html#sql-mode-strict | ||
| // said "For statements such as SELECT that do not change data, invalid values | ||
| // generate a warning in strict mode, not an error." | ||
| // and and https://dev.mysql.com/doc/refman/5.7/en/out-of-range-and-overflow.html |
expression/builtin_cast.go
Outdated
| @@ -23,12 +23,16 @@ package expression | |||
|
|
|||
| import ( | |||
| "strconv" | |||
| "strings" | |||
|
|
|||
| "math" | |||
expression/builtin_cast.go
Outdated
| uintRes, err = types.ConvertFloatToUint(sc, floatVal, types.UnsignedUpperBound[mysql.TypeLonglong], mysql.TypeDouble) | ||
| res = int64(uintRes) | ||
| var ures uint64 | ||
| ures, err = to.ToUint() |
There was a problem hiding this comment.
The old name uintRes may be more readable.
XuHuaiyu
reviewed
Jul 31, 2017
util/types/errors.go
Outdated
| msgOverflow = mysql.MySQLErrName[mysql.ErrDataOutOfRange] | ||
| msgOverflow = mysql.MySQLErrName[mysql.ErrDataOutOfRange] | ||
| msgTruncatedWrongVal = mysql.MySQLErrName[mysql.ErrTruncatedWrongValue] | ||
| msgCastSignedOverflow = "Cast to signed converted positive out-of-range integer to it's negative complement" |
There was a problem hiding this comment.
s/ msgCastSignedOverflow/ msgCastAsSignedOverflow
s/ msgCastNegIntToUnsigned/ msgCastNegIntAsUnsigned
expression/builtin_cast.go
Outdated
| @@ -636,6 +641,27 @@ type builtinCastStringAsIntSig struct { | |||
| baseIntBuiltinFunc | |||
| } | |||
|
|
|||
| func (b *builtinCastStringAsIntSig) handleOverflow(origRes int64, origStr string, origErr error, isNegative bool) (res int64, err error) { | |||
There was a problem hiding this comment.
may add a comment for this.
expression/builtin_cast_test.go
Outdated
| sc.OverflowAsWarning = true | ||
|
|
||
| // cast('18446744073709551616' as unsigned); | ||
| tp1 := types.NewFieldType(mysql.TypeLonglong) |
There was a problem hiding this comment.
will this be more readable?
tp1 := &types.FieldType{
Tp:
Flag:
Charset:
....
}
expression/builtin_cast_test.go
Outdated
| // create table t1(s1 time); | ||
| // insert into t1 values('11:11:11'); | ||
| // select cast(s1 as decimal(7, 2)) from t1; | ||
| tpDecimal := types.NewFieldType(mysql.TypeNewDecimal) |
| @@ -5909,6 +5909,7 @@ IntegerType: | |||
| OptInteger: | |||
| {} | |||
| | "INTEGER" | |||
| | "INT" | |||
There was a problem hiding this comment.
add a test case in parser_test
sessionctx/variable/session.go
Outdated
| @@ -422,6 +423,19 @@ func (sc *StatementContext) HandleTruncate(err error) error { | |||
| return err | |||
| } | |||
|
|
|||
| // HandleOverflow treats ErrOverflow as warnings or returns the error bases on the StmtCtx.OverflowAsWarning state. | |||
…/tidb into winkyao/cast_compability
…/cast_compability
|
LGTM |
XuHuaiyu
added
status/LGT2
…/cast_compability
…/tidb into winkyao/cast_compability
XuHuaiyu
approved these changes
Aug 1, 2017
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 #3691, also fix #645
this pr will fail the jenkins, so should be merged together.