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.

Sign up for GitHub

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

Jump to bottom

executor: fix index join error when join key is ENUM or SET (#19235) #19413

Merged
merged 4 commits into from
Aug 25, 2020
Merged

executor: fix index join error when join key is ENUM or SET (#19235) #19413

merged 4 commits into from
Aug 25, 2020

Conversation

ti-srebot
Copy link
Contributor

cherry-pick #19235 to release-3.0

What problem does this PR solve?

Issue Number: close #19233

Problem Summary:

  1. Index join does not handle ErrTruncated if join key is ENUM or SET
  2. Index Hash Join & Index Lookup Join do not handle error well if some unexpected error happens.

What is changed and how it works?

Proposal: xxx

What's Changed:

  1. Treat ErrTruncated when join key is ENUM or SET
  2. Handle ctx.Err() in fetchInnerResults
  3. Also fix some ctx.Err() in other places.

How it Works:

Related changes

  • Need to cherry-pick to the release branch

Check List

Tests

  • Unit test

Release note

  • fix index join error when join key is ENUM or SET

@SunRunAway @ti-srebot
cherry pick pingcap#19235 to release-3.0
94ddf0e 
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot
Copy link
Contributor Author

/run-all-tests

@ti-srebot ti-srebot mentioned this pull request Aug 24, 2020
Merged
@SunRunAway
Copy link
Contributor

/run-all-tests

lzmhhh123
lzmhhh123 reviewed Aug 25, 2020
View reviewed changes
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 added the status/LGT1 Indicates that a PR has LGTM 1. label Aug 25, 2020
fzhedu
fzhedu approved these changes Aug 25, 2020
View reviewed changes
Copy link
Contributor

@fzhedu fzhedu 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 status/LGT2 Indicates that a PR has LGTM 2. and removed status/LGT1 Indicates that a PR has LGTM 1. labels Aug 25, 2020
@SunRunAway
Copy link
Contributor

/merge

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

/merge

@ti-srebot
Copy link
Contributor Author

/run-all-tests

1 similar comment
@ti-srebot
Copy link
Contributor Author

/run-all-tests

@ti-srebot
Copy link
Contributor Author

@ti-srebot merge failed.

@zz-jason
Copy link
Member

/merge

@ti-srebot
Copy link
Contributor Author

Your auto merge job has been accepted, waiting for:

  • 19335
  • 19416

@ti-srebot
Copy link
Contributor Author

/run-all-tests

@ti-srebot
Copy link
Contributor Author

@ti-srebot merge failed.

@SunRunAway SunRunAway mentioned this pull request Aug 25, 2020
Closed
@SunRunAway SunRunAway merged commit 26b5be1 into pingcap:release-3.0 Aug 25, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lzmhhh123 lzmhhh123 lzmhhh123 left review comments

@fzhedu fzhedu fzhedu approved these changes

@qw4990 qw4990 Awaiting requested review from qw4990

Assignees

@SunRunAway SunRunAway

Labels
component/executor component/expression sig/execution SIG execution 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/3.0-cherry-pick
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@ti-srebot @SunRunAway @zz-jason @fzhedu @lzmhhh123