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

planner: fix can not found column bug #28067

Merged
merged 7 commits into from
Sep 17, 2021
Merged

planner: fix can not found column bug #28067

merged 7 commits into from
Sep 17, 2021

Conversation

windtalker
Copy link
Contributor

@windtalker windtalker commented Sep 15, 2021 •
edited
Loading

What problem does this PR solve?

Issue Number: close #30980

Problem Summary:

What is changed and how it works?

Proposal: xxx

What's Changed:

In (p *PhysicalHashJoin) attach2TaskForMpp(tasks ...task), the task maybe changed, so we should use the updated task when construct the final result task.

Check List

Tests

  • Unit test
  • Integration test
  • Manual test (add detailed scripts or steps below)
  • No code

Side effects

  • Performance regression: Consumes more CPU
  • Performance regression: Consumes more Memory
  • Breaking backward compatibility

Documentation

  • Affects user behaviors
  • Contains syntax changes
  • Contains variable changes
  • Contains experimental features
  • Changes MySQL compatibility

Release note 

Fix `can not found column in Schema column` error for mpp queries

@ti-chi-bot
Copy link
Member

ti-chi-bot commented Sep 15, 2021 •
edited
Loading

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • fzhedu
  • hanfei1991

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.

Reviewer can indicate their review by submitting an approval review.
Reviewer can cancel approval by submitting a request changes review.

@ti-chi-bot ti-chi-bot added release-note Denotes a PR that will be considered when it comes time to generate release notes. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Sep 15, 2021
fzhedu
fzhedu reviewed Sep 15, 2021
View reviewed changes
planner/core/integration_test.go
@@ -747,6 +747,54 @@ func (s *testIntegrationSerialSuite) TestMPPShuffledJoin(c *C) {
res.Check(testkit.Rows(output[i].Plan...))
}
}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

add en empty line.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done.

fzhedu
fzhedu reviewed Sep 15, 2021
View reviewed changes
planner/core/task.go Outdated
Comment on lines 785 to 791
// can not use the task from tasks because it maybe updated.
outerTaskIndex := 1 - p.InnerChildIdx
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

does this happen in convertPartitionKeysIfNeed?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, convertPartitionKeysIfNeed returns updated mpp task directly.

@windtalker
Copy link
Contributor Author

/label needs-cherry-pick-5.0

@windtalker
Copy link
Contributor Author

/label needs-cherry-pick-5.1

@windtalker
Copy link
Contributor Author

/label needs-cherry-pick-5.2

@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Sep 16, 2021
fzhedu
fzhedu reviewed Sep 17, 2021
View reviewed changes
planner/core/exhaust_physical_plans.go
@@ -1886,8 +1886,22 @@ func (p *LogicalJoin) tryToGetMppHashJoin(prop *property.PhysicalProperty, useBC
lPartitionKeys, rPartitionKeys := p.GetPotentialPartitionKeys()
if prop.MPPPartitionTp == property.HashType {
var matches []int
if matches = prop.IsSubsetOf(lPartitionKeys); len(matches) == 0 {
if p.JoinType == InnerJoin {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

do previous tests not cover these cases?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess so.

fzhedu
fzhedu approved these changes Sep 17, 2021
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-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 17, 2021
@fzhedu
Copy link
Contributor

fzhedu commented Sep 17, 2021

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: 59f8ea3

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Sep 17, 2021
@ti-chi-bot ti-chi-bot merged commit d1a3279 into pingcap:master Sep 17, 2021
ti-srebot pushed a commit to ti-srebot/tidb that referenced this pull request Sep 17, 2021
@windtalker @ti-srebot
cherry pick pingcap#28067 to release-5.0
9968ae6 
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot ti-srebot mentioned this pull request Sep 17, 2021
Merged
12 tasks
@ti-srebot
Copy link
Contributor

cherry pick to release-5.0 in PR #28147

ti-srebot pushed a commit to ti-srebot/tidb that referenced this pull request Sep 17, 2021
@windtalker @ti-srebot
cherry pick pingcap#28067 to release-5.1
18b7a31 
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot ti-srebot mentioned this pull request Sep 17, 2021
Merged
12 tasks
@ti-srebot
Copy link
Contributor

cherry pick to release-5.1 in PR #28148

ti-srebot pushed a commit to ti-srebot/tidb that referenced this pull request Sep 17, 2021
@windtalker @ti-srebot
cherry pick pingcap#28067 to release-5.2
62898c6 
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot ti-srebot mentioned this pull request Sep 17, 2021
Merged
12 tasks
@ti-srebot
Copy link
Contributor

cherry pick to release-5.2 in PR #28149

ti-chi-bot pushed a commit that referenced this pull request Sep 17, 2021
@ti-srebot
planner: fix can not found column bug (#28067) (#28148)
67e9b1f
ti-chi-bot pushed a commit that referenced this pull request Oct 13, 2021
@ti-srebot
planner: fix can not found column bug (#28067) (#28149)
020df18
@windtalker windtalker deleted the can_not_found_column branch November 16, 2021 01:24
ti-chi-bot pushed a commit that referenced this pull request Dec 20, 2021
@ti-srebot
planner: fix can not found column bug (#28067) (#28147)
9895605
@XuHuaiyu XuHuaiyu mentioned this pull request Dec 24, 2021
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

@hanfei1991 hanfei1991 hanfei1991 approved these changes

Assignees
No one assigned
Labels
needs-cherry-pick-release-5.0 needs-cherry-pick-release-5.1 needs-cherry-pick-release-5.2 release-note Denotes a PR that will be considered when it comes time to generate release notes. size/L Denotes a PR that changes 100-499 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.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

MPP plan is not correct
5 participants
@windtalker @ti-chi-bot @fzhedu @ti-srebot @hanfei1991