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.

Sign up for GitHub

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

Jump to bottom

planner: revise isnullRejected check for And and OR #38430

Merged
merged 16 commits into from
Oct 13, 2022
Merged

planner: revise isnullRejected check for And and OR #38430

merged 16 commits into from
Oct 13, 2022

Conversation

Yisaer
Copy link
Contributor

@Yisaer Yisaer commented Oct 12, 2022 •
edited
Loading

Signed-off-by: yisaer disxiaofei@163.com

What problem does this PR solve?

Issue Number: close #38304

Problem Summary:

The And and OR result would be changed by Null which is transformed by the column schema in isNullRejected

What is changed and how it works?

revise isnullRejected check for And and OR

Check List

Tests

  • Unit test

Release note

Please refer to Release Notes Language Style Guide to write a quality release note.

None

@Yisaer
fix
17d1a2a 
Signed-off-by: yisaer <disxiaofei@163.com>
@Yisaer
fix
b8ae8f4 
Signed-off-by: yisaer <disxiaofei@163.com>
@Yisaer
fix
fd5756d 
Signed-off-by: yisaer <disxiaofei@163.com>
@Yisaer
fix
9ea964d 
Signed-off-by: yisaer <disxiaofei@163.com>
@ti-chi-bot
Copy link
Member

ti-chi-bot commented Oct 12, 2022 •
edited
Loading

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • hawkingrei
  • xuyifangreeneyes

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 release-note-none Denotes a PR that doesn't merit a release note. do-not-merge/needs-triage-completed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed do-not-merge/needs-triage-completed labels Oct 12, 2022
xuyifangreeneyes
xuyifangreeneyes approved these changes Oct 12, 2022
View reviewed changes
expression/constant_fold.go Outdated Show resolved Hide resolved
@ti-chi-bot ti-chi-bot added status/LGT1 Indicates that a PR has LGTM 1. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Oct 12, 2022
@Yisaer
Copy link
Contributor Author

Yisaer commented Oct 12, 2022

/hold

@ti-chi-bot ti-chi-bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Oct 12, 2022
@Yisaer
fix
ef36380 
Signed-off-by: yisaer <disxiaofei@163.com>

fix

Signed-off-by: yisaer <disxiaofei@163.com>

Revert "fix"

This reverts commit 14a73794db9fd0eb6f236a063004e7172d1acaa6.

fix

Signed-off-by: yisaer <disxiaofei@163.com>
@Yisaer
fix
b27f92a 
Signed-off-by: yisaer <disxiaofei@163.com>
@Yisaer
Copy link
Contributor Author

Yisaer commented Oct 12, 2022

/run-mysql-test

@Yisaer
fix test
b9f937c 
Signed-off-by: yisaer <disxiaofei@163.com>
@Yisaer
fix test
197454f 
Signed-off-by: yisaer <disxiaofei@163.com>
@ti-chi-bot ti-chi-bot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Oct 13, 2022
@Yisaer
fix test
be2caa1 
Signed-off-by: yisaer <disxiaofei@163.com>
@Yisaer Yisaer changed the title planner: fix constant folding for AND/OR with null arguments planner: revise isnullRejected check for And and OR Oct 13, 2022
@Yisaer
Copy link
Contributor Author

Yisaer commented Oct 13, 2022

/hold cancel

@ti-chi-bot ti-chi-bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Oct 13, 2022
@hawkingrei
Copy link
Member

/run-build

@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 Oct 13, 2022
@Yisaer
Copy link
Contributor Author

Yisaer commented Oct 13, 2022

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: 712cc5a

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Oct 13, 2022
@Yisaer
Copy link
Contributor Author

Yisaer commented Oct 13, 2022

/run-mysql-test

@hawkingrei
Copy link
Member

/run-mysql-test tidb-test=pr/1991

@hawkingrei
Copy link
Member

/run-check_dev_2

@hawkingrei
Copy link
Member

/run-unit-test

@hawkingrei
Copy link
Member

/run-build

@hawkingrei
Copy link
Member

/run-unit-test

@ti-chi-bot ti-chi-bot merged commit 84fbfca into pingcap:master Oct 13, 2022
@sre-bot
Copy link
Contributor

sre-bot commented Oct 13, 2022

TiDB MergeCI notify

🔴 Bad News! [2] CI still failing after this pr merged.
These failed integration tests don't seem to be introduced by the current PR.

CI Name Result Duration Compare with Parent commit
idc-jenkins-ci-tidb/integration-common-test 🔴 failed 3, success 14, total 17 15 min Existing failure
idc-jenkins-ci-tidb/tics-test 🔴 failed 1, success 0, total 1 4 min 32 sec Existing failure
idc-jenkins-ci-tidb/integration-ddl-test 🟢 all 6 tests passed 30 min Existing passed
idc-jenkins-ci/integration-cdc-test 🟢 all 37 tests passed 24 min Existing passed
idc-jenkins-ci-tidb/common-test 🟢 all 11 tests passed 9 min 4 sec Existing passed
idc-jenkins-ci-tidb/sqllogic-test-2 🟢 all 28 tests passed 8 min 14 sec Existing passed
idc-jenkins-ci-tidb/sqllogic-test-1 🟢 all 26 tests passed 5 min 14 sec Existing passed
idc-jenkins-ci-tidb/mybatis-test 🟢 all 1 tests passed 4 min 25 sec Existing passed
idc-jenkins-ci-tidb/integration-compatibility-test 🟢 all 1 tests passed 4 min 25 sec Existing passed
idc-jenkins-ci-tidb/plugin-test 🟢 build success, plugin test success 4min Existing passed

mjonss added a commit that referenced this pull request Oct 13, 2022
@mjonss @xiongjiwei @Yisaer
Merge master into feature branch (#38463)
0d316ef 
* mockkv: make pk id = -1 if no primary key column is used (#38443)

* ddl: support modify column on partitioned table (#38302)

close #38297

* planner: revise isnullRejected check for `And` and `OR` (#38430)

close #38304

Co-authored-by: xiongjiwei <xiongjiwei1996@outlook.com>
Co-authored-by: Song Gao <disxiaofei@163.com>
@Yisaer Yisaer mentioned this pull request Oct 19, 2022
Closed
@xuyifangreeneyes xuyifangreeneyes mentioned this pull request Oct 27, 2022
Closed
@qw4990 qw4990 mentioned this pull request Dec 20, 2023
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@xuyifangreeneyes xuyifangreeneyes xuyifangreeneyes approved these changes

@hawkingrei hawkingrei hawkingrei approved these changes

Assignees
No one assigned
Labels
release-note-none Denotes a PR that doesn't merit a release note. 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.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Incorrect Result by LEFT JOIN
5 participants
@Yisaer @ti-chi-bot @hawkingrei @sre-bot @xuyifangreeneyes