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: don't reset optFlag when build DataSource from View (#15547) #15559

Merged
merged 5 commits into from
Mar 24, 2020

Conversation

sre-bot
Copy link
Contributor

@sre-bot sre-bot commented Mar 22, 2020

cherry-pick #15547 to release-3.0


What problem does this PR solve?

Issue Number: close #15546

Problem Summary:

When build DataSource from View, we may reset the optFlag which causes bugs like #15546.

What is changed and how it works?

What's Changed:
Use optFlag = optFlag | flagPrunColumns instead of optFlag = flagPrunColumns.
How it Works:

Related changes

  • Need to cherry-pick to the release branch

Check List

Tests

  • Unit test

Release note

fix panic when select from view.

Signed-off-by: sre-bot <sre-bot@pingcap.com>
@sre-bot
Copy link
Contributor Author

sre-bot commented Mar 22, 2020

/run-all-tests

Copy link
Contributor

@AilinKid AilinKid left a comment

Choose a reason for hiding this comment

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

some conflicts need to resolve

@XuHuaiyu XuHuaiyu removed their request for review March 23, 2020 02:16
Copy link
Member

@zz-jason zz-jason left a comment

Choose a reason for hiding this comment

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

LGTM

@zz-jason zz-jason added the status/LGT1 Indicates that a PR has LGTM 1. label Mar 24, 2020
@francis0407 francis0407 added this to the v3.0.13 milestone Mar 24, 2020
Copy link
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

@zz-jason zz-jason added status/can-merge Indicates a PR has been approved by a committer. status/LGT2 Indicates that a PR has LGTM 2. and removed status/LGT1 Indicates that a PR has LGTM 1. labels Mar 24, 2020
@sre-bot
Copy link
Contributor Author

sre-bot commented Mar 24, 2020

Your auto merge job has been accepted, waiting for 15560

@sre-bot
Copy link
Contributor Author

sre-bot commented Mar 24, 2020

/run-all-tests

@sre-bot sre-bot merged commit 07ef194 into pingcap:release-3.0 Mar 24, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
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/bugfix This PR fixes a bug. type/3.0-cherry-pick
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants