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: return error from indexHashJoin worker to main thread #18573

Merged
merged 5 commits into from
Jul 15, 2020

Conversation

XuHuaiyu
Copy link
Contributor

What problem does this PR solve?

Issue Number: close #18572

Problem Summary:
Before this commit, the error happened during the outer/inner worker of indexHashJoin is not returned to the main thread.

What is changed and how it works?

What's Changed:
As the title says.

How it Works:

Related changes

  • Need to cherry-pick to the release branch
    v4.0.0

Check List

Tests

  • Integration test

Side effects

N/A

Release note

  • Return an error instead of an empty set for IndexHashJoin when an error happens during execution.

@XuHuaiyu XuHuaiyu added type/bugfix This PR fixes a bug. sig/execution SIG execution labels Jul 15, 2020
@XuHuaiyu XuHuaiyu requested a review from a team as a code owner July 15, 2020 05:17
@XuHuaiyu XuHuaiyu requested review from qw4990 and lzmhhh123 and removed request for a team July 15, 2020 05:17
@XuHuaiyu XuHuaiyu requested a review from SunRunAway July 15, 2020 06:29
@codecov
Copy link

codecov bot commented Jul 15, 2020

Codecov Report

Merging #18573 into master will not change coverage.
The diff coverage is n/a.

@@             Coverage Diff             @@
##             master     #18573   +/-   ##
===========================================
  Coverage   79.5119%   79.5119%           
===========================================
  Files           540        540           
  Lines        145758     145758           
===========================================
  Hits         115895     115895           
  Misses        20537      20537           
  Partials       9326       9326           

Copy link
Contributor

@qw4990 qw4990 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 Jul 15, 2020
lzmhhh123
lzmhhh123 previously approved these changes Jul 15, 2020
Copy link
Contributor

@lzmhhh123 lzmhhh123 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 removed the status/LGT1 Indicates that a PR has LGTM 1. label Jul 15, 2020
ti-srebot
ti-srebot previously approved these changes Jul 15, 2020
@ti-srebot ti-srebot added the status/LGT2 Indicates that a PR has LGTM 2. label Jul 15, 2020
@lzmhhh123
Copy link
Contributor

/merge

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

Your auto merge job has been accepted, waiting for:

  • 18514

@ti-srebot
Copy link
Contributor

/run-all-tests

@ti-srebot
Copy link
Contributor

@XuHuaiyu merge failed.

@XuHuaiyu
Copy link
Contributor Author

/run-common-test
/run-integration-common-test
/run-unit-test

@XuHuaiyu
Copy link
Contributor Author

/run-integration-copr-test

@XuHuaiyu
Copy link
Contributor Author

/run-common-test

@XuHuaiyu
Copy link
Contributor Author

/run-all-tests

Copy link
Contributor

@SunRunAway SunRunAway 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 removed the status/LGT2 Indicates that a PR has LGTM 2. label Jul 15, 2020
@ti-srebot ti-srebot added the status/LGT3 The PR has already had 3 LGTM. label Jul 15, 2020
@SunRunAway
Copy link
Contributor

/merge

@ti-srebot
Copy link
Contributor

Your auto merge job has been accepted, waiting for:

  • 18441

@ti-srebot
Copy link
Contributor

/run-all-tests

@ti-srebot
Copy link
Contributor

@XuHuaiyu merge failed.

@XuHuaiyu
Copy link
Contributor Author

/run-integration-common-test

@XuHuaiyu
Copy link
Contributor Author

/run-sqllogic-test-2

@XuHuaiyu
Copy link
Contributor Author

/run-unit-test

@XuHuaiyu XuHuaiyu changed the title executor: return error from indexHashJoin worker to the main thread executor: return error from indexHashJoin worker to main thread Jul 15, 2020
@XuHuaiyu XuHuaiyu merged commit c2b56e9 into pingcap:master Jul 15, 2020
@XuHuaiyu XuHuaiyu deleted the issue18572 branch July 15, 2020 08:41
ti-srebot pushed a commit to ti-srebot/tidb that referenced this pull request Jul 15, 2020
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot
Copy link
Contributor

cherry pick to release-4.0 in PR #18586

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
sig/execution SIG execution status/can-merge Indicates a PR has been approved by a committer. status/LGT3 The PR has already had 3 LGTM. type/bugfix This PR fixes a bug.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

indexHashJoin should return oom error instead of empty set
5 participants