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

Fix error result union scan with apply (#19245) #19297

Merged
merged 3 commits into from
Aug 20, 2020

Conversation

ti-srebot
Copy link
Contributor

cherry-pick #19245 to release-3.0


What problem does this PR solve?

Issue Number: partially solved #19136 for version before 4.0

Problem Summary:

Apply executor would read UnionScan multiple times, so we need to reset some variables in the executor.

What is changed and how it works?

What's Changed:

Implement Close for UnionScan.

Related changes

  • Need to cherry-pick to the 4.0, 3.0 and 3.1

Check List

Tests

  • Unit test

Side effects

No side effects.

Release note

  • Fix error result of apply with union scan on 4.0, 3.0 and 3.1.

Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot
Copy link
Contributor Author

/run-all-tests

@ti-srebot
Copy link
Contributor Author

@ichn-hu please accept the invitation then you can push to the cherry-pick pull requests.
https://github.com/ti-srebot/tidb/invitations

Copy link
Contributor

@wshwsh12 wshwsh12 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-srebot ti-srebot added the status/LGT1 Indicates that a PR has LGTM 1. label Aug 19, 2020
@cfzjywxk
Copy link
Contributor

LGTM

@wshwsh12 wshwsh12 added this to the v3.0.18 milestone Aug 20, 2020
@ti-srebot ti-srebot added status/LGT2 Indicates that a PR has LGTM 2. and removed status/LGT1 Indicates that a PR has LGTM 1. labels Aug 20, 2020
@ti-srebot ti-srebot added status/LGT3 The PR has already had 3 LGTM. and removed status/LGT2 Indicates that a PR has LGTM 2. labels Aug 20, 2020
@jebter
Copy link

jebter commented Aug 20, 2020

/merge

@ti-srebot ti-srebot added the status/can-merge Indicates a PR has been approved by a committer. label Aug 20, 2020
@ti-srebot
Copy link
Contributor Author

/run-all-tests

@jebter
Copy link

jebter commented Aug 20, 2020

/run-unit-test

@ti-srebot
Copy link
Contributor Author

@ti-srebot merge failed.

@jebter
Copy link

jebter commented Aug 20, 2020

/merge

@ti-srebot
Copy link
Contributor Author

/run-all-tests

@ti-srebot ti-srebot merged commit 55615b6 into pingcap:release-3.0 Aug 20, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
status/can-merge Indicates a PR has been approved by a committer. status/LGT3 The PR has already had 3 LGTM. type/3.0-cherry-pick
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants