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

Merged
merged 3 commits into from
Aug 24, 2020
Merged

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

merged 3 commits into from
Aug 24, 2020

Conversation

SunRunAway
Copy link
Contributor

@SunRunAway SunRunAway commented Aug 17, 2020 •
edited
Loading

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 SunRunAway requested a review from a team as a code owner August 17, 2020 08:06
@SunRunAway SunRunAway requested review from qw4990 and removed request for a team August 17, 2020 08:06
@SunRunAway SunRunAway added the type/bugfix This PR fixes a bug. label Aug 17, 2020
@SunRunAway
Copy link
Contributor Author

/run-all-tests

@SunRunAway SunRunAway closed this Aug 17, 2020
@SunRunAway SunRunAway reopened this Aug 17, 2020
@SunRunAway
Copy link
Contributor Author

/run-all-tests

@SunRunAway
Copy link
Contributor Author

/run-check_dev_2

lzmhhh123
lzmhhh123 reviewed Aug 17, 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 17, 2020
@SunRunAway SunRunAway requested a review from fzhedu August 18, 2020 04:37
qw4990
qw4990 approved these changes Aug 18, 2020
View reviewed changes
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 status/LGT2 Indicates that a PR has LGTM 2. and removed status/LGT1 Indicates that a PR has LGTM 1. labels Aug 18, 2020
@qw4990
Copy link
Contributor

qw4990 commented Aug 18, 2020

/merge

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

Your auto merge job has been accepted, waiting for:

  • 18970
  • 19237

fzhedu
fzhedu approved these changes Aug 18, 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/LGT3 The PR has already had 3 LGTM. and removed status/LGT2 Indicates that a PR has LGTM 2. labels Aug 18, 2020
@ti-srebot
Copy link
Contributor

/run-all-tests

@ti-srebot
Copy link
Contributor

@SunRunAway merge failed.

@github-actions github-actions bot added the sig/execution SIG execution label Aug 20, 2020
@SunRunAway
Copy link
Contributor Author

/merge

@ti-srebot
Copy link
Contributor

/run-all-tests

@ti-srebot ti-srebot merged commit f5fa3e7 into pingcap:master Aug 24, 2020
ti-srebot pushed a commit to ti-srebot/tidb that referenced this pull request Aug 24, 2020
@SunRunAway @ti-srebot
cherry pick pingcap#19235 to release-3.0
94ddf0e 
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot ti-srebot mentioned this pull request Aug 24, 2020
Merged
@ti-srebot
Copy link
Contributor

cherry pick to release-3.0 in PR #19413

@SunRunAway SunRunAway deleted the issue19233 branch August 24, 2020 12:51
ti-srebot pushed a commit to ti-srebot/tidb that referenced this pull request Aug 24, 2020
@SunRunAway @ti-srebot
cherry pick pingcap#19235 to release-3.1
1eee832 
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot ti-srebot mentioned this pull request Aug 24, 2020
Closed
@ti-srebot
Copy link
Contributor

cherry pick to release-3.1 in PR #19414

ti-srebot pushed a commit to ti-srebot/tidb that referenced this pull request Aug 24, 2020
@SunRunAway @ti-srebot
cherry pick pingcap#19235 to release-4.0
23692ca 
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot ti-srebot mentioned this pull request Aug 24, 2020
Merged
@ti-srebot
Copy link
Contributor

cherry pick to release-4.0 in PR #19415

ti-srebot added a commit that referenced this pull request Aug 25, 2020
@ti-srebot
executor: fix index join error when join key is ENUM or SET (#19235) (#…
3fe0255 
…19415)

Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
SunRunAway pushed a commit that referenced this pull request Aug 25, 2020
@ti-srebot
executor: fix index join error when join key is ENUM or SET (#19235) (#…
26b5be1 
…19413)
@hanlins hanlins mentioned this pull request Dec 2, 2020
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@fzhedu fzhedu fzhedu approved these changes

@lzmhhh123 lzmhhh123 lzmhhh123 left review comments

@qw4990 qw4990 qw4990 approved these changes

@ti-srebot ti-srebot ti-srebot approved these changes

Assignees
No one assigned
Labels
component/executor component/expression 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
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Index join returns error when join key is enum/set
6 participants
@SunRunAway @qw4990 @ti-srebot @fzhedu @lzmhhh123 @AndreMouche