Skip to content

expression, planner: push cast down to control function with enum type. (#24542)#30857

Merged
ti-chi-bot merged 6 commits intopingcap:release-5.0from
ti-srebot:release-5.0-ac7e6a42c503
Dec 20, 2021
Merged

expression, planner: push cast down to control function with enum type. (#24542)#30857
ti-chi-bot merged 6 commits intopingcap:release-5.0from
ti-srebot:release-5.0-ac7e6a42c503

Conversation

@ti-srebot
Copy link
Contributor

@ti-srebot ti-srebot commented Dec 20, 2021 •
edited by wshwsh12
Loading

cherry-pick #24542 to release-5.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/30857

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

git push git@github.com:ti-srebot/tidb.git pr/30857:release-5.0-ac7e6a42c503

What problem does this PR solve?

Issue Number: close #23114

Problem Summary: Control function with enum type gets wrong result.

What is changed and how it works?

Proposal: xxx

What's Changed:

  1. Try to push down cast funtion into control function(if/case..when/elt)
    (I have a test in mysql, ifnull(e,e) result is always string, and when compare with int, it will convert string to float)
  2. Add cast to double for where condition if the eval type is ETString and the expression is control function with enum.

How it Works:

Related changes

Check List

Tests

  • Unit test
  • Integration test

Side effects

Release note 

Fix wrong result for control function with enum type.

@wshwsh12 @ti-srebot
cherry pick pingcap#24542 to release-5.0
a42a0bf 
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-chi-bot
Copy link
Member

ti-chi-bot commented Dec 20, 2021 •
edited
Loading

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • XuHuaiyu
  • guo-shaoge

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.

Details

Reviewer can indicate their review by submitting an approval review.
Reviewer can cancel approval by submitting a request changes review.

@ti-chi-bot ti-chi-bot added do-not-merge/cherry-pick-not-approved do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. labels Dec 20, 2021
@ti-srebot
Copy link
Contributor Author

ti-srebot commented Dec 20, 2021

/run-all-tests

@ti-srebot ti-srebot mentioned this pull request Dec 20, 2021
Merged
@ti-srebot ti-srebot added component/expression size/L Denotes a PR that changes 100-499 lines, ignoring generated files. type/5.0-cherry-pick type/bugfix This PR fixes a bug. labels Dec 20, 2021
@ti-srebot
Copy link
Contributor Author

ti-srebot commented Dec 20, 2021

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

XuHuaiyu
XuHuaiyu approved these changes Dec 20, 2021
View reviewed changes
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

@ti-chi-bot ti-chi-bot added status/LGT1 Indicates that a PR has LGTM 1. release-note Denotes a PR that will be considered when it comes time to generate release notes. and removed do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. labels Dec 20, 2021
@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 Dec 20, 2021
@zhouqiang-cl zhouqiang-cl added the cherry-pick-approved Cherry pick PR approved by release team. label Dec 20, 2021
@wshwsh12
Copy link
Contributor

wshwsh12 commented Dec 20, 2021

/merge

@ti-chi-bot
Copy link
Member

ti-chi-bot commented Dec 20, 2021

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

DetailsCommit hash: 5736a94

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Dec 20, 2021
@zhouqiang-cl
Copy link
Contributor

zhouqiang-cl commented Dec 20, 2021

/merge

@wshwsh12
Copy link
Contributor

wshwsh12 commented Dec 20, 2021

/merge

@wshwsh12
Copy link
Contributor

wshwsh12 commented Dec 20, 2021

/merge

@ti-chi-bot
Copy link
Member

ti-chi-bot commented Dec 20, 2021

@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.

Details

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.

@ti-chi-bot ti-chi-bot merged commit ecdf57b into pingcap:release-5.0 Dec 20, 2021
@zhouqiang-cl zhouqiang-cl added this to the v5.0.6 milestone Dec 21, 2021
@XuHuaiyu XuHuaiyu mentioned this pull request Dec 22, 2021
Merged
14 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@guo-shaoge guo-shaoge guo-shaoge approved these changes

@XuHuaiyu XuHuaiyu XuHuaiyu approved these changes

@lzmhhh123 lzmhhh123 Awaiting requested review from lzmhhh123

Assignees

@wshwsh12 wshwsh12

Labels

cherry-pick-approved Cherry pick PR approved by release team. component/expression release-note Denotes a PR that will be considered when it comes time to generate release notes. size/L Denotes a PR that changes 100-499 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/5.0-cherry-pick

Projects

None yet

Milestone

v5.0.6

Development

Successfully merging this pull request may close these issues.

6 participants

@ti-srebot @ti-chi-bot @wshwsh12 @zhouqiang-cl @guo-shaoge @XuHuaiyu