Skip to content

planner: cherry-pick sql hint related PRs into release-3.1#12192

Merged
sre-bot merged 19 commits into
pingcap:release-3.1from
foreyes:dev/cherry_pick_hint
Sep 17, 2019
Merged

planner: cherry-pick sql hint related PRs into release-3.1#12192
sre-bot merged 19 commits into
pingcap:release-3.1from
foreyes:dev/cherry_pick_hint

Conversation

@foreyes
Copy link
Copy Markdown
Contributor

@foreyes foreyes commented Sep 16, 2019

What problem does this PR solve?

cherry-pick sql hint related PRS into release-3.1:
#11364 #11673 #11740 #11780 #11761 #11746 #11861 #11996 #12043 #12037 #12059

What is changed and how it works?

cherry-pick and resolve conflict.

Check List

Tests

  • Unit test
  • Explain test

Code changes

  • Has exported function/method change
  • Has exported variable/fields change

Side effects

  • None

Related changes

  • Need parser change

Release note

  • Write release note for bug-fix or new feature.

foreyes and others added 12 commits September 16, 2019 11:04
@foreyes foreyes changed the title Dev/cherry pick hint planner: cherry-pick sql hint related PRs into release-3.1 Sep 16, 2019
@foreyes foreyes self-assigned this Sep 16, 2019
@foreyes
Copy link
Copy Markdown
Contributor Author

foreyes commented Sep 16, 2019

/run-all-tests

@foreyes
Copy link
Copy Markdown
Contributor Author

foreyes commented Sep 16, 2019

/run-all-tests

@foreyes
Copy link
Copy Markdown
Contributor Author

foreyes commented Sep 17, 2019

/run-all-tests

@foreyes
Copy link
Copy Markdown
Contributor Author

foreyes commented Sep 17, 2019

PTAL. @lamxTyler @lzmhhh123

alivxxx
alivxxx reviewed Sep 17, 2019
View reviewed changes
Copy link
Copy Markdown
Contributor

@alivxxx alivxxx left a comment

Choose a reason for hiding this comment

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

LGTM

lzmhhh123
lzmhhh123 approved these changes Sep 17, 2019
View reviewed changes
Copy link
Copy Markdown
Contributor

@lzmhhh123 lzmhhh123 left a comment

Choose a reason for hiding this comment

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

LGTM.

@lzmhhh123 lzmhhh123 added the status/LGT2 Indicates that a PR has LGTM 2. label Sep 17, 2019
@foreyes foreyes added the status/can-merge Indicates a PR has been approved by a committer. label Sep 17, 2019
@sre-bot
Copy link
Copy Markdown
Contributor

sre-bot commented Sep 17, 2019

Sorry @foreyes, you don't have permission to trigger auto merge event on this branch.

@foreyes
Copy link
Copy Markdown
Contributor Author

foreyes commented Sep 17, 2019

/run-unit-test

@zz-jason
Copy link
Copy Markdown
Member

zz-jason commented Sep 17, 2019

/merge

@sre-bot
Copy link
Copy Markdown
Contributor

sre-bot commented Sep 17, 2019

/run-all-tests

@sre-bot sre-bot merged commit 2c1cf77 into pingcap:release-3.1 Sep 17, 2019
@eurekaka eurekaka mentioned this pull request Nov 18, 2019
Merged
eurekaka pushed a commit to eurekaka/tidb that referenced this pull request Nov 22, 2019
@foreyes @eurekaka
planner: cherry-pick sql hint related PRs into release-3.1 (pingcap#1…
dfe0dcc 
…2192)

Conflicts:
	planner/core/exhaust_physical_plans.go
	planner/core/logical_plan_test.go
	planner/core/physical_plan_test.go
coocood pushed a commit that referenced this pull request Nov 22, 2019
@eurekaka @coocood
planner: cherry-pick sql hint related PRs into release-3.1 (#12192) (#…
4914598 
…13542)

Conflicts:
	planner/core/exhaust_physical_plans.go
	planner/core/logical_plan_test.go
	planner/core/physical_plan_test.go
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

2 more reviewers

@alivxxx alivxxx alivxxx left review comments

@lzmhhh123 lzmhhh123 lzmhhh123 approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

@foreyes foreyes

Labels

sig/planner SIG: Planner status/can-merge Indicates a PR has been approved by a committer. status/LGT2 Indicates that a PR has LGTM 2. type/new-feature

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@foreyes @sre-bot @zz-jason @alivxxx @lzmhhh123 @francis0407