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

max_block_size take effect on NonJoinedBlockInputStream #6663

Merged
merged 1 commit into from
Jan 20, 2023
Merged

max_block_size take effect on NonJoinedBlockInputStream #6663

merged 1 commit into from
Jan 20, 2023

Conversation

windtalker
Copy link
Contributor

What problem does this PR solve?

Issue Number: ref #3436

Problem Summary:

What is changed and how it works?

  1. make the size of block returned by NonJoinedBlockInputStream under max_block_size
  2. refine test for non-joined-data, use left join's result as the reference.

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 Jan 19, 2023 •
edited

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • SeaRise
  • mengxin9014

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 size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Jan 19, 2023
mengxin9014
mengxin9014 reviewed Jan 19, 2023
View reviewed changes
dbms/src/DataStreams/NonJoinedBlockInputStream.cpp
rows_added += AdderNonJoined<STRICTNESS, typename Map::mapped_type>::add((*it)->getMapped(), key_num, num_columns_left, mutable_columns_left, num_columns_right, mutable_columns_right);

if (rows_added >= max_block_size)
if constexpr (STRICTNESS == ASTTableJoin::Strictness::Any)
Copy link
Contributor

Choose a reason for hiding this comment

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

Maybe we can simplify this if statement to

            rows_added += AdderNonJoined<STRICTNESS, typename Map::mapped_type>::add((*it)->getMapped(), key_num, num_columns_left, mutable_columns_left, num_columns_right, mutable_columns_right, current_index_in_row_list, STRICTNESS == ASTTableJoin::Strictness::Any ? 1 :  max_block_size - rows_added);
            assert(rows_added <= max_block_size);
            if constexpr (STRICTNESS == ASTTableJoin::Strictness::Any)
            {
                ++(*it);
            }
            else if(current_index_in_row_list == 0)
            {
                ++(*it);
            }
            
            if (rows_added == max_block_size)
            {
                break;
            }

Copy link
Contributor

Choose a reason for hiding this comment

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

Others LGTM.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Good point, refined the code.

@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Jan 19, 2023
@windtalker windtalker force-pushed the non_joined_with_max_block_size branch from 11da41b to 51fc619 Compare January 19, 2023 12:17
SeaRise
SeaRise reviewed Jan 20, 2023
View reviewed changes
dbms/src/DataStreams/NonJoinedBlockInputStream.cpp Outdated
for (auto current = &static_cast<const typename Mapped::Base_t &>(mapped); current != nullptr; current = current->next)
auto current = &static_cast<const typename Mapped::Base_t &>(mapped);
/// skip the added row
for (size_t i = 0; i < next_index_in_row_list; i++, current = current->next)
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
for (size_t i = 0; i < next_index_in_row_list; i++, current = current->next)
for (size_t i = 0; i < next_index_in_row_list; ++i, current = current->next)

dbms/src/DataStreams/NonJoinedBlockInputStream.cpp Outdated
Comment on lines 54 to 60
auto current = &static_cast<const typename Mapped::Base_t &>(mapped);
/// skip the added row
for (size_t i = 0; i < next_index_in_row_list; i++, current = current->next)
{
assert(current != nullptr);
}
assert(current != nullptr);
Copy link
Contributor

Choose a reason for hiding this comment

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

Could it hold a pointer directly instead of index?

SeaRise
SeaRise approved these changes Jan 20, 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

@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 Jan 20, 2023
@windtalker windtalker force-pushed the non_joined_with_max_block_size branch from 02f583b to 1caebec Compare January 20, 2023 02:52
@windtalker
Copy link
Contributor Author

/merge

@ti-chi-bot
Copy link
Member

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

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

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

Commit hash: 1caebec

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Jan 20, 2023
@ti-chi-bot ti-chi-bot merged commit ca13501 into pingcap:master Jan 20, 2023
@windtalker windtalker deleted the non_joined_with_max_block_size branch January 30, 2023 12:47
ywqzzy pushed a commit to ywqzzy/tiflash_1 that referenced this pull request Feb 13, 2023
@windtalker @ywqzzy
max_block_size take effect on NonJoinedBlockInputStream (pingcap#…
ac062c6 
…6663)

ref pingcap#3436

Signed-off-by: ywqzzy <592838129@qq.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mengxin9014 mengxin9014 mengxin9014 approved these changes

@SeaRise SeaRise SeaRise approved these changes

Assignees
No one assigned
Labels
release-note-none 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.

None yet
4 participants
@windtalker @ti-chi-bot @mengxin9014 @SeaRise