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

Merged
merged 4 commits into from
Mar 22, 2020

Conversation

francis0407
Copy link
Member

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.

@francis0407 francis0407 requested a review from a team as a code owner March 21, 2020 11:02
@ghost ghost requested review from eurekaka and lzmhhh123 and removed request for a team March 21, 2020 11:02
@codecov
Copy link

codecov bot commented Mar 21, 2020

Codecov Report

Merging #15547 into master will increase coverage by 0.0253%.
The diff coverage is n/a.

@@               Coverage Diff                @@
##             master     #15547        +/-   ##
================================================
+ Coverage   80.4311%   80.4564%   +0.0253%     
================================================
  Files           502        502                
  Lines        134106     134249       +143     
================================================
+ Hits         107863     108012       +149     
- Misses        17785      17788         +3     
+ Partials       8458       8449         -9

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 21, 2020
Copy link
Contributor

@XuHuaiyu XuHuaiyu 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 XuHuaiyu 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 22, 2020
@sre-bot
Copy link
Contributor

sre-bot commented Mar 22, 2020

/run-all-tests

@sre-bot
Copy link
Contributor

sre-bot commented Mar 22, 2020

@francis0407 merge failed.

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.

LGTM

@zyguan
Copy link
Contributor

zyguan commented Mar 22, 2020

/rebuild

@zyguan
Copy link
Contributor

zyguan commented Mar 22, 2020

/run-all-tests

@francis0407
Copy link
Member Author

/merge

@sre-bot
Copy link
Contributor

sre-bot commented Mar 22, 2020

/run-all-tests

@sre-bot sre-bot merged commit adaf8d2 into pingcap:master Mar 22, 2020
sre-bot pushed a commit to sre-bot/tidb that referenced this pull request Mar 22, 2020
Signed-off-by: sre-bot <sre-bot@pingcap.com>
@sre-bot
Copy link
Contributor

sre-bot commented Mar 22, 2020

cherry pick to release-3.0 in PR #15559

sre-bot pushed a commit to sre-bot/tidb that referenced this pull request Mar 22, 2020
Signed-off-by: sre-bot <sre-bot@pingcap.com>
@sre-bot
Copy link
Contributor

sre-bot commented Mar 22, 2020

cherry pick to release-3.1 in PR #15560

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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

planner: don't reset optFlag when build DataSource from View
6 participants