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

executor: fix ifnull bug when arg is enum/set (#25110) #26035

Merged
merged 3 commits into from
Jul 14, 2021

Conversation

ti-srebot
Copy link
Contributor

@ti-srebot ti-srebot commented Jul 8, 2021

cherry-pick #25110 to release-4.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/26035

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

git push [email protected]:ti-srebot/tidb.git pr/26035:release-4.0-6563219318b3

Signed-off-by: guo-shaoge [email protected]

What problem does this PR solve?

Issue Number: close #24944

Problem Summary: Just as this comment said. ifnull will be removed if its first argument has not null attributes. But it doesn't work properly if first argument is enum/set. Because enum/set has two semantics(int/string). We may use its string semantics unexpectedly. So we cannot remote ifnull if its first argument is enum/set.

What is changed and how it works?

What's Changed: If ifnull's first argument is enum/set, doesn't rewrite it.

Related changes

  • Need to cherry-pick to the release branch

Check List

Tests

  • Integration test

Side effects: We may lose some performance for ifnull expression when argument is enum/set. But we have to do it to make it right.

Release note

  • executor: fix ifnull bug when arg is enum/set

@ti-srebot
Copy link
Contributor Author

/run-all-tests

@ti-srebot ti-srebot added sig/planner SIG: Planner size/S Denotes a PR that changes 10-29 lines, ignoring generated files. type/4.0-cherry-pick type/bugfix This PR fixes a bug. labels Jul 8, 2021
@ti-srebot ti-srebot added this to the v4.0.13 milestone Jul 8, 2021
@ti-srebot
Copy link
Contributor Author

@guo-shaoge you're already a collaborator in bot's repo.

@ti-chi-bot
Copy link
Member

@wshwsh12: Thanks for your review. The bot only counts approvals from reviewers and higher roles in list, but you're still welcome to leave your comments.

In response to this:

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.

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 the status/LGT1 Indicates that a PR has LGTM 1. label Jul 12, 2021
@ti-chi-bot
Copy link
Member

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • XuHuaiyu
  • lzmhhh123

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.

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 status/LGT2 Indicates that a PR has LGTM 2. and removed status/LGT1 Indicates that a PR has LGTM 1. labels Jul 14, 2021
@zhouqiang-cl
Copy link
Contributor

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: f9ccc5e

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Jul 14, 2021
@ti-chi-bot
Copy link
Member

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

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 7874d60 into pingcap:release-4.0 Jul 14, 2021
@zhouqiang-cl zhouqiang-cl modified the milestones: v4.0.13, v4.0.14 Jul 19, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cherry-pick-approved Cherry pick PR approved by release team. sig/planner SIG: Planner size/S Denotes a PR that changes 10-29 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/4.0-cherry-pick
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants