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.

Sign up for GitHub

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

Jump to bottom

executor: fix table id to partition id mapping in select lock executor #26380

Merged
merged 6 commits into from
Jul 21, 2021
Merged

executor: fix table id to partition id mapping in select lock executor #26380

merged 6 commits into from
Jul 21, 2021

Conversation

tiancaiamao
Copy link
Contributor

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.

@ti-chi-bot ti-chi-bot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Jul 20, 2021
@tiancaiamao
Copy link
Contributor Author

Wait for review after #26373

@tiancaiamao tiancaiamao requested a review from qw4990 July 20, 2021 09:23
@github-actions github-actions bot added the sig/execution SIG execution label Jul 20, 2021
@tiancaiamao
Copy link
Contributor Author

PTAL @zhuo-zhi @qw4990

@ti-chi-bot
Copy link
Member

@zhuo-zhi: Thanks for your review. The bot only counts approvals from reviewers and higher roles in list, but you're still welcome to leave your comments.

In response to this:

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.

@ichn-hu ichn-hu mentioned this pull request Jul 20, 2021
Closed
@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Jul 21, 2021
XuHuaiyu
XuHuaiyu approved these changes Jul 21, 2021
View reviewed changes
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
Copy link
Member

[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-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 21, 2021
@tiancaiamao
Copy link
Contributor Author

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: bf30259

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Jul 21, 2021
@ti-chi-bot ti-chi-bot merged commit cdc0397 into pingcap:master Jul 21, 2021
@tiancaiamao tiancaiamao deleted the issue-26251 branch July 27, 2021 05:06
@tiancaiamao
Copy link
Contributor Author

/run-cherry-pick

ti-srebot pushed a commit to ti-srebot/tidb that referenced this pull request Jul 27, 2021
@tiancaiamao @ti-srebot
cherry pick pingcap#26380 to release-5.1
4870c85 
Signed-off-by: ti-srebot <[email protected]>
@ti-srebot ti-srebot mentioned this pull request Jul 27, 2021
Merged
12 tasks
@ti-srebot
Copy link
Contributor

cherry pick to release-5.1 in PR #26631

ti-chi-bot pushed a commit that referenced this pull request Sep 16, 2021
@ti-srebot
executor: fix table id to partition id mapping in select lock executor (
886689c 
#26380) (#26631)
@Yisaer Yisaer mentioned this pull request Nov 23, 2021
Closed
@zyguan zyguan mentioned this pull request Dec 3, 2021
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@qw4990 qw4990 qw4990 approved these changes

@XuHuaiyu XuHuaiyu XuHuaiyu approved these changes

@zhuo-zhi zhuo-zhi zhuo-zhi approved these changes

Assignees
No one assigned
Labels
needs-cherry-pick-release-5.1 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.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Join partition table with normal table for update should lock normal table but not
6 participants
@tiancaiamao @ti-chi-bot @ti-srebot @qw4990 @XuHuaiyu @zhuo-zhi