types: fix uint64 overflow bug in ConvertJSONToFloat
#11355
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
Signed-off-by: H-ZeX <hzx20112012@gmail.com>
Signed-off-by: H-ZeX <hzx20112012@gmail.com>
Codecov Report
@@ Coverage Diff @@
## master #11355 +/- ##
===============================================
- Coverage 81.5114% 81.277% -0.2345%
===============================================
Files 423 423
Lines 91278 90210 -1068
===============================================
- Hits 74402 73320 -1082
- Misses 11571 11590 +19
+ Partials 5305 5300 -5 |
Codecov Report
@@ Coverage Diff @@
## master #11355 +/- ##
===========================================
Coverage 81.4748% 81.4748%
===========================================
Files 424 424
Lines 91249 91249
===========================================
Hits 74345 74345
Misses 11583 11583
Partials 5321 5321 |
winkyao
reviewed
Jul 22, 2019
| @@ -553,8 +553,7 @@ func ConvertJSONToFloat(sc *stmtctx.StatementContext, j json.BinaryJSON) (float6 | |||
| case json.TypeCodeInt64: | |||
| return float64(j.GetInt64()), nil | |||
| case json.TypeCodeUint64: | |||
| u, err := ConvertIntToUint(sc, j.GetInt64(), IntergerUnsignedUpperBound(mysql.TypeLonglong), mysql.TypeLonglong) | |||
There was a problem hiding this comment.
Should we consider ShouldClipToZero?
There was a problem hiding this comment.
I think we need to consider this.
we extract a uint from the json, it must not < 0.
// GetInt64 gets the int64 value.
func (bj BinaryJSON) GetInt64() int64 {
return int64(endian.Uint64(bj.Value))
}
// GetUint64 gets the uint64 value.
func (bj BinaryJSON) GetUint64() uint64 {
return endian.Uint64(bj.Value)
}
winkyao
reviewed
Jul 24, 2019
bb7133
changed the title
ConvertJSONToFloat
Signed-off-by: H-ZeX <hzx20112012@gmail.com>
winkyao
added
status/can-merge
zz-jason
reviewed
Jul 25, 2019
| result = tk.MustQuery(`select cast(20170118.999 as datetime);`) | ||
| result.Check(testkit.Rows("2017-01-18 00:00:00")) | ||
|
|
||
| tk.MustExec(`create table tb5(a bigint(64) unsigned, b double);`) |
There was a problem hiding this comment.
why not directly create a json column?
There was a problem hiding this comment.
If directly creat json, then I can not get a uint field(#11386 (comment)).
There was a problem hiding this comment.
how about casting '9223372036854775808' to uint then cast to json?
zz-jason
removed
the
status/can-merge
|
/run-all-tests |
|
Ready to merge! |
|
cherry pick to release-2.1 failed |
|
cherry pick to release-3.0 in PR #11433 |
This was referenced Jul 25, 2019
sre-bot
added a commit
that referenced
this pull request
Jul 25, 2019
All tests passed, auto merged by Bot
sre-bot
pushed a commit
that referenced
this pull request
Jul 26, 2019
All tests passed, auto merged by Bot
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?
In the origin version
ConvertIntToUint(sc, j.GetInt64(), IntergerUnsignedUpperBound(mysql.TypeLonglong), mysql.TypeLonglong), whenj.GetInt64()return neg number such as1<<63, thenConvertIntToUintmay treat it as overflow, this is a bug.What is changed and how it works?
Replace
j.GetInt64byj.GetUint64Check List
Tests
Related changes