Skip to content

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

Closed
ti-srebot wants to merge 1 commit intopingcap:release-5.2from
ti-srebot:release-5.2-4785dc4a622f
Closed

planner: fix inconsistent schema between UnionAll and child operator (#30231)#30839
ti-srebot wants to merge 1 commit intopingcap:release-5.2from
ti-srebot:release-5.2-4785dc4a622f

Conversation

@ti-srebot
Copy link
Contributor

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

cherry-pick #30231 to release-5.2
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/30839

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

git push git@github.com:ti-srebot/tidb.git pr/30839:release-5.2-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.2
baa4d0d 
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-chi-bot
Copy link
Member

ti-chi-bot commented Dec 17, 2021

[REVIEW NOTIFICATION]

This pull request has not been approved.

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.2-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/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Dec 17, 2021
@VelocityLight
Copy link

VelocityLight commented Sep 16, 2022

This pull request is closed because it's related version has closed automatic cherry-picking.
If it's still needed, you can reopen it or just regenerate it using bot,
see:

You can find more details at:

@VelocityLight VelocityLight added cherry-pick-approved Cherry pick PR approved by release team. and removed do-not-merge/cherry-pick-not-approved labels Sep 16, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@lcwangchao lcwangchao Awaiting requested review from lcwangchao

@winoros winoros Awaiting requested review from winoros

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/L Denotes a PR that changes 100-499 lines, ignoring generated files. type/5.2-cherry-pick

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@ti-srebot @ti-chi-bot @VelocityLight @time-and-fate