Skip to content

executor: HashJoinExec checks the buildError even if the probeSide is empty (#30471)#30796

Merged
ti-chi-bot merged 4 commits intopingcap:release-5.2from
ti-srebot:release-5.2-80ea2389d8db
Sep 20, 2022
Merged

executor: HashJoinExec checks the buildError even if the probeSide is empty (#30471)#30796
ti-chi-bot merged 4 commits intopingcap:release-5.2from
ti-srebot:release-5.2-80ea2389d8db

Conversation

@ti-srebot
Copy link
Contributor

@ti-srebot ti-srebot commented Dec 16, 2021 •
edited
Loading

cherry-pick #30471 to release-5.2
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/30796

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

git push git@github.com:ti-srebot/tidb.git pr/30796:release-5.2-80ea2389d8db

What problem does this PR solve?

Issue Number: close #30289

Problem Summary:
The issue exposes two problems:

  1. ShuffleExec will trigger nil pointer panic in Close if the Open returns an error before initializing the member attributes.
  2. HashJoinExec should check the buildErr even if the probe side is empty.

What is changed and how it works?

Check List

Tests

Side effects

N/A

Documentation

N/A

Release note

None

@XuHuaiyu @ti-srebot
cherry pick pingcap#30471 to release-5.2
c900271 
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-chi-bot
Copy link
Member

ti-chi-bot commented Dec 16, 2021 •
edited
Loading

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • guo-shaoge
  • wshwsh12

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.

Details

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

ti-srebot commented Dec 16, 2021

/run-all-tests

@ti-chi-bot ti-chi-bot added do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. release-note-none Denotes a PR that doesn't merit a release note. and removed do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. labels Dec 16, 2021
@ti-srebot ti-srebot mentioned this pull request Dec 16, 2021
Merged
1 task
@ti-srebot ti-srebot added sig/execution SIG execution size/M Denotes a PR that changes 30-99 lines, ignoring generated files. type/5.2-cherry-pick type/bugfix This PR fixes a bug. labels Dec 16, 2021
@ti-srebot
Copy link
Contributor Author

ti-srebot commented Dec 16, 2021

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

@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Jan 11, 2022
@VelocityLight VelocityLight added cherry-pick-approved Cherry pick PR approved by release team. and removed do-not-merge/cherry-pick-not-approved labels Sep 19, 2022
@MimeLyc MimeLyc reopened this Sep 19, 2022
@ti-chi-bot ti-chi-bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Sep 19, 2022
@XuHuaiyu
Copy link
Contributor

XuHuaiyu commented Sep 19, 2022

/merge

@ti-chi-bot
Copy link
Member

ti-chi-bot commented Sep 19, 2022

@XuHuaiyu: /merge in this pull request requires 2 approval(s).

Details

In response to this:

/merge

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 added status/LGT2 Indicates that a PR has LGTM 2. and removed status/LGT1 Indicates that a PR has LGTM 1. labels Sep 19, 2022
@XuHuaiyu
Copy link
Contributor

XuHuaiyu commented Sep 19, 2022

/merge

@ti-chi-bot
Copy link
Member

ti-chi-bot commented Sep 19, 2022

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

DetailsCommit hash: 24608a5

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Sep 19, 2022
@ti-chi-bot ti-chi-bot removed status/can-merge Indicates a PR has been approved by a committer. needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. labels Sep 20, 2022
@XuHuaiyu
Copy link
Contributor

XuHuaiyu commented Sep 20, 2022

/merge

@ti-chi-bot
Copy link
Member

ti-chi-bot commented Sep 20, 2022

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

DetailsCommit hash: 425a11d

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Sep 20, 2022
@ti-chi-bot ti-chi-bot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed status/can-merge Indicates a PR has been approved by a committer. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Sep 20, 2022
@XuHuaiyu
Copy link
Contributor

XuHuaiyu commented Sep 20, 2022

/merge

@ti-chi-bot
Copy link
Member

ti-chi-bot commented Sep 20, 2022

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

DetailsCommit hash: 61b6c71

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Sep 20, 2022
@ti-chi-bot ti-chi-bot merged commit bfeca0e into pingcap:release-5.2 Sep 20, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@guo-shaoge guo-shaoge guo-shaoge approved these changes

@wshwsh12 wshwsh12 wshwsh12 approved these changes

Assignees

@XuHuaiyu XuHuaiyu

Labels

cherry-pick-approved Cherry pick PR approved by release team. release-note-none Denotes a PR that doesn't merit a release note. sig/execution SIG execution size/S Denotes a PR that changes 10-29 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/bugfix This PR fixes a bug. type/5.2-cherry-pick

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

7 participants

@ti-srebot @ti-chi-bot @XuHuaiyu @guo-shaoge @wshwsh12 @VelocityLight @MimeLyc