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

expression: avoid unnecessary warnings/errors when folding constants in control expr (#19675) #19910

Merged
merged 2 commits into from
Sep 16, 2020

Conversation

ti-srebot
Copy link
Contributor

cherry-pick #19675 to release-4.0


What problem does this PR solve?

Issue Number: close #17725

following #19367, avoid unnecessary warnings/errors when folding constants in control expr.

Problem Summary:

What is changed and how it works?

Proposal: xxx

What's Changed:

the scalar if is wrong, to be corrected here,
add tryFoldCounter to try fold constrants but not throw warnings/erros.
correct the special handler for control expressions.

How it Works:

each branch of control expressions fold contrants whenever possible, but not throw uncessary warnings/errors. When folding the control expressions, it run the normal branches and return normally like evaluating scalar expressions. If a branch is not const, it will stop folding constrants.

Related changes

  • Need to cherry-pick to the release branch

Check List

Tests

  • Unit test

Release note

  • avoid unnecessary warnings/errors when folding constants in control expr

Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot
Copy link
Contributor Author

/run-all-tests

@fzhedu
Copy link
Contributor

fzhedu commented Sep 9, 2020

/rebuild

Copy link
Contributor

@qw4990 qw4990 left a comment

Choose a reason for hiding this comment

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

LGTM

@ti-srebot ti-srebot added the status/LGT1 Indicates that a PR has LGTM 1. label Sep 11, 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

@ti-srebot ti-srebot added status/LGT2 Indicates that a PR has LGTM 2. and removed status/LGT1 Indicates that a PR has LGTM 1. labels Sep 14, 2020
@fzhedu
Copy link
Contributor

fzhedu commented Sep 14, 2020

/merge

@ti-srebot
Copy link
Contributor Author

Sorry @fzhedu, you don't have permission to trigger auto merge event on this branch.
The version releasement is in progress.

@SunRunAway
Copy link
Contributor

/merge

@ti-srebot ti-srebot added the status/can-merge Indicates a PR has been approved by a committer. label Sep 16, 2020
@ti-srebot
Copy link
Contributor Author

/run-all-tests

@ti-srebot ti-srebot merged commit 8e4b18a into pingcap:release-4.0 Sep 16, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
component/expression status/can-merge Indicates a PR has been approved by a committer. status/LGT2 Indicates that a PR has LGTM 2. type/4.0-cherry-pick
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants