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

planner,executor: fix 'select ...(join on partition table) for update' panic (#21148) #25845

Closed

Conversation

ti-srebot
Copy link
Contributor

@ti-srebot ti-srebot commented Jun 30, 2021

cherry-pick #21148 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/25845

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

git push git@github.com:ti-srebot/tidb.git pr/25845:release-5.0-0490590b014c

What problem does this PR solve?

Issue Number: close #20028

Problem Summary:

'select ... for update' need the table ID to construct the lock key.
When this SQL works on a partitioned table, the table ID should be partition ID.

So how to get that partition ID?
In http://github.com/pingcap/tidb/pull/14921 I try to avoid column pruning of the partition columns,
so we can get the partition column data, and then use it to calculate the partition to get the ID.

That fix works on a single table, but not the joining of tables.

What is changed and how it works?

What's Changed:

In the logical plan phase, if buildSelectLock find itself works on partitioned tables,
change the schema add an extra partition ID column to the DataSource.

Some tiny changes in the column pruning step to get the correct schema.

In the TableReader executor, fill the extra partition ID column in the chunk row.

In the SelectLockExec, use the partition ID from the chunk row, to construct the correct lock key.

How it Works:

Let the table reader return an extra column with partition ID, so the
SelectLockExec can use that partition ID to construct the lock key.

Related changes

  • Need to cherry-pick to the release branch

Check List

Tests

  • Unit test

Release note

  • Fix panic when 'select ... for update' works on a join operation and the join uses partition table

Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot ti-srebot requested review from a team as code owners June 30, 2021 07:06
@ti-srebot ti-srebot requested review from lzmhhh123 and removed request for a team June 30, 2021 07:06
@ti-chi-bot
Copy link
Member

[REVIEW NOTIFICATION]

This pull request has not been approved.

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-srebot ti-srebot added sig/execution SIG execution sig/planner SIG: Planner size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. type/5.0-cherry-pick type/bugfix This PR fixes a bug. labels Jun 30, 2021
@ti-srebot ti-srebot added this to the v5.0.3 milestone Jun 30, 2021
@ti-srebot
Copy link
Contributor Author

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

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.

ci need to be fixed

@lzmhhh123 lzmhhh123 removed their request for review July 5, 2021 02:08
@tiancaiamao
Copy link
Contributor

Done @XuHuaiyu

@tiancaiamao
Copy link
Contributor

Do not merge it for now ...
This PR fix one bug but introduce other bugs, it must be merged with the following on fix PRs

#26250
#26266
#25528

@zhouqiang-cl zhouqiang-cl added the cherry-pick-approved Cherry pick PR approved by release team. label Aug 12, 2021
@tiancaiamao tiancaiamao closed this Sep 6, 2021
@tiancaiamao tiancaiamao deleted the release-5.0-0490590b014c branch September 6, 2021 06:29
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/planner SIG: Planner size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. 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.

5 participants