Skip to content

merge join result block if needed#7268

Merged
ti-chi-bot merged 10 commits intopingcap:masterfrom
windtalker:merge_join_result_block_if_needed
Apr 13, 2023
Merged

merge join result block if needed#7268
ti-chi-bot merged 10 commits intopingcap:masterfrom
windtalker:merge_join_result_block_if_needed

Conversation

@windtalker
Copy link
Contributor

@windtalker windtalker commented Apr 11, 2023 •
edited
Loading

What problem does this PR solve?

Issue Number: close #6533

Problem Summary:

What is changed and how it works?

This pr is a re-implementaion of #6529, #6529 is reverted because it will make performance regression. Compared to #6529, this pr reduce the potential performance regression by

  • Use a more reasonable threshold to trigger block merge
  • Only merge the result blocks inside one probe block

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

ti-chi-bot commented Apr 11, 2023 •
edited
Loading

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • SeaRise
  • gengliqi

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 release-note-none Denotes a PR that doesn't merit a release note. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels Apr 11, 2023
windtalker
windtalker commented Apr 11, 2023
View reviewed changes
@SeaRise SeaRise self-requested a review April 11, 2023 04:38
SeaRise
SeaRise reviewed Apr 11, 2023
View reviewed changes
Copy link
Contributor

@SeaRise SeaRise left a comment

Choose a reason for hiding this comment

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

Others LGTM

@windtalker windtalker force-pushed the merge_join_result_block_if_needed branch from 986f0bf to fc0be5f Compare April 12, 2023 09:36
@windtalker windtalker requested a review from SeaRise April 12, 2023 09:58
SeaRise
SeaRise approved these changes Apr 12, 2023
View reviewed changes
Copy link
Contributor

@SeaRise SeaRise 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 Apr 12, 2023
gengliqi
gengliqi reviewed Apr 12, 2023
View reviewed changes
windtalker and others added 9 commits April 13, 2023 09:57
@windtalker
merge join result block if needed
71e684a 
Signed-off-by: xufei <xufeixw@mail.ustc.edu.cn>
@windtalker
fix build
b83598a 
Signed-off-by: xufei <xufeixw@mail.ustc.edu.cn>
@windtalker
address comments
3f55fae 
Signed-off-by: xufei <xufeixw@mail.ustc.edu.cn>
@windtalker @SeaRise
Update dbms/src/Interpreters/Join.cpp
2d25181 
Co-authored-by: SeaRise <hhssearise@foxmail.com>
@windtalker
fix build
6139861 
Signed-off-by: xufei <xufeixw@mail.ustc.edu.cn>
@windtalker
more refine
0819900 
Signed-off-by: xufei <xufeixw@mail.ustc.edu.cn>
@windtalker
rename
43d6f26 
Signed-off-by: xufei <xufeixw@mail.ustc.edu.cn>
@windtalker
save work
a7dcd7f 
Signed-off-by: xufei <xufeixw@mail.ustc.edu.cn>
@windtalker
add more tests
2b70eaf 
Signed-off-by: xufei <xufeixw@mail.ustc.edu.cn>
@windtalker windtalker force-pushed the merge_join_result_block_if_needed branch from 9b416a6 to 2b70eaf Compare April 13, 2023 02:25
@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 Apr 13, 2023
@windtalker
Copy link
Contributor Author

windtalker commented Apr 13, 2023

/merge

@ti-chi-bot
Copy link
Member

ti-chi-bot commented Apr 13, 2023

@windtalker: It seems you want to merge this PR, I will help you trigger all the tests:

/run-all-tests

You only need to trigger /merge once, and 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.

If you have any questions about the PR merge process, please refer to pr process.

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

ti-chi-bot commented Apr 13, 2023

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

DetailsCommit hash: 2b70eaf

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

ti-chi-bot commented Apr 13, 2023

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

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 dc227b7 into pingcap:master Apr 13, 2023
@windtalker windtalker deleted the merge_join_result_block_if_needed branch April 13, 2023 08:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@gengliqi gengliqi gengliqi approved these changes

+1 more reviewer

@SeaRise SeaRise SeaRise approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

release-note-none Denotes a PR that doesn't merit a release note. size/XL Denotes a PR that changes 500-999 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.

merge join probe return block if need

4 participants

@windtalker @ti-chi-bot @gengliqi @SeaRise