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.

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

planner: fix the issue that planner hints don't work in some batch/point-get plans (#23666) #23685

Merged
merged 29 commits into from
Apr 15, 2021

Conversation

ti-srebot
Copy link
Contributor

@ti-srebot ti-srebot commented Mar 30, 2021

cherry-pick #23666 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/23685

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

git push git@github.com:ti-srebot/tidb.git pr/23685:release-5.0-60111e1c4b6f

What problem does this PR solve?

Issue Number: close #23570

Problem Summary: planner: fix the issue that planner hints don't work in some batch/point-get plans

What is changed and how it works?

Add some logic about checking planner hints in TryFastPlan.
Please see the root cause and more details in #23570.

Check List

Tests

  • Unit test

Release note

  • planner: fix the issue that planner hints don't work in some batch/point-get plans

Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot ti-srebot requested a review from a team as a code owner March 30, 2021 09:46
@ti-srebot ti-srebot requested review from eurekaka and removed request for a team March 30, 2021 09:46
@ti-srebot
Copy link
Contributor Author

/run-all-tests

@ti-srebot ti-srebot added sig/planner SIG: Planner size/L Denotes a PR that changes 100-499 lines, ignoring generated files. type/5.0-cherry-pick type/bugfix This PR fixes a bug. labels Mar 30, 2021
@ti-srebot ti-srebot added this to the v5.0.0 ga milestone Mar 30, 2021
@ti-srebot
Copy link
Contributor Author

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

@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Mar 30, 2021
@rebelice
Copy link
Contributor

/lgtm

@ti-chi-bot
Copy link
Member

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • rebelice
  • 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 writing /lgtm in a comment.
Reviewer can cancel approval by writing /lgtm cancel in a comment.

@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 Mar 30, 2021
@qw4990
Copy link
Contributor

qw4990 commented Mar 30, 2021

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: 2d78e82

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

qw4990 commented Mar 31, 2021

/merge

@qw4990
Copy link
Contributor

qw4990 commented Mar 31, 2021

This PR can be merged, PTAL @zz-jason

@zhouqiang-cl zhouqiang-cl added the cherry-pick-approved Cherry pick PR approved by release team. label Apr 15, 2021
@qw4990
Copy link
Contributor

qw4990 commented Apr 15, 2021

/merge

@ti-chi-bot
Copy link
Member

@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.

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.

@ti-chi-bot ti-chi-bot merged commit 1623dcc into pingcap:release-5.0 Apr 15, 2021
@zhouqiang-cl zhouqiang-cl modified the milestones: v5.0.0 ga, v5.0.1 Apr 19, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cherry-pick-approved Cherry pick PR approved by release team. sig/planner SIG: Planner size/L Denotes a PR that changes 100-499 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.0-cherry-pick
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants