[Improvement](sort) Free sort blocks if this block is exhausted #39306
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Thank you for your contribution to Apache Doris. Since 2024-03-18, the Document has been moved to doris-website. |
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
| } else { | ||
| RETURN_IF_ERROR(partition_sort_read(block, eos, state->batch_size())); | ||
| } | ||
| RETURN_IF_ERROR(partition_sort_read(block, eos, state->batch_size())); | ||
| } | ||
| return Status::OK(); | ||
| } | ||
|
|
||
| Status PartitionSorter::partition_sort_read(Block* output_block, bool* eos, int batch_size) { |
There was a problem hiding this comment.
warning: function 'partition_sort_read' has cognitive complexity of 55 (threshold 50) [readability-function-cognitive-complexity]
Status PartitionSorter::partition_sort_read(Block* output_block, bool* eos, int batch_size) {
^Additional context
be/src/vec/common/sort/partition_sorter.cpp:102: +1, including nesting penalty of 0, nesting level increased to 1
if (priority_queue.empty()) {
^be/src/vec/common/sort/partition_sorter.cpp:114: +1, including nesting penalty of 0, nesting level increased to 1
while (!priority_queue.empty()) {
^be/src/vec/common/sort/partition_sorter.cpp:117: +2, including nesting penalty of 1, nesting level increased to 2
if (UNLIKELY(_previous_row->impl == nullptr)) {
^be/src/vec/common/sort/partition_sorter.cpp:121: +2, including nesting penalty of 1, nesting level increased to 2
switch (_top_n_algorithm) {
^be/src/vec/common/sort/partition_sorter.cpp:124: +3, including nesting penalty of 2, nesting level increased to 3
if ((current_output_rows + _output_total_rows) < _partition_inner_limit) {
^be/src/vec/common/sort/partition_sorter.cpp:125: +4, including nesting penalty of 3, nesting level increased to 4
for (size_t i = 0; i < num_columns; ++i) {
^be/src/vec/common/sort/partition_sorter.cpp:128: +1, nesting level increased to 3
} else {
^be/src/vec/common/sort/partition_sorter.cpp:140: +3, including nesting penalty of 2, nesting level increased to 3
if (_has_global_limit &&
^be/src/vec/common/sort/partition_sorter.cpp:140: +1
if (_has_global_limit &&
^be/src/vec/common/sort/partition_sorter.cpp:145: +3, including nesting penalty of 2, nesting level increased to 3
if (_has_global_limit) {
^be/src/vec/common/sort/partition_sorter.cpp:147: +1, nesting level increased to 3
} else {
^be/src/vec/common/sort/partition_sorter.cpp:150: +4, including nesting penalty of 3, nesting level increased to 4
if (cmp_res == false) {
^be/src/vec/common/sort/partition_sorter.cpp:152: +5, including nesting penalty of 4, nesting level increased to 5
if (_output_distinct_rows >= _partition_inner_limit) {
^be/src/vec/common/sort/partition_sorter.cpp:159: +3, including nesting penalty of 2, nesting level increased to 3
for (size_t i = 0; i < num_columns; ++i) {
^be/src/vec/common/sort/partition_sorter.cpp:169: +3, including nesting penalty of 2, nesting level increased to 3
if (_has_global_limit &&
^be/src/vec/common/sort/partition_sorter.cpp:169: +1
if (_has_global_limit &&
^be/src/vec/common/sort/partition_sorter.cpp:176: +3, including nesting penalty of 2, nesting level increased to 3
if (cmp_res == false) {
^be/src/vec/common/sort/partition_sorter.cpp:178: +4, including nesting penalty of 3, nesting level increased to 4
if ((current_output_rows + _output_total_rows) >= _partition_inner_limit) {
^be/src/vec/common/sort/partition_sorter.cpp:184: +3, including nesting penalty of 2, nesting level increased to 3
for (size_t i = 0; i < num_columns; ++i) {
^be/src/vec/common/sort/partition_sorter.cpp:194: +2, including nesting penalty of 1, nesting level increased to 2
if (!current->is_last()) {
^be/src/vec/common/sort/partition_sorter.cpp:199: +2, including nesting penalty of 1, nesting level increased to 2
if (current_output_rows == batch_size || get_enough_data == true) {
^be/src/vec/common/sort/partition_sorter.cpp:199: +1
if (current_output_rows == batch_size || get_enough_data == true) {
^be/src/vec/common/sort/partition_sorter.cpp:205: +1, including nesting penalty of 0, nesting level increased to 1
if (current_output_rows == 0 || get_enough_data == true) {
^be/src/vec/common/sort/partition_sorter.cpp:205: +1
if (current_output_rows == 0 || get_enough_data == true) {
^
|
run buildall |
|
run buildall |
TPC-H: Total hot run time: 40202 ms |
TPC-DS: Total hot run time: 185209 ms |
ClickBench: Total hot run time: 31.1 s |
|
run buildall |
TPC-H: Total hot run time: 37515 ms |
TPC-DS: Total hot run time: 189880 ms |
ClickBench: Total hot run time: 30.85 s |
|
run buildall |
|
run buildall |
TPC-H: Total hot run time: 37459 ms |
TPC-DS: Total hot run time: 189039 ms |
ClickBench: Total hot run time: 31.1 s |
|
run buildall |
TPC-H: Total hot run time: 37797 ms |
|
run buildall |
TPC-H: Total hot run time: 37718 ms |
| } else { | ||
| RETURN_IF_ERROR(partition_sort_read(block, eos, state->batch_size())); | ||
| } | ||
| RETURN_IF_ERROR(partition_sort_read(block, eos, state->batch_size())); | ||
| } | ||
| return Status::OK(); | ||
| } | ||
|
|
||
| Status PartitionSorter::partition_sort_read(Block* output_block, bool* eos, int batch_size) { |
There was a problem hiding this comment.
warning: function 'partition_sort_read' has cognitive complexity of 55 (threshold 50) [readability-function-cognitive-complexity]
Status PartitionSorter::partition_sort_read(Block* output_block, bool* eos, int batch_size) {
^Additional context
be/src/vec/common/sort/partition_sorter.cpp:97: +1, including nesting penalty of 0, nesting level increased to 1
if (priority_queue.empty()) {
^be/src/vec/common/sort/partition_sorter.cpp:109: +1, including nesting penalty of 0, nesting level increased to 1
while (!priority_queue.empty()) {
^be/src/vec/common/sort/partition_sorter.cpp:112: +2, including nesting penalty of 1, nesting level increased to 2
if (UNLIKELY(_previous_row->impl == nullptr)) {
^be/src/vec/common/sort/partition_sorter.cpp:116: +2, including nesting penalty of 1, nesting level increased to 2
switch (_top_n_algorithm) {
^be/src/vec/common/sort/partition_sorter.cpp:119: +3, including nesting penalty of 2, nesting level increased to 3
if ((current_output_rows + _output_total_rows) < _partition_inner_limit) {
^be/src/vec/common/sort/partition_sorter.cpp:120: +4, including nesting penalty of 3, nesting level increased to 4
for (size_t i = 0; i < num_columns; ++i) {
^be/src/vec/common/sort/partition_sorter.cpp:123: +1, nesting level increased to 3
} else {
^be/src/vec/common/sort/partition_sorter.cpp:135: +3, including nesting penalty of 2, nesting level increased to 3
if (_has_global_limit &&
^be/src/vec/common/sort/partition_sorter.cpp:135: +1
if (_has_global_limit &&
^be/src/vec/common/sort/partition_sorter.cpp:140: +3, including nesting penalty of 2, nesting level increased to 3
if (_has_global_limit) {
^be/src/vec/common/sort/partition_sorter.cpp:142: +1, nesting level increased to 3
} else {
^be/src/vec/common/sort/partition_sorter.cpp:145: +4, including nesting penalty of 3, nesting level increased to 4
if (cmp_res == false) {
^be/src/vec/common/sort/partition_sorter.cpp:147: +5, including nesting penalty of 4, nesting level increased to 5
if (_output_distinct_rows >= _partition_inner_limit) {
^be/src/vec/common/sort/partition_sorter.cpp:154: +3, including nesting penalty of 2, nesting level increased to 3
for (size_t i = 0; i < num_columns; ++i) {
^be/src/vec/common/sort/partition_sorter.cpp:164: +3, including nesting penalty of 2, nesting level increased to 3
if (_has_global_limit &&
^be/src/vec/common/sort/partition_sorter.cpp:164: +1
if (_has_global_limit &&
^be/src/vec/common/sort/partition_sorter.cpp:171: +3, including nesting penalty of 2, nesting level increased to 3
if (cmp_res == false) {
^be/src/vec/common/sort/partition_sorter.cpp:173: +4, including nesting penalty of 3, nesting level increased to 4
if ((current_output_rows + _output_total_rows) >= _partition_inner_limit) {
^be/src/vec/common/sort/partition_sorter.cpp:179: +3, including nesting penalty of 2, nesting level increased to 3
for (size_t i = 0; i < num_columns; ++i) {
^be/src/vec/common/sort/partition_sorter.cpp:189: +2, including nesting penalty of 1, nesting level increased to 2
if (!current->is_last()) {
^be/src/vec/common/sort/partition_sorter.cpp:194: +2, including nesting penalty of 1, nesting level increased to 2
if (current_output_rows == batch_size || get_enough_data == true) {
^be/src/vec/common/sort/partition_sorter.cpp:194: +1
if (current_output_rows == batch_size || get_enough_data == true) {
^be/src/vec/common/sort/partition_sorter.cpp:200: +1, including nesting penalty of 0, nesting level increased to 1
if (current_output_rows == 0 || get_enough_data == true) {
^be/src/vec/common/sort/partition_sorter.cpp:200: +1
if (current_output_rows == 0 || get_enough_data == true) {
^
TPC-H: Total hot run time: 38323 ms |
TPC-H: Total hot run time: 38347 ms |
|
run buildall |
TPC-H: Total hot run time: 37790 ms |
TPC-DS: Total hot run time: 195787 ms |
ClickBench: Total hot run time: 31.64 s |
|
run buildall |
|
PR approved by at least one committer and no changes requested. |
github-actions
bot
added
the
approved
|
PR approved by anyone and no changes requested. |
TPC-H: Total hot run time: 38100 ms |
TPC-H: Total hot run time: 38081 ms |
TPC-H: Total hot run time: 37782 ms |
TPC-H: Total hot run time: 38229 ms |
BiteTheDDDDt
approved these changes
Aug 20, 2024
Gabriel39
added a commit
to Gabriel39/incubator-doris
that referenced
this pull request
Aug 27, 2024
yiguolei
pushed a commit
that referenced
this pull request
Aug 30, 2024
yiguolei
added a commit
that referenced
this pull request
Aug 31, 2024
Gabriel39
added a commit
to Gabriel39/incubator-doris
that referenced
this pull request
Sep 2, 2024
… exhausted (apache#39306)" (apache#40211)" This reverts commit 1768169.
dataroaring
pushed a commit
that referenced
this pull request
Oct 9, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Proposed changes
Issue Number: close #xxx