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 topn wrongly pushed to index scan side when it's a prefix index (#29778) #29796

Merged
merged 6 commits into from
Nov 22, 2021
Merged

planner: fix topn wrongly pushed to index scan side when it's a prefix index (#29778) #29796

merged 6 commits into from
Nov 22, 2021

Conversation

ti-srebot
Copy link
Contributor

@ti-srebot ti-srebot commented Nov 15, 2021 •
edited
Loading

cherry-pick #29778 to release-4.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/29796

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

git push [email protected]:ti-srebot/tidb.git pr/29796:release-4.0-a0d3f4fe540c

What problem does this PR solve?

Issue Number: close #29711

Problem Summary:

When the IndexScan is using a prefix index, and the TopN.ByItems used the prefix column, the TopN is wrongly pushed to indexPlan.

What is changed and how it works?

Check and push TopN to tablePlan in the above 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

@ti-chi-bot
Copy link
Member

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

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • winoros
  • xuyifangreeneyes

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-srebot
Copy link
Contributor Author

/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 Nov 15, 2021
@ti-srebot ti-srebot mentioned this pull request Nov 15, 2021
Merged
12 tasks
@ti-srebot ti-srebot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. type/4.0-cherry-pick labels Nov 15, 2021
@ti-chi-bot ti-chi-bot removed the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Nov 15, 2021
@ti-chi-bot ti-chi-bot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Nov 15, 2021
@ti-srebot
Copy link
Contributor Author

@time-and-fate you're already a collaborator in bot's repo.

winoros
winoros approved these changes Nov 17, 2021
View reviewed changes
Copy link
Member

@winoros winoros left a comment

Choose a reason for hiding this comment

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

lgtm, solve the conflict(

@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Nov 17, 2021
@zhouqiang-cl zhouqiang-cl added the cherry-pick-approved Cherry pick PR approved by release team. label Nov 19, 2021
@ti-chi-bot ti-chi-bot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Nov 19, 2021
@time-and-fate
Copy link
Member

time-and-fate commented Nov 19, 2021 •
edited
Loading

Some code of #22980 is ported into this PR because we need the IsPrefix information, which is introduced in #22980.

xuyifangreeneyes
xuyifangreeneyes reviewed Nov 22, 2021
View reviewed changes
planner/core/task.go
func (p *PhysicalTopN) canPushToIndexPlan(indexPlan PhysicalPlan, byItemCols []*expression.Column) bool {
schema := indexPlan.Schema()
for _, col := range byItemCols {
pos := schema.ColumnIndex(col)
Copy link
Contributor

Choose a reason for hiding this comment

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

Do we also need to modify ColumnIndex as #22980 did?

Copy link
Member

Choose a reason for hiding this comment

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

I think we don't need to.
This PR aims to fix #29711. Release-4.0 is a rather stable branch now, I prefer not to introduce unnecessary code. We can cherry-pick the ColumnIndex part if we need to cherry-pick #22980 to release-4.0.

@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 Nov 22, 2021
@VelocityLight
Copy link

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: f534854

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Nov 22, 2021
@ti-chi-bot ti-chi-bot merged commit 1e156bc into pingcap:release-4.0 Nov 22, 2021
@zhouqiang-cl zhouqiang-cl added this to the v4.0.16 milestone Dec 6, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@time-and-fate time-and-fate time-and-fate left review comments

@xuyifangreeneyes xuyifangreeneyes xuyifangreeneyes 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/4.0-cherry-pick
Projects
None yet
Milestone
v4.0.16
Development

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