-
Notifications
You must be signed in to change notification settings - Fork 410
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
Refine the spill threshold for aggregation/sort, refine the memory usage calculation for aggregation #6708
Conversation
[REVIEW NOTIFICATION] This pull request has been approved by:
To complete the pull request process, please ask the reviewers in the list to review by filling The full list of commands accepted by this bot can be found here. Reviewer can indicate their review by submitting an approval review. |
@@ -718,7 +718,7 @@ struct AggregatedDataVariants : private boost::noncopyable | |||
case Type::NAME: \ | |||
{ \ | |||
const auto * ptr = reinterpret_cast<const AggregationMethodName(NAME) *>(aggregation_method_impl); \ | |||
return ptr->data.size() + (without_key != nullptr); \ | |||
return ptr->data.size(); \ |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
why remove the (without_key != nullptr) check here?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It is used by over_flow_row
, and we already remove the support of over_flow_row
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
@@ -120,7 +120,7 @@ void orderStreams( | |||
order_descr, | |||
settings.max_block_size, | |||
limit, | |||
settings.max_bytes_before_external_sort, | |||
getAverageThreshold(settings.max_bytes_before_external_sort, std::min(max_streams, pipeline.streams.size())), |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I prefer
auto avg_threshold = getAverageThreshold(settings.max_bytes_before_external_sort, pipeline.streams.size());
pipeline.transform([&](auto & stream) {
stream = std::make_shared<MergeSortingBlockInputStream>(xxxx, avg_threshold);
};
The count of sort stream is pipeline.streams.size()
at this time, not min(max_streams, pipeline.streams.size())
, even if max_streams < pipeline.streams.size()
. So we shoud use pipeline.streams.size()
or not std::min(max_streams, pipeline.streams.size())
here?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done
203a7b1
to
d05ce9f
Compare
d05ce9f
to
3435b39
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
lgtm
426315f
to
7cd5002
Compare
/run-all-tests |
/hold |
hold after code freeze for v6.6 |
Signed-off-by: xufei <xufeixw@mail.ustc.edu.cn>
Signed-off-by: xufei <xufeixw@mail.ustc.edu.cn>
99730f0
to
8fbf2c2
Compare
/unhold |
/merge |
@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 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. |
This pull request has been accepted and is ready to merge. Commit hash: 8fbf2c2
|
@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
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. |
…age calculation for aggregation (pingcap#6708) ref pingcap#6528
What problem does this PR solve?
Issue Number: ref #6528
Problem Summary:
What is changed and how it works?
Check List
Tests
Side effects
Documentation
Release note