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: set the inner join keys' field length to unspecified (#21233) #21249

Merged
merged 7 commits into from
Nov 25, 2020
Merged

executor: set the inner join keys' field length to unspecified (#21233) #21249

merged 7 commits into from
Nov 25, 2020

Conversation

ti-srebot
Copy link
Contributor

cherry-pick #21233 to release-4.0

What problem does this PR solve?

Issue Number: close #21232

Problem Summary:

See issue description for details. There's unexpected type conversion error/warnings when index join's join keys meet difference field length.

What is changed and how it works?

Proposal: xxx

What's Changed:

Reset its length to unspecified.

Related changes

  • Need to cherry-pick to the release branch

Check List

Tests

  • Unit test

Release note

  • Fix unexpected error when INSERT meets index join in some cases.

@winoros @ti-srebot
cherry pick pingcap#21233 to release-4.0
f301ad2 
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot
Copy link
Contributor Author

/run-all-tests

@ti-srebot ti-srebot added sig/execution SIG execution type/4.0-cherry-pick type/bugfix This PR fixes a bug. labels Nov 24, 2020
@ti-srebot ti-srebot mentioned this pull request Nov 24, 2020
Merged
@ti-srebot ti-srebot added this to the v4.0.9 milestone Nov 24, 2020
@ti-srebot
Copy link
Contributor Author

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

lzmhhh123
lzmhhh123 reviewed Nov 24, 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 Nov 24, 2020
XuHuaiyu
XuHuaiyu previously approved these changes Nov 24, 2020
View reviewed changes
Copy link
Contributor

@XuHuaiyu XuHuaiyu 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 Nov 24, 2020
@winoros
Copy link
Member

winoros commented Nov 24, 2020

/rebuild

@winoros
Copy link
Member

winoros commented Nov 24, 2020

/merge

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

/run-all-tests

@ti-srebot
Copy link
Contributor Author

@ti-srebot merge failed.

@tiancaiamao
Copy link
Contributor 

[2020-11-24T12:36:48.534Z] # github.com/pingcap/tidb/executor_test
[2020-11-24T12:36:48.534Z] vet: executor/write_test.go:30:2: "github.com/pingcap/tidb/sessionctx/stmtctx" imported but not used
[2020-11-24T12:36:48.534Z] make: *** [vet] Error 1

@winoros

@winoros
Copy link
Member

winoros commented Nov 25, 2020

/merge

@ti-srebot
Copy link
Contributor Author

Your auto merge job has been accepted, waiting for:

  • 21171

@ti-srebot
Copy link
Contributor Author

/run-all-tests

@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 Nov 25, 2020
@SunRunAway
Copy link
Contributor

/merge

@ti-srebot
Copy link
Contributor Author

Your auto merge job has been accepted, waiting for:

  • 21270

@ti-srebot
Copy link
Contributor Author

/run-all-tests

@ti-srebot ti-srebot merged commit 5e8d6ba into pingcap:release-4.0 Nov 25, 2020
@SunRunAway SunRunAway deleted the release-4.0-115c7f88e8c1 branch November 25, 2020 08:40
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

@SunRunAway SunRunAway SunRunAway approved these changes

@XuHuaiyu XuHuaiyu XuHuaiyu left review comments

Assignees

@winoros winoros

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. type/4.0-cherry-pick
Projects
None yet
Milestone
v4.0.9
Development

Successfully merging this pull request may close these issues.
6 participants
@ti-srebot @winoros @tiancaiamao @SunRunAway @XuHuaiyu @lzmhhh123