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 prepared stale read statement not work (#25746) #25800

Merged
merged 11 commits into from
Jul 19, 2021

Conversation

ti-srebot
Copy link
Contributor

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

cherry-pick #25746 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/25800

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

git push git@github.com:ti-srebot/tidb.git pr/25800:release-5.1-0376dc0c5410

Signed-off-by: yisaer disxiaofei@163.com

What problem does this PR solve?

The prepared stale read statement won't work in the following case:

1. prepare s from 'select * from t as of timestamp ts`
2. execute s (the request didn't have stale_read flag and with no local stale read ability)
1. prepare s from 'select * from t`
2. start transaction read only as of timestamp ts
3. execute s  (should be stale read while it isn't)
1. prepare s from 'select * from t`
2. set transaction read only as of timestamp ts
3. execute s  (should be stale read while it isn't)

What is changed and how it works?

Fixed these problems.

  • Unit test

Release note

  • Make Stale Read fully support prepare statement

Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot ti-srebot requested review from a team as code owners June 28, 2021 09:55
@ti-srebot ti-srebot requested review from lzmhhh123 and removed request for a team June 28, 2021 09:55
@ti-srebot
Copy link
Contributor Author

/run-all-tests

@ti-srebot
Copy link
Contributor Author

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

@github-actions github-actions bot added the sig/execution SIG execution label Jun 28, 2021
Yisaer added 3 commits June 28, 2021 18:50
Signed-off-by: yisaer <disxiaofei@163.com>
Signed-off-by: yisaer <disxiaofei@163.com>
Signed-off-by: yisaer <disxiaofei@163.com>
@ti-chi-bot ti-chi-bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jun 29, 2021
@lzmhhh123 lzmhhh123 removed their request for review July 5, 2021 02:08
@nolouch nolouch removed the request for review from a team July 6, 2021 07:19
@nolouch nolouch removed the sig/execution SIG execution label Jul 15, 2021
@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Jul 15, 2021
@nolouch
Copy link
Member

nolouch commented Jul 15, 2021

@Yisaer please fix the conflicts.

@ti-chi-bot ti-chi-bot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jul 15, 2021
@ti-chi-bot
Copy link
Member

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • nolouch
  • xhebox

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 removed the status/LGT1 Indicates that a PR has LGTM 1. label Jul 15, 2021
@ti-chi-bot ti-chi-bot added the status/LGT2 Indicates that a PR has LGTM 2. label Jul 15, 2021
Signed-off-by: xhe <xw897002528@gmail.com>
@github-actions github-actions bot added the sig/execution SIG execution label Jul 15, 2021
Signed-off-by: yisaer <disxiaofei@163.com>
@Yisaer
Copy link
Contributor

Yisaer commented Jul 15, 2021

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: 6a1e65d

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Jul 15, 2021
@zhouqiang-cl zhouqiang-cl added the cherry-pick-approved Cherry pick PR approved by release team. label Jul 16, 2021
@nolouch nolouch removed the sig/execution SIG execution label Jul 16, 2021
@nolouch
Copy link
Member

nolouch commented Jul 16, 2021

/merge

@github-actions github-actions bot added the sig/execution SIG execution label Jul 16, 2021
@nolouch
Copy link
Member

nolouch commented Jul 16, 2021

/run_check_dev

3 similar comments
@xhebox
Copy link
Contributor

xhebox commented Jul 17, 2021

/run_check_dev

@zhouqiang-cl
Copy link
Contributor

/run_check_dev

@zhouqiang-cl
Copy link
Contributor

/run_check_dev

@zhouqiang-cl
Copy link
Contributor

/run-check_dev

@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 6cae8ae into pingcap:release-5.1 Jul 19, 2021
@zhouqiang-cl zhouqiang-cl added this to the v5.1.1 milestone Jul 26, 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 size/L Denotes a PR that changes 100-499 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