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

executor: fix point_get result on clustered index when new-row-format disabled but new-collation enabled (#24544) #24611

Merged
merged 2 commits into from
May 26, 2021

Conversation

ti-srebot
Copy link
Contributor

@ti-srebot ti-srebot commented May 13, 2021

cherry-pick #24544 to release-5.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/24611

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

git push git@github.com:ti-srebot/tidb.git pr/24611:release-5.0-acf2e82b5227

What problem does this PR solve?

Issue Number: close #24541

Problem Summary:

Point-Get will directly decode row to chunk

but the code path for "decode row to chunk" doesn't handle new collation correctly for handle columns.

What is changed and how it works?

What's Changed, How it Works:

check NeedRestoredData before try to use handle's datum.

Related changes

  • Need to cherry-pick to the release branch 5.0

Check List

Tests

  • Unit test(not useful, due to unistore doesn't support old row format)
  • Integration test

Side effects

  • n/a

Release note

  • Fix bug that point query maybe get wrong on the clustered index when new-collation enabled but new-row-format disabled

Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot ti-srebot requested a review from a team as a code owner May 13, 2021 04:46
@ti-srebot ti-srebot requested review from XuHuaiyu and removed request for a team May 13, 2021 04:46
@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/S Denotes a PR that changes 10-29 lines, ignoring generated files. type/5.0-cherry-pick type/bugfix This PR fixes a bug. labels May 13, 2021
@ti-srebot ti-srebot added this to the v5.0.1 milestone May 13, 2021
@ti-srebot
Copy link
Contributor Author

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

Copy link
Contributor

@cfzjywxk cfzjywxk left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

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

/lgtm

@ti-chi-bot
Copy link
Member

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • cfzjywxk
  • 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 writing /lgtm in a comment.
Reviewer can cancel approval by writing /lgtm cancel in a comment.

@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 May 13, 2021
@zhouqiang-cl zhouqiang-cl added the cherry-pick-approved Cherry pick PR approved by release team. label May 26, 2021
@lysu
Copy link
Contributor

lysu commented May 26, 2021

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: 6d075f4

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label May 26, 2021
@ti-chi-bot ti-chi-bot merged commit fa8d140 into pingcap:release-5.0 May 26, 2021
@zhouqiang-cl zhouqiang-cl modified the milestones: v5.0.1, v5.0.2 Jun 1, 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/S Denotes a PR that changes 10-29 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/bugfix This PR fixes a bug. type/5.0-cherry-pick
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants