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: split isTrue and isFalse expression sig (#16542) #16627

Merged
merged 7 commits into from May 7, 2020

Conversation

sre-bot
Copy link
Contributor

@sre-bot sre-bot commented Apr 20, 2020

cherry-pick #16542 to release-3.0


What problem does this PR solve?

Close: #15718
Close: #15987
Close: #16501
Related PR: #12173 #15926 tikv#7532

The reason for the above error is that the variable keepNull in the expression isTrue and isFalse is not pushed down correctly.
After an offline discussion with @XuHuaiyu @SunRunAway @breeswish , we decided to eliminate the keepNull variable by splitting the isTrue and isFalse expression sig to solve this problem.

What is changed and how it works?

Split the isTrue and isFalse expression sig. When the keepNull = true, we set setPbCode = tipb.ScalarFuncSig_XXXIsTrueWithNull. When the keepNull = false, we set setPbCode = tipb.ScalarFuncSig_XXXIsTrue.
So we can don't need to push down the keepNull variable.

Check List

Tests

  • Unit test
  • Integration test

Release note

  • expression: split isTrue and isFalse expression sig

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

sre-bot commented Apr 20, 2020

/run-all-tests

@Reminiscent
Copy link
Contributor

wait for tipb#179 and tikv#7365

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.

@Reminiscent please resolve conflict and fix CI.

@Reminiscent
Copy link
Contributor

/run-all-tests tikv=pr/7565

@Reminiscent
Copy link
Contributor

/run-all-tests

@Reminiscent
Copy link
Contributor

@XuHuaiyu @zz-jason PTAL

@zz-jason
Copy link
Member

run-integration-common-test

@zz-jason
Copy link
Member

/run-integration-common-test

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 Apr 28, 2020
breezewish
breezewish previously approved these changes Apr 30, 2020
Copy link
Member

@breezewish breezewish left a comment

Choose a reason for hiding this comment

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

LGTM. Please fix conflicts.

…e-bot/release-3.0-8b6d53a4a959

� Conflicts:
�	executor/executor_test.go
@Reminiscent
Copy link
Contributor

@breeswish PTAL. Thanks!

@Reminiscent
Copy link
Contributor

/rebuild

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
Copy link
Contributor

XuHuaiyu commented May 7, 2020

/run-all-tests

@SunRunAway SunRunAway merged commit caf7527 into pingcap:release-3.0 May 7, 2020
@SunRunAway SunRunAway added status/LGT2 Indicates that a PR has LGTM 2. and removed status/LGT1 Indicates that a PR has LGTM 1. labels May 7, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
component/expression sig/execution SIG execution status/LGT2 Indicates that a PR has LGTM 2. type/bug-fix This PR fixes a bug. type/3.0-cherry-pick
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants