Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

load: fix load data with non-utf8 will succeed (#26054) #26142

Merged
merged 2 commits into from
Jul 15, 2021

Conversation

ti-srebot
Copy link
Contributor

@ti-srebot ti-srebot commented Jul 12, 2021

cherry-pick #26054 to release-4.0
You can switch your code base to this Pull Request by using git-extras:

# In tidb repo:
git pr https://github.com/pingcap/tidb/pull/26142

After apply modifications, you can push your change to this PR via:

git push git@github.com:ti-srebot/tidb.git pr/26142:release-4.0-d070f708cd62

Signed-off-by: ailinkid 314806019@qq.com

What problem does this PR solve?

Issue Number: close #25979

What is changed and how it works?

How it Works:

Refer: https://dev.mysql.com/doc/refman/8.0/en/load-data.html
With IGNORE or LOCAL, data-interpretation errors become warnings and the load operation continues, even if the SQL mode is restrictive. For examples, see Column Value Assignment.

Reason:
load data into t: CAST(BINARY(X'c2c2c2c2') -> CHAR(2);
the returned truncated value is X'c2c2' which is still invalid without right utf8 encode.

That's is because the loaddata statement's TruncateAsWarning doesn't follow the strict sql mode when keyword ignore and local is turned on.

Related changes

  • PR to update pingcap/docs/pingcap/docs-cn:
  • Need to cherry-pick to the release branch

Check List

Tests

  • Manual test (add detailed scripts or steps below)
Using the real TiKV nodes with TiUP

create table t( `a` varchar(12) DEFAULT NUL);
load data local infile "/home/arenatlx/下载/1111.txt" into table t FIELDS TERMINATED BY '||' LINES TERMINATED BY '\n' (@`a`) set `a` = NULLif(@a,'');

analyze table t // shouldn't have a error here.

1111.txt

Release note

  • load: fix load data with non-utf8 can succeed

Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot
Copy link
Contributor Author

/run-all-tests

@ti-srebot ti-srebot added sig/execution SIG execution sig/sql-infra SIG: SQL Infra size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. type/4.0-cherry-pick labels Jul 12, 2021
@ti-srebot ti-srebot added this to the v4.0.13 milestone Jul 12, 2021
@ti-srebot
Copy link
Contributor Author

@AilinKid you're already a collaborator in bot's repo.

@bb7133
Copy link
Member

bb7133 commented Jul 12, 2021

/lgtm

@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Jul 13, 2021
@AilinKid
Copy link
Contributor

/merge

@ti-chi-bot
Copy link
Member

@AilinKid: /merge in this pull request requires 2 approval(s).

In response to this:

/merge

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the ti-community-infra/tichi repository.

@ti-chi-bot
Copy link
Member

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • jackysp
  • wjhuang2016

To complete the pull request process, please ask the reviewers in the list to review by filling /cc @reviewer in the comment.
After your PR has acquired the required number of LGTMs, you can assign this pull request to the committer in the list by filling /assign @committer in the comment to help you merge this pull request.

The full list of commands accepted by this bot can be found here.

Reviewer can indicate their review by submitting an approval review.
Reviewer can cancel approval by submitting a request changes review.

@ti-chi-bot ti-chi-bot added status/LGT2 Indicates that a PR has LGTM 2. and removed status/LGT1 Indicates that a PR has LGTM 1. labels Jul 13, 2021
@AilinKid
Copy link
Contributor

/merge

@ti-chi-bot
Copy link
Member

This pull request has been accepted and is ready to merge.

Commit hash: 1d2d4a6

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Jul 15, 2021
@ti-chi-bot ti-chi-bot merged commit fb96fe7 into pingcap:release-4.0 Jul 15, 2021
@zhouqiang-cl zhouqiang-cl modified the milestones: v4.0.13, v4.0.14 Jul 19, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cherry-pick-approved Cherry pick PR approved by release team. sig/execution SIG execution sig/sql-infra SIG: SQL Infra size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. status/can-merge Indicates a PR has been approved by a committer. status/LGT2 Indicates that a PR has LGTM 2. type/4.0-cherry-pick
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants