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

statistics: fix "data too long" error when dumping stats from table with new collation data (#27033) #27299

Merged
merged 4 commits into from
Sep 10, 2021

Conversation

ti-srebot
Copy link
Contributor

@ti-srebot ti-srebot commented Aug 17, 2021

cherry-pick #27033 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/27299

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

git push git@github.com:ti-srebot/tidb.git pr/27299:release-4.0-d06fd67764e6

What problem does this PR solve?

Issue Number: close #27024

When storing a histogram for a new collation column, we store its collate key instead of the original value.
However (1) when loading the histogram into stats cache, we try to convert the bounds of the histogram to the FieldType of this column (2) the collate key of a value is usually longer than the original value.
So when doing the type conversion, the value may exceed the FieldType.Flen, which caused the "Data Too Long" error.

What is changed and how it works?

When loading stats from storage into stats cache, for String values, no longer convert them to the FieldType of this column.
Now we always convert them to TypeBlob to bypass length checks.

Check List

Tests

  • Unit test
  • Integration test
  • Manual test (add detailed scripts or steps below)
  • No code

Side effects

  • Performance regression: Consumes more CPU
  • Performance regression: Consumes more Memory
  • Breaking backward compatibility

Documentation

  • Affects user behaviors
  • Contains syntax changes
  • Contains variable changes
  • Contains experimental features
  • Changes MySQL compatibility

Release note

None

Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-chi-bot
Copy link
Member

ti-chi-bot commented Aug 17, 2021

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • Reminiscent
  • winoros

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-srebot
Copy link
Contributor Author

/run-all-tests

@ti-chi-bot ti-chi-bot added do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. release-note-none Denotes a PR that doesn't merit a release note. and removed do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. labels Aug 17, 2021
@ti-srebot ti-srebot added component/statistics sig/execution SIG execution sig/planner SIG: Planner size/S Denotes a PR that changes 10-29 lines, ignoring generated files. type/4.0-cherry-pick labels Aug 17, 2021
@ti-srebot ti-srebot added this to the v4.0.14 milestone Aug 17, 2021
@ti-srebot
Copy link
Contributor Author

@time-and-fate you're already a collaborator in bot's repo.

@ti-chi-bot ti-chi-bot added size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Aug 17, 2021
@ti-chi-bot ti-chi-bot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Aug 17, 2021
@zhouqiang-cl zhouqiang-cl added the cherry-pick-approved Cherry pick PR approved by release team. label Sep 10, 2021
@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Sep 10, 2021
@ti-chi-bot ti-chi-bot removed the status/LGT1 Indicates that a PR has LGTM 1. label Sep 10, 2021
@ti-chi-bot ti-chi-bot added the status/LGT2 Indicates that a PR has LGTM 2. label Sep 10, 2021
@Reminiscent
Copy link
Contributor

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: c1ce5fe

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Sep 10, 2021
@ti-chi-bot ti-chi-bot merged commit 540493b into pingcap:release-4.0 Sep 10, 2021
@zhouqiang-cl zhouqiang-cl modified the milestones: v4.0.14, v4.0.15 Sep 14, 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. component/statistics release-note-none Denotes a PR that doesn't merit a release note. sig/execution SIG execution sig/planner SIG: Planner size/M Denotes a PR that changes 30-99 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.

6 participants