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: outer merge join cannot keep the prop of its inner child (#33359) #33375

Merged
merged 5 commits into from
Apr 27, 2022
Merged

planner: outer merge join cannot keep the prop of its inner child (#33359) #33375

merged 5 commits into from
Apr 27, 2022

Conversation

ti-srebot
Copy link
Contributor

@ti-srebot ti-srebot commented Mar 24, 2022 •
edited
Loading

cherry-pick #33359 to release-5.4
You can switch your code base to this Pull Request by using git-extras:

# In tidb repo:
git pr https://github.com/pingcap/tidb/pull/33375

After apply modifications, you can push your change to this PR via:

git push git@github.com:ti-srebot/tidb.git pr/33375:release-5.4-1287eab595d0

What problem does this PR solve?

Issue Number: close #33042

Problem Summary:

If the merge join is outer join. We cannot make sure that its output can keep the input order of the inner side.

What is changed and how it works?

Reject the mentioned case.

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

None

@winoros @ti-srebot
cherry pick pingcap#33359 to release-5.4
a8b6ff6 
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-chi-bot
Copy link
Member

ti-chi-bot commented Mar 24, 2022 •
edited
Loading

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • AilinKid
  • XuHuaiyu

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 do-not-merge/cherry-pick-not-approved do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. labels Mar 24, 2022
@ti-srebot
Copy link
Contributor Author

/run-all-tests

@ti-chi-bot ti-chi-bot added release-note-none Denotes a PR that doesn't merit a release note. and removed do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. labels Mar 24, 2022
@ti-srebot ti-srebot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. type/5.4-cherry-pick type/bugfix This PR fixes a bug. labels Mar 24, 2022
@ti-srebot ti-srebot mentioned this pull request Mar 24, 2022
Merged
12 tasks
@ti-srebot
Copy link
Contributor Author

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

@ti-chi-bot ti-chi-bot added size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Mar 24, 2022
@ti-chi-bot ti-chi-bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Apr 19, 2022
@tiancaiamao
Copy link
Contributor

Please address conflict @winoros

@VelocityLight VelocityLight added cherry-pick-approved Cherry pick PR approved by release team. and removed do-not-merge/cherry-pick-not-approved labels Apr 22, 2022
AilinKid
AilinKid reviewed Apr 26, 2022
View reviewed changes
planner/core/integration_test.go Outdated
@@ -5226,3 +5226,320 @@ func (s *testIntegrationSuite) TestIssue31202(c *C) {
"└─TableFullScan 10000.00 cop[tikv] table:t31202 keep order:false, stats:pseudo"))
tk.MustExec("drop table if exists t31202")
}
<<<<<<< HEAD
Copy link
Contributor

Choose a reason for hiding this comment

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

need resolve conflicts

@ti-chi-bot ti-chi-bot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels Apr 26, 2022
@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Apr 26, 2022
@tiancaiamao
Copy link
Contributor

PTAL @XuHuaiyu

@ti-chi-bot ti-chi-bot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Apr 27, 2022
@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 Apr 27, 2022
@XuHuaiyu
Copy link
Contributor

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: 81a3a87

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Apr 27, 2022
@sre-bot
Copy link
Contributor

sre-bot commented Apr 27, 2022

Code Coverage Details: https://codecov.io/github/pingcap/tidb/commit/81a3a873871e2b5a6307d8e5fd3b0a2d58a71016

@winoros
Copy link
Member

winoros commented Apr 27, 2022

/rebuild

@ti-chi-bot ti-chi-bot merged commit 2a86e88 into pingcap:release-5.4 Apr 27, 2022
@winoros winoros deleted the release-5.4-1287eab595d0 branch April 27, 2022 11:39
@purelind purelind added this to the v5.4.1 milestone Apr 29, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@XuHuaiyu XuHuaiyu XuHuaiyu approved these changes

@AilinKid AilinKid AilinKid approved these changes

@time-and-fate time-and-fate Awaiting requested review from time-and-fate

Assignees

@winoros winoros

Labels
cherry-pick-approved Cherry pick PR approved by release team. release-note-none Denotes a PR that doesn't merit a release note. size/M Denotes a PR that changes 30-99 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. type/bugfix This PR fixes a bug. type/5.4-cherry-pick
Projects
None yet
Milestone
v5.4.1
Development

Successfully merging this pull request may close these issues.
9 participants
@ti-srebot @ti-chi-bot @tiancaiamao @XuHuaiyu @sre-bot @winoros @AilinKid @VelocityLight @purelind