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

Handle ColumnNothing column in recordFilteredRows of Join #8587

Merged
merged 9 commits into from
Dec 26, 2023
Merged

Handle ColumnNothing column in recordFilteredRows of Join #8587

merged 9 commits into from
Dec 26, 2023

Conversation

yibin87
Copy link
Contributor

@yibin87 yibin87 commented Dec 25, 2023

What problem does this PR solve?

Issue Number: close #8562

Problem Summary:
TiDB changes the return type of IfString from String to Null(Strange that not constant folding completely), thus introduced ColumnNothing in filter result column. It is not handled before.

What is changed and how it works?

Check List

Tests

  • Unit test
  • Integration test
  • Manual test (add detailed scripts or steps below)
  • No code

Side effects

  • Performance regression: Consumes more CPU
  • Performance regression: Consumes more Memory
  • Breaking backward compatibility

Documentation

  • Affects user behaviors
  • Contains syntax changes
  • Contains variable changes
  • Contains experimental features
  • Changes MySQL compatibility

Release note

None

@ti-chi-bot ti-chi-bot bot added release-note-none Denotes a PR that doesn't merit a release note. needs-cherry-pick-release-7.5 Should cherry pick this PR to release-7.5 branch. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Dec 25, 2023
@yibin87
Copy link
Contributor Author

yibin87 commented Dec 25, 2023

/run-all-tests

@yibin87
Little update
2a29a90 
Signed-off-by: yibin <[email protected]>
@yibin87
Copy link
Contributor Author

yibin87 commented Dec 26, 2023

/run-all-tests

windtalker
windtalker reviewed Dec 26, 2023
View reviewed changes
dbms/src/Interpreters/JoinUtils.cpp
@@ -51,6 +51,24 @@ void recordFilteredRows(
auto column = block.getByName(filter_column).column;
if (column->isColumnConst())
column = column->convertToFullColumnIfConst();
if unlikely (column->onlyNull())
Copy link
Contributor

Choose a reason for hiding this comment

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

Move this check before if (column->isColumnConst())?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

ok, updated it

@yibin87
Address comments
cc01025 
Signed-off-by: yibin <[email protected]>
@yibin87 yibin87 requested a review from windtalker December 26, 2023 01:54
@yibin87
Fix format issue
c806c56 
Signed-off-by: yibin <[email protected]>
@yibin87
Copy link
Contributor Author

yibin87 commented Dec 26, 2023

/run-all-tests

@yibin87
Update test
425fed5 
Signed-off-by: yibin <[email protected]>
@yibin87
Copy link
Contributor Author

yibin87 commented Dec 26, 2023

/run-all-tests

windtalker
windtalker approved these changes Dec 26, 2023
View reviewed changes
Copy link
Contributor

@windtalker windtalker 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 bot added needs-1-more-lgtm Indicates a PR needs 1 more LGTM. approved labels Dec 26, 2023
xzhangxian1008
xzhangxian1008 approved these changes Dec 26, 2023
View reviewed changes
Copy link
Contributor

@xzhangxian1008 xzhangxian1008 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 bot added the lgtm label Dec 26, 2023
@ti-chi-bot ti-chi-bot
Copy link
Contributor

ti-chi-bot bot commented Dec 26, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: windtalker, xzhangxian1008

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@ti-chi-bot ti-chi-bot bot removed the needs-1-more-lgtm Indicates a PR needs 1 more LGTM. label Dec 26, 2023
@ti-chi-bot ti-chi-bot
Copy link
Contributor

ti-chi-bot bot commented Dec 26, 2023

[LGTM Timeline notifier]

Timeline:

  • 2023-12-26 03:24:24.516758237 +0000 UTC m=+1536155.553985162: ☑️ agreed by windtalker.
  • 2023-12-26 04:03:13.934870451 +0000 UTC m=+1538484.972097378: ☑️ agreed by xzhangxian1008.

@ti-chi-bot ti-chi-bot
Copy link
Contributor

ti-chi-bot bot commented Dec 26, 2023

@yibin87: 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

trigger some heavy tests which will not run always when PR updated.

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.

@yibin87
update test
983bf21 
Signed-off-by: yibin <[email protected]>
@yibin87
Copy link
Contributor Author

yibin87 commented Dec 26, 2023

/run-all-tests

1 similar comment
@yibin87
Copy link
Contributor Author

yibin87 commented Dec 26, 2023

/run-all-tests

@yibin87
Copy link
Contributor Author

yibin87 commented Dec 26, 2023

/run-all-tests

@ti-chi-bot ti-chi-bot bot merged commit da57db5 into pingcap:master Dec 26, 2023
6 checks passed
@ti-chi-bot ti-chi-bot mentioned this pull request Dec 26, 2023
Merged
12 tasks
@ti-chi-bot
Copy link
Member

In response to a cherrypick label: new pull request created to branch release-7.5: #8591.

ti-chi-bot bot pushed a commit that referenced this pull request Dec 26, 2023
@ti-chi-bot
Handle ColumnNothing column in recordFilteredRows of Join (#8587) (#8591
c48ffc4 
)

close #8562
JaySon-Huang pushed a commit to JaySon-Huang/tiflash that referenced this pull request Dec 27, 2023
@yibin87 @JaySon-Huang
Handle ColumnNothing column in recordFilteredRows of Join (pingcap#8587)
1673d1a 
close pingcap#8562
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@xzhangxian1008 xzhangxian1008 xzhangxian1008 approved these changes

@windtalker windtalker windtalker approved these changes

Assignees
No one assigned
Labels
approved lgtm needs-cherry-pick-release-7.5 Should cherry pick this PR to release-7.5 branch. release-note-none Denotes a PR that doesn't merit a release note. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

NPE when hash join
4 participants
@yibin87 @ti-chi-bot @windtalker @xzhangxian1008