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

*: resolve select fields properly for coalesced columns of natural join (#25094) #30051

Merged
merged 7 commits into from
Apr 15, 2022
Merged

*: resolve select fields properly for coalesced columns of natural join (#25094) #30051

merged 7 commits into from
Apr 15, 2022

Conversation

ti-srebot
Copy link
Contributor

@ti-srebot ti-srebot commented Nov 23, 2021 •
edited by time-and-fate
Loading

cherry-pick #25094 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/30051

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

git push [email protected]:ti-srebot/tidb.git pr/30051:release-5.2-ead31402bccd

What problem does this PR solve?

Issue Number: close #25041

Problem Summary:

Incompatible error when grouping on join.

What is changed and how it works?

What's Changed:

Specially mark the redundant columns incurred by natural join / using keyword in FieldName, and ignore them when resolving columns.

How it Works:

The problem was incurred by #21922 when trying to fix #6712. #21922 exposes the columns in redundantSchema to the schema of aggregation, which led to the ambiguity.

I have tried reverting the #21922 patch and finding the column in LogicalJoin.redundantSchema recursively when resolving the select fields, it can work in the plan building step, but would fail in the final ResolveIndices, because aggregation is a schema producer.

Related changes

N/A

Check List

Tests

  • Unit test

Side effects

N/A

Release note 

Resolve select fields properly for coalesced columns of natural join

@ti-chi-bot
Copy link
Member

ti-chi-bot commented Nov 23, 2021 •
edited
Loading

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • time-and-fate
  • 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.

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

@ti-chi-bot
Copy link
Member

@ti-srebot: Adding the "do-not-merge/release-note-label-needed" label because no release-note block was detected, please follow our release note process to remove it.

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 kubernetes/test-infra repository.

@ti-srebot
Copy link
Contributor Author

/run-all-tests

@ti-chi-bot
Copy link
Member

@ti-srebot: Adding the "do-not-merge/release-note-label-needed" label because no release-note block was detected, please follow our release note process to remove it.

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 kubernetes/test-infra repository.

@ti-chi-bot ti-chi-bot added the do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. label Nov 23, 2021
@ti-srebot ti-srebot mentioned this pull request Nov 23, 2021
Merged
@ti-srebot ti-srebot added component/expression sig/planner SIG: Planner size/M Denotes a PR that changes 30-99 lines, ignoring generated files. type/5.2-cherry-pick type/bugfix This PR fixes a bug. labels Nov 23, 2021
@ti-srebot ti-srebot added this to the v5.2.2 milestone Nov 23, 2021
@ti-srebot
Copy link
Contributor Author

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

@VelocityLight VelocityLight added cherry-pick-approved Cherry pick PR approved by release team. and removed do-not-merge/cherry-pick-not-approved labels Apr 11, 2022
@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Apr 11, 2022
@ti-chi-bot ti-chi-bot removed the status/LGT1 Indicates that a PR has LGTM 1. label Apr 15, 2022
@ti-chi-bot ti-chi-bot added the status/LGT2 Indicates that a PR has LGTM 2. label Apr 15, 2022
@time-and-fate
Copy link
Member

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: 241380d

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

sre-bot commented Apr 15, 2022 •
edited
Loading

Code Coverage Details: https://codecov.io/github/pingcap/tidb/commit/97710a6216667e306ce22115381cc53dbdf6f7bd

@time-and-fate time-and-fate removed the do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. label Apr 15, 2022
@time-and-fate
Copy link
Member

/run-unit-test

@time-and-fate
Copy link
Member

/run-unit-test

@time-and-fate
Copy link
Member

/run-mysql-test

@winoros
Copy link
Member

winoros commented Apr 15, 2022

/run-unit-test
/run-mysql-test

@time-and-fate
Copy link
Member

/run-mysql-test tidb-test=pr/1664

@time-and-fate
Copy link
Member

/run-mysql-test tidb-test=pr/1664

@ti-chi-bot ti-chi-bot merged commit 05b1e60 into pingcap:release-5.2 Apr 15, 2022
@zhouqiang-cl zhouqiang-cl modified the milestones: v5.2.2, v5.2.4 Apr 18, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@winoros winoros winoros approved these changes

@time-and-fate time-and-fate time-and-fate approved these changes

Assignees

@time-and-fate time-and-fate

Labels
cherry-pick-approved Cherry pick PR approved by release team. component/expression sig/planner SIG: Planner 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.2-cherry-pick
Projects
None yet
Milestone
v5.2.4
Development

Successfully merging this pull request may close these issues.
8 participants
@ti-srebot @ti-chi-bot @time-and-fate @sre-bot @winoros @eurekaka @VelocityLight @zhouqiang-cl