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: fixed a bug that prevented SPM from taking effect (#23197) #23209

Merged
merged 7 commits into from
Mar 12, 2021
Merged

planner: fixed a bug that prevented SPM from taking effect (#23197) #23209

merged 7 commits into from
Mar 12, 2021

Conversation

ti-srebot
Copy link
Contributor

@ti-srebot ti-srebot commented Mar 9, 2021 •
edited
Loading

cherry-pick #23197 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/23209

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

git push [email protected]:ti-srebot/tidb.git pr/23209:release-4.0-1ca62a09fff2

What problem does this PR solve?

Issue Number: close #23190

Problem Summary:

SPM does not take effect without use database

What is changed and how it works?

What's Changed:

There is an error in the logic of obtaining binding, fix it now

How it Works:

If ctx.GetSessionVars().CurrentDB is "", we still restore the sql.

Related changes

  • Need to cherry-pick to the release branch

Check List

Tests

  • Unit test

Side effects

Release note

  • fixed a bug that prevented SPM from taking effect

@ti-srebot
Copy link
Contributor Author

/run-all-tests

@ti-srebot ti-srebot mentioned this pull request Mar 9, 2021
Merged
@ti-srebot ti-srebot added sig/planner SIG: Planner size/M Denotes a PR that changes 30-99 lines, ignoring generated files. type/4.0-cherry-pick type/bugfix This PR fixes a bug. labels Mar 9, 2021
@ti-srebot ti-srebot added this to the v4.0.11 milestone Mar 9, 2021
@ti-srebot
Copy link
Contributor Author

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

@ti-chi-bot ti-chi-bot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Mar 11, 2021
eurekaka
eurekaka reviewed Mar 11, 2021
View reviewed changes
Copy link
Contributor

@eurekaka eurekaka left a comment

Choose a reason for hiding this comment

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

/lgtm

@XuHuaiyu
Copy link
Contributor

/lgtm

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

/lgtm

@ti-chi-bot
Copy link
Member

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • XuHuaiyu
  • eurekaka

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 12, 2021
@eurekaka
Copy link
Contributor

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: 242c851

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Mar 12, 2021
@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.

@rebelice
Copy link
Contributor

/run-unit-test

1 similar comment
@rebelice
Copy link
Contributor

/run-unit-test

@rebelice
Copy link
Contributor

/run-all-tests

1 similar comment
@rebelice
Copy link
Contributor

/run-all-tests

@ti-chi-bot ti-chi-bot merged commit e579d1c into pingcap:release-4.0 Mar 12, 2021
@zhouqiang-cl zhouqiang-cl modified the milestones: v4.0.11, v4.0.12 Mar 26, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@eurekaka eurekaka eurekaka left review comments

@hanfei1991 hanfei1991 Awaiting requested review from hanfei1991

@qw4990 qw4990 Awaiting requested review from qw4990

@XuHuaiyu XuHuaiyu Awaiting requested review from XuHuaiyu

Assignees

@rebelice rebelice

Labels
sig/planner SIG: Planner size/S Denotes a PR that changes 10-29 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/4.0-cherry-pick
Projects
None yet
Milestone
v4.0.12
Development

Successfully merging this pull request may close these issues.
6 participants
@ti-srebot @XuHuaiyu @eurekaka @ti-chi-bot @rebelice @zhouqiang-cl