*: set and use Flags to properly handle truncate error #2212
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
StatementContext is also updated according to Flags.
hanfei1991
reviewed
Dec 9, 2016
| @@ -374,7 +373,7 @@ func testStrToUint(c *C, str string, expect uint64, truncateAsErr bool, expectEr | |||
|
|
|||
| func testStrToFloat(c *C, str string, expect float64, truncateAsErr bool, expectErr error) { | |||
There was a problem hiding this comment.
Why not pass IgnoreTruncate directly?
There was a problem hiding this comment.
Then too many test case need to change.
| if sc.TruncateAsWarning { | ||
| sc.AppendWarning(ErrTruncated) | ||
| } else { | ||
| err = ErrTruncated |
| tk.MustExec("insert sc values ('1.8'+1)") | ||
| tk.MustQuery("select * from sc").Check(testkit.Rows("3")) | ||
|
|
||
| // handle coprocessor flags, '1x' is an invalid data. |
There was a problem hiding this comment.
handle -> Handle , same as next line
| strictModeSQL = "set sql_mode = 'STRICT_TRANS_TABLES'" | ||
| nonStrictModeSQL = "set sql_mode = ''" | ||
| ) | ||
|
|
||
| func (s *testSuite) TestStatementContext(c *C) { | ||
| tk := testkit.NewTestKit(c, s.store) |
| // FlagsToStatementContext creates a StatementContext from a `tipb.SelectRequest.Flags`. | ||
| func FlagsToStatementContext(flags uint64) *variable.StatementContext { | ||
| sc := new(variable.StatementContext) | ||
| sc.IgnoreTruncate = flags&FlagIgnoreTruncate > 0 |
There was a problem hiding this comment.
(flags & flagignoreTruncate) != 0 is more cleare
zimulala
reviewed
Dec 9, 2016
| @@ -986,8 +986,12 @@ func (d *Datum) convertToMysqlDecimal(sc *variable.StatementContext, target *Fie | |||
| } else if frac != target.Decimal { | |||
| dec.Round(dec, target.Decimal) | |||
| if frac > target.Decimal { | |||
| if sc.TruncateAsError { | |||
| err = errors.Trace(ErrTruncated) | |||
| if !sc.IgnoreTruncate { | |||
There was a problem hiding this comment.
Extract a function to reduce the nested layers and it can be used in convert.go
disksing
reviewed
Dec 9, 2016
| const ( | ||
| FlagIgnoreTruncate uint64 = 1 | ||
| FlagTruncateAsWarning uint64 = 1 << 1 | ||
| ) |
There was a problem hiding this comment.
const (
FlagA = 1 << iota
FlagB
)
There was a problem hiding this comment.
This flag is used by both TiDB and TiKV, we better make it explicit and consistent.
coocood
force-pushed
the
coocood/local-region-flag
branch
from
7e7bab8 to
4e1210d
Compare
hanfei1991
reviewed
Dec 9, 2016
| @@ -348,9 +347,9 @@ func (s *testTypeConvertSuite) TestConvertToString(c *C) { | |||
| } | |||
| } | |||
|
|
|||
| func testStrToInt(c *C, str string, expect int64, truncateAsErr bool, expectErr error) { | |||
| func testStrToInt(c *C, str string, expect int64, truncateAsError bool, expectErr error) { | |||
There was a problem hiding this comment.
Why this function's arg is AsError but the followings is AsErr ?
coocood
force-pushed
the
coocood/local-region-flag
branch
from
4e1210d to
5a3f3cc
Compare
|
@hanfei1991 @disksing @ngaut PTAL |
|
LGTM |
1 similar comment
|
LGTM |
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.
StatementContext is also updated according to Flags.