executor: fix bug that pessimistic lock doesn't work on a partition table when index merge is used

[guo-shaoge]

Signed-off-by: guo-shaoge shaoge1994@163.com

What problem does this PR solve?

Issue Number: close #31024

Problem Summary: just as #31024 said.

What is changed and how it works?

Related to #14921 and #21148.

We need to add extraPIDColumnIndex when build final TableReader for IndexMerge, just like #21148 did.

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 bug that pessimistic lock doesn't work on a partition table when IndexMerge is used

[ti-chi-bot]

[REVIEW NOTIFICATION]

This pull request has been approved by:

• mjonss
• tiancaiamao

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.

[guo-shaoge]

/cc @tiancaiamao

[sre-bot]

Please follow PR Title Format:

• pkg [, pkg2, pkg3]: what is changed

Or if the count of mainly changed packages are more than 3, use

• *: what is changed

After you have format title, you can leave a comment /run-check_title to recheck it

[sre-bot]

Please follow PR Title Format:

• pkg [, pkg2, pkg3]: what is changed

Or if the count of mainly changed packages are more than 3, use

• *: what is changed

After you have format title, you can leave a comment /run-check_title to recheck it

[guo-shaoge]

/run-check_title

[sre-bot]

Please follow PR Title Format:

• pkg [, pkg2, pkg3]: what is changed

Or if the count of mainly changed packages are more than 3, use

• *: what is changed

After you have format title, you can leave a comment /run-check_title to recheck it

[sre-bot]

Please follow PR Title Format:

• pkg [, pkg2, pkg3]: what is changed

Or if the count of mainly changed packages are more than 3, use

• *: what is changed

After you have format title, you can leave a comment /run-check_title to recheck it

[sre-bot]

Please follow PR Title Format:

• pkg [, pkg2, pkg3]: what is changed

Or if the count of mainly changed packages are more than 3, use

• *: what is changed

After you have format title, you can leave a comment /run-check_title to recheck it

[guo-shaoge]

/run-check_title

[sre-bot]

Code Coverage Details: https://codecov.io/github/pingcap/tidb/commit/ee7d6e774c2a99f965e68f3af2b79fef07355974

[tiancaiamao]

I'm planning to fix partition table lock issue using alternative way #30732

The current extraPIDColumn way is buggy and I've abandoned it, see #28666 for another fix on UnionScan

This PR still looks good to me because it add a test and is helpful to prevent regression at least.

[guo-shaoge]

/run-unit-test
/run-check_dev_2

[guo-shaoge]

Guess it's ok to wait for the final fix instead of this temporary fix.

[mjonss]

LGTM

This will fix the issue in static prune mode.

[ti-chi-bot]

@guo-shaoge: PR needs rebase.

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.