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 table id to partition id mapping in select lock executor (#26380) #26631

Merged
merged 9 commits into from
Sep 16, 2021

Conversation

ti-srebot
Copy link
Contributor

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

cherry-pick #26380 to release-5.1
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/26631

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

git push git@github.com:ti-srebot/tidb.git pr/26631:release-5.1-cdc03978c1c5

What problem does this PR solve?

Issue Number: close #26251

Problem Summary:

What is changed and how it works?

What's Changed:

In SelectLock executor, tblID2PIDColumnIndex map the table ID to partition ID column, the partition ID is obtained by

offset := e.tblID2PIDColumnIndex[id]
physicalID = row.GetInt64(offset)

In some cases like #26251, the table is not a partition table, so it's not in tblID2PIDColumnIndex
The original table ID should be used, instead of try to mapping it to partition ID.

How it Works:

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

  • Fix a bug 'select for update' does not correctly lock the data when a normal table join a partition table.

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

ti-chi-bot commented Jul 27, 2021

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • XuHuaiyu
  • qw4990

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 ti-srebot requested a review from a team as a code owner July 27, 2021 05:07
@ti-srebot ti-srebot requested review from wshwsh12 and removed request for a team July 27, 2021 05:07
@ti-chi-bot
Copy link
Member

@ti-srebot: Adding the "do-not-merge/release-note-label-needed" label because no release-note block was detected, please follow our release note process to remove it.

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 kubernetes/test-infra repository.

@ti-srebot
Copy link
Contributor Author

/run-all-tests

@ti-chi-bot ti-chi-bot added the do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. label Jul 27, 2021
@ti-chi-bot
Copy link
Member

@ti-srebot: Adding the "do-not-merge/release-note-label-needed" label because no release-note block was detected, please follow our release note process to remove it.

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 kubernetes/test-infra repository.

@ti-srebot ti-srebot added sig/execution SIG execution size/M Denotes a PR that changes 30-99 lines, ignoring generated files. type/5.1-cherry-pick labels Jul 27, 2021
@ti-srebot ti-srebot added this to the v5.1.1 milestone Jul 27, 2021
@ti-srebot
Copy link
Contributor Author

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

@tiancaiamao
Copy link
Contributor

PTAL @XuHuaiyu @qw4990

Copy link
Contributor

@XuHuaiyu XuHuaiyu 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 Jul 28, 2021
@wshwsh12 wshwsh12 removed their request for review July 30, 2021 06:53
@zhouqiang-cl zhouqiang-cl removed the do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. label Aug 4, 2021
@ti-srebot ti-srebot requested a review from a team as a code owner August 5, 2021 07:07
@tiancaiamao
Copy link
Contributor

Since this bug fix depends on a previous fix #26373, I also pick that PR here.
Both are just one line change.

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

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: 38606e3

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Sep 16, 2021
@ti-chi-bot
Copy link
Member

@ti-srebot: Your PR was out of date, I have automatically updated it for you.

At the same time I will also trigger all tests for you:

/run-all-tests

If the CI test fails, you just re-trigger the test that failed and the bot will merge the PR for you after the CI passes.

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 ti-chi-bot merged commit 886689c into pingcap:release-5.1 Sep 16, 2021
@zhouqiang-cl zhouqiang-cl modified the milestones: v5.1.1, v5.0.4, v5.1.2 Sep 18, 2021
@tiancaiamao tiancaiamao deleted the release-5.1-cdc03978c1c5 branch September 28, 2021 03:24
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 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/5.1-cherry-pick
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants