Skip to content

planner: fix inconsistent schema between UnionAll and child operator (#30231)#30838

Merged
ti-chi-bot merged 10 commits intopingcap:release-5.0from
ti-srebot:release-5.0-4785dc4a622f
Dec 20, 2021
Merged

planner: fix inconsistent schema between UnionAll and child operator (#30231)#30838
ti-chi-bot merged 10 commits intopingcap:release-5.0from
ti-srebot:release-5.0-4785dc4a622f

Conversation

@ti-srebot
Copy link
Contributor

@ti-srebot ti-srebot commented Dec 17, 2021 •
edited
Loading

cherry-pick #30231 to release-5.0
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/30838

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

git push git@github.com:ti-srebot/tidb.git pr/30838:release-5.0-4785dc4a622f

What problem does this PR solve?

Issue Number: close #29705

Problem Summary:

The schema of the UnionAll is different from its children operators. Then the Union Exec returns an error.

In this case, the UnionAll has one column but its child Aggregation has two. It's caused by an extra column is added to Aggregation in (*LogicalAggregation).PruneColumns().

What is changed and how it works?

Add extra logic in (*LogicalUnionAll).PruneColumns to handle this case.
When UnionAll finds its child has more columns, it will add the extra Projection to prune the extra column.

About the additional changes in the test, please see the issue.

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

@time-and-fate @ti-srebot
cherry pick pingcap#30231 to release-5.0
ef3d42c 
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-chi-bot
Copy link
Member

ti-chi-bot commented Dec 17, 2021 •
edited
Loading

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • lcwangchao
  • winoros

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.

Details

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

@ti-srebot
Copy link
Contributor Author

ti-srebot commented Dec 17, 2021

/run-all-tests

@ti-chi-bot ti-chi-bot added do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. 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 Dec 17, 2021
@ti-srebot ti-srebot mentioned this pull request Dec 17, 2021
Merged
12 tasks
@ti-srebot ti-srebot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. type/5.0-cherry-pick labels Dec 17, 2021
@ti-srebot
Copy link
Contributor Author

ti-srebot commented Dec 17, 2021

@time-and-fate 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 Dec 17, 2021
@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 Dec 17, 2021
@zhouqiang-cl zhouqiang-cl added the cherry-pick-approved Cherry pick PR approved by release team. label Dec 18, 2021
@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Dec 20, 2021
@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 Dec 20, 2021
@time-and-fate
Copy link
Member

time-and-fate commented Dec 20, 2021

/merge

@ti-chi-bot
Copy link
Member

ti-chi-bot commented Dec 20, 2021

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

DetailsCommit hash: d2c6c5b

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Dec 20, 2021
@XuHuaiyu
Copy link
Contributor

XuHuaiyu commented Dec 20, 2021

/merge

@ti-chi-bot
Copy link
Member

ti-chi-bot commented Dec 20, 2021

@ti-srebot: Your PR was out of date, I have automatically updated it for you.

At the same time I will also trigger all tests for you:

/run-all-tests

If the CI test fails, you just re-trigger the test that failed and the bot will merge the PR for you after the CI passes.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the ti-community-infra/tichi repository.

@XuHuaiyu
Copy link
Contributor

XuHuaiyu commented Dec 20, 2021

/merge

@ti-chi-bot ti-chi-bot merged commit c352e53 into pingcap:release-5.0 Dec 20, 2021
@zhouqiang-cl zhouqiang-cl added this to the v5.0.6 milestone Dec 21, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@lcwangchao lcwangchao lcwangchao approved these changes

@winoros winoros winoros approved these changes

Assignees

@time-and-fate time-and-fate

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/5.0-cherry-pick

Projects

None yet

Milestone

v5.0.6

Development

Successfully merging this pull request may close these issues.

8 participants

@ti-srebot @ti-chi-bot @time-and-fate @XuHuaiyu @lcwangchao @winoros @zhouqiang-cl @wshwsh12