*: revert #10124 and remove sql mode PadCharToFullLength
#14007
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
winoros
added
type/bugfix
ghost
requested review from
winoros
force-pushed
the
revert-10124
branch
from
d8e8bcc
to
8fd0024
Compare
Codecov Report
@@ Coverage Diff @@
## master #14007 +/- ##
===============================================
- Coverage 80.2931% 80.153% -0.1401%
===============================================
Files 483 481 -2
Lines 122130 120452 -1678
===============================================
- Hits 98062 96546 -1516
+ Misses 16317 16189 -128
+ Partials 7751 7717 -34 |
winoros
commented
Dec 10, 2019
| @@ -186,7 +185,9 @@ func encodeIndexKey(e *baseExecutor, tblInfo *model.TableInfo, idxInfo *model.In | |||
| for i := range idxVals { | |||
| colInfo := tblInfo.Columns[idxInfo.Columns[i].Offset] | |||
| if colInfo.Tp == mysql.TypeString || colInfo.Tp == mysql.TypeVarString || colInfo.Tp == mysql.TypeVarchar { | |||
| idxVals[i], err = ranger.HandlePadCharToFullLength(sc, &colInfo.FieldType, idxVals[i]) | |||
| var str string | |||
| str, err = idxVals[i].ToString() | |||
There was a problem hiding this comment.
table.CastValue will append 0x0 if the string value's length is smaller than the BINARY column's length.
So here keep this if branch, don't use table.CastValue on string values
There was a problem hiding this comment.
Add this comment into code as well?
eurekaka
reviewed
Dec 12, 2019
There was a problem hiding this comment.
LGTM. Don't forget to update compatibility doc https://github.com/pingcap/docs/blob/master/v2.0/sql/mysql-compatibility.md as well.
| @@ -186,7 +185,9 @@ func encodeIndexKey(e *baseExecutor, tblInfo *model.TableInfo, idxInfo *model.In | |||
| for i := range idxVals { | |||
| colInfo := tblInfo.Columns[idxInfo.Columns[i].Offset] | |||
| if colInfo.Tp == mysql.TypeString || colInfo.Tp == mysql.TypeVarString || colInfo.Tp == mysql.TypeVarchar { | |||
| idxVals[i], err = ranger.HandlePadCharToFullLength(sc, &colInfo.FieldType, idxVals[i]) | |||
| var str string | |||
| str, err = idxVals[i].ToString() | |||
There was a problem hiding this comment.
Add this comment into code as well?
lzmhhh123
reviewed
Dec 12, 2019
lzmhhh123
added
status/can-merge
|
/run-all-tests |
|
@winoros merge failed. |
|
/rebuild |
|
cherry pick to release-3.0 failed |
winoros
added a commit
to winoros/tidb
that referenced
this pull request
Dec 20, 2019
sre-bot
pushed a commit
that referenced
this pull request
Dec 20, 2019
XiaTianliang
pushed a commit
to XiaTianliang/tidb
that referenced
this pull request
Dec 21, 2019
6 tasks
This was referenced May 19, 2021
11 tasks
This was referenced May 19, 2021
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?
Remove the sql mode
PadCharToFullLength. Since MySQL 8.0 will remove it soon.After this pr, when scan data/compare data, we won't ignore the trailing space.
Check List
Tests
Code changes
Related changes
Release note