You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@doris.apache.org by GitBox <gi...@apache.org> on 2022/09/14 10:11:36 UTC
[GitHub] [doris] Gabriel39 opened a new pull request, #12604: [Improvement](sort) fallback to partial sort small block if topN is small
Gabriel39 opened a new pull request, #12604:
URL: https://github.com/apache/doris/pull/12604
When `limit` is small in topN node and some string columns need to be materialized, `Block::merge` brings high overhead when accumulating big blocks.
This PR add a new strategy, when `limit` is small and some string columns need to be materialized, we fallback to origin way to sort small blocks to avoid `merge`
# Proposed changes
Issue Number: close #xxx
## Problem summary
Describe your changes.
## Checklist(Required)
1. Does it affect the original behavior:
- [ ] Yes
- [ ] No
- [ ] I don't know
2. Has unit tests been added:
- [ ] Yes
- [ ] No
- [ ] No Need
3. Has document been added or modified:
- [ ] Yes
- [ ] No
- [ ] No Need
4. Does it need to update dependencies:
- [ ] Yes
- [ ] No
5. Are there any changes that cannot be rolled back:
- [ ] Yes (If Yes, please explain WHY)
- [ ] No
## Further comments
If this is a relatively large or complex change, kick off the discussion at [dev@doris.apache.org](mailto:dev@doris.apache.org) by explaining why you chose the solution you did and what alternatives you considered, etc...
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For additional commands, e-mail: commits-help@doris.apache.org
[GitHub] [doris] HappenLee commented on a diff in pull request #12604: [Improvement](sort) fallback to partial sort small block if topN is small
Posted by GitBox <gi...@apache.org>.
HappenLee commented on code in PR #12604:
URL: https://github.com/apache/doris/pull/12604#discussion_r970692571
##########
be/src/vec/exec/vsort_node.cpp:
##########
@@ -182,6 +199,56 @@ Status VSortNode::sort_input(RuntimeState* state) {
return Status::OK();
}
+Status VSortNode::sort_raw_block(RuntimeState* state) {
+ bool eos = false;
+ do {
+ Block block;
+ RETURN_IF_ERROR_AND_CHECK_SPAN(child(0)->get_next_after_projects(state, &block, &eos),
+ child(0)->get_next_span(), eos);
+ auto rows = block.rows();
+
+ if (rows != 0) {
+ RETURN_IF_ERROR(partial_sort(block));
+ size_t mem_usage = block.allocated_bytes();
+
+ // dispose TOP-N logic
+ if (_limit != -1) {
+ // Here is a little opt to reduce the mem uasge, we build a max heap
+ // to order the block in _block_priority_queue.
+ // if one block totally greater the heap top of _block_priority_queue
+ // we can throw the block data directly.
+ if (_num_rows_in_block < _limit) {
+ _total_mem_usage += mem_usage;
+ _sorted_blocks.emplace_back(std::move(block));
+ _num_rows_in_block += rows;
+ _block_priority_queue.emplace(_pool->add(
+ new SortCursorImpl(_sorted_blocks.back(), _sort_description)));
+ } else {
+ SortBlockCursor block_cursor(
+ _pool->add(new SortCursorImpl(block, _sort_description)));
+ if (!block_cursor.totally_greater(_block_priority_queue.top())) {
+ _sorted_blocks.emplace_back(std::move(block));
+ _block_priority_queue.push(block_cursor);
+ _total_mem_usage += mem_usage;
+ } else {
+ continue;
Review Comment:
maybe in the case we should reuse the block mem?
##########
be/src/vec/exec/vsort_node.cpp:
##########
@@ -182,6 +199,56 @@ Status VSortNode::sort_input(RuntimeState* state) {
return Status::OK();
}
+Status VSortNode::sort_raw_block(RuntimeState* state) {
+ bool eos = false;
+ do {
+ Block block;
+ RETURN_IF_ERROR_AND_CHECK_SPAN(child(0)->get_next_after_projects(state, &block, &eos),
+ child(0)->get_next_span(), eos);
+ auto rows = block.rows();
+
+ if (rows != 0) {
+ RETURN_IF_ERROR(partial_sort(block));
+ size_t mem_usage = block.allocated_bytes();
+
+ // dispose TOP-N logic
+ if (_limit != -1) {
+ // Here is a little opt to reduce the mem uasge, we build a max heap
+ // to order the block in _block_priority_queue.
+ // if one block totally greater the heap top of _block_priority_queue
+ // we can throw the block data directly.
+ if (_num_rows_in_block < _limit) {
+ _total_mem_usage += mem_usage;
+ _sorted_blocks.emplace_back(std::move(block));
+ _num_rows_in_block += rows;
+ _block_priority_queue.emplace(_pool->add(
+ new SortCursorImpl(_sorted_blocks.back(), _sort_description)));
+ } else {
+ SortBlockCursor block_cursor(
+ _pool->add(new SortCursorImpl(block, _sort_description)));
+ if (!block_cursor.totally_greater(_block_priority_queue.top())) {
+ _sorted_blocks.emplace_back(std::move(block));
+ _block_priority_queue.push(block_cursor);
+ _total_mem_usage += mem_usage;
+ } else {
+ continue;
+ }
+ }
+ } else {
+ // dispose normal sort logic
+ _total_mem_usage += mem_usage;
Review Comment:
why row == 0 do the work ?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For additional commands, e-mail: commits-help@doris.apache.org
[GitHub] [doris] Gabriel39 merged pull request #12604: [Improvement](sort) fallback to partial sort small block if topN is small
Posted by GitBox <gi...@apache.org>.
Gabriel39 merged PR #12604:
URL: https://github.com/apache/doris/pull/12604
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For additional commands, e-mail: commits-help@doris.apache.org
[GitHub] [doris] HappenLee commented on a diff in pull request #12604: [Improvement](sort) fallback to partial sort small block if topN is small
Posted by GitBox <gi...@apache.org>.
HappenLee commented on code in PR #12604:
URL: https://github.com/apache/doris/pull/12604#discussion_r971930132
##########
be/src/vec/common/sort/sorter.cpp:
##########
@@ -0,0 +1,252 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+#include "vec/common/sort/sorter.h"
+
+namespace doris::vectorized {
+
+void MergeSorterState::build_merge_tree(SortDescription& sort_description) {
+ for (const auto& block : sorted_blocks) {
+ cursors.emplace_back(block, sort_description);
+ }
+
+ if (sorted_blocks.size() > 1) {
+ for (auto& cursor : cursors) priority_queue.push(SortCursor(&cursor));
+ }
+}
+
+Status MergeSorterState::merge_sort_read(doris::RuntimeState* state,
+ doris::vectorized::Block* block, bool* eos) {
+ size_t num_columns = sorted_blocks[0].columns();
+
+ bool mem_reuse = block->mem_reuse();
+ MutableColumns merged_columns =
+ mem_reuse ? block->mutate_columns() : sorted_blocks[0].clone_empty_columns();
+
+ /// Take rows from queue in right order and push to 'merged'.
+ size_t merged_rows = 0;
+ while (!priority_queue.empty()) {
+ auto current = priority_queue.top();
+ priority_queue.pop();
+
+ if (_offset == 0) {
+ for (size_t i = 0; i < num_columns; ++i)
+ merged_columns[i]->insert_from(*current->all_columns[i], current->pos);
+ ++merged_rows;
+ } else {
+ _offset--;
+ }
+
+ if (!current->isLast()) {
+ current->next();
+ priority_queue.push(current);
+ }
+
+ if (merged_rows == state->batch_size()) break;
+ }
+
+ if (merged_rows == 0) {
+ *eos = true;
+ return Status::OK();
+ }
+
+ if (!mem_reuse) {
+ Block merge_block = sorted_blocks[0].clone_with_columns(std::move(merged_columns));
+ merge_block.swap(*block);
+ }
+
+ return Status::OK();
+}
+
+Status Sorter::partial_sort(Block& block) {
+ if (_vsort_exec_exprs.need_materialize_tuple()) {
+ auto output_tuple_expr_ctxs = _vsort_exec_exprs.sort_tuple_slot_expr_ctxs();
+ std::vector<int> valid_column_ids(output_tuple_expr_ctxs.size());
+ for (int i = 0; i < output_tuple_expr_ctxs.size(); ++i) {
+ RETURN_IF_ERROR(output_tuple_expr_ctxs[i]->execute(&block, &valid_column_ids[i]));
+ }
+
+ Block new_block;
+ for (auto column_id : valid_column_ids) {
+ new_block.insert(block.get_by_position(column_id));
+ }
+ block.swap(new_block);
+ }
+
+ _sort_description.resize(_vsort_exec_exprs.lhs_ordering_expr_ctxs().size());
+ for (int i = 0; i < _sort_description.size(); i++) {
+ const auto& ordering_expr = _vsort_exec_exprs.lhs_ordering_expr_ctxs()[i];
+ RETURN_IF_ERROR(ordering_expr->execute(&block, &_sort_description[i].column_number));
+
+ _sort_description[i].direction = _is_asc_order[i] ? 1 : -1;
+ _sort_description[i].nulls_direction =
+ _nulls_first[i] ? -_sort_description[i].direction : _sort_description[i].direction;
+ }
+
+ {
+ SCOPED_TIMER(_partial_sort_timer);
+ sort_block(block, _sort_description, _offset + _limit);
+ }
+
+ return Status::OK();
+}
+
+FullSorter::FullSorter(SortDescription& sort_description, VSortExecExprs& vsort_exec_exprs,
+ int limit, int64_t offset, ObjectPool* pool, std::vector<bool>& is_asc_order,
+ std::vector<bool>& nulls_first, const RowDescriptor& row_desc)
+ : Sorter(sort_description, vsort_exec_exprs, limit, offset, pool, is_asc_order,
+ nulls_first),
+ _state(std::unique_ptr<MergeSorterState>(new MergeSorterState(row_desc, offset))) {}
+
+Status FullSorter::append_block(Block* block, bool* mem_reuse) {
+ DCHECK(block->rows() > 0);
+ {
+ SCOPED_TIMER(_merge_block_timer);
+ _state->unsorted_block->merge(*block);
+ }
+ if (_reach_limit()) {
+ RETURN_IF_ERROR(_do_sort());
+ }
+ return Status::OK();
+}
+
+Status FullSorter::prepare_for_read() {
+ if (_state->unsorted_block->rows() > 0) {
+ RETURN_IF_ERROR(_do_sort());
+ }
+ _state->build_merge_tree(_sort_description);
+ return Status::OK();
+}
+
+Status FullSorter::get_next(RuntimeState* state, Block* block, bool* eos) {
+ if (_state->sorted_blocks.empty()) {
+ *eos = true;
+ } else if (_state->sorted_blocks.size() == 1) {
+ if (_offset != 0) {
+ _state->sorted_blocks[0].skip_num_rows(_offset);
+ }
+ block->swap(_state->sorted_blocks[0]);
+ *eos = true;
+ } else {
+ RETURN_IF_ERROR(_state->merge_sort_read(state, block, eos));
+ }
+ return Status::OK();
+}
+
+Status FullSorter::_do_sort() {
+ Block block = _state->unsorted_block->to_block(0);
+ RETURN_IF_ERROR(partial_sort(block));
+ // dispose TOP-N logic
+ if (_limit != -1) {
+ // Here is a little opt to reduce the mem uasge, we build a max heap
+ // to order the block in _block_priority_queue.
+ // if one block totally greater the heap top of _block_priority_queue
+ // we can throw the block data directly.
+ if (_state->num_rows < _limit) {
+ _state->sorted_blocks.emplace_back(std::move(block));
+ _state->num_rows += block.rows();
+ _block_priority_queue.emplace(_pool->add(
+ new SortCursorImpl(_state->sorted_blocks.back(), _sort_description)));
+ } else {
+ SortBlockCursor block_cursor(_pool->add(new SortCursorImpl(block, _sort_description)));
+ if (!block_cursor.totally_greater(_block_priority_queue.top())) {
+ _state->sorted_blocks.emplace_back(std::move(block));
+ _block_priority_queue.push(block_cursor);
+ }
+ }
+ } else {
+ // dispose normal sort logic
+ _state->sorted_blocks.emplace_back(std::move(block));
+ }
+ _state->reset_block();
+ return Status::OK();
+}
+
+TopNSorter::TopNSorter(SortDescription& sort_description, VSortExecExprs& vsort_exec_exprs,
+ int limit, int64_t offset, ObjectPool* pool, std::vector<bool>& is_asc_order,
+ std::vector<bool>& nulls_first, const RowDescriptor& row_desc)
+ : Sorter(sort_description, vsort_exec_exprs, limit, offset, pool, is_asc_order,
+ nulls_first),
+ _state(std::unique_ptr<MergeSorterState>(new MergeSorterState(row_desc, offset))) {}
+
+Status TopNSorter::append_block(Block* block, bool* mem_reuse) {
+ DCHECK(block->rows() > 0);
+ RETURN_IF_ERROR(_do_sort(block, mem_reuse));
+ return Status::OK();
+}
+
+Status TopNSorter::prepare_for_read() {
+ _state->build_merge_tree(_sort_description);
+ return Status::OK();
+}
+
+Status TopNSorter::get_next(RuntimeState* state, Block* block, bool* eos) {
+ if (_state->sorted_blocks.empty()) {
+ *eos = true;
+ } else if (_state->sorted_blocks.size() == 1) {
+ if (_offset != 0) {
+ _state->sorted_blocks[0].skip_num_rows(_offset);
+ }
+ block->swap(_state->sorted_blocks[0]);
+ *eos = true;
+ } else {
+ RETURN_IF_ERROR(_state->merge_sort_read(state, block, eos));
+ }
+ return Status::OK();
+}
+
+Status TopNSorter::_do_sort(Block* block, bool* mem_reuse) {
+ RETURN_IF_ERROR(partial_sort(*block));
+ // dispose TOP-N logic
+ if (_limit != -1) {
+ // Here is a little opt to reduce the mem uasge, we build a max heap
+ // to order the block in _block_priority_queue.
+ // if one block totally greater the heap top of _block_priority_queue
+ // we can throw the block data directly.
+ if (_state->num_rows < _limit) {
+ Block sorted_block;
+ sorted_block.swap(*block);
+ _state->sorted_blocks.emplace_back(std::move(sorted_block));
+ _state->num_rows += sorted_block.rows();
+ _block_priority_queue.emplace(_pool->add(
+ new SortCursorImpl(_state->sorted_blocks.back(), _sort_description)));
+ *mem_reuse = false;
+ } else {
+ Block sorted_block;
+ sorted_block.swap(*block);
+ SortBlockCursor block_cursor(
+ _pool->add(new SortCursorImpl(sorted_block, _sort_description)));
+ if (!block_cursor.totally_greater(_block_priority_queue.top())) {
+ _state->sorted_blocks.emplace_back(std::move(sorted_block));
+ _block_priority_queue.push(block_cursor);
+ *mem_reuse = false;
Review Comment:
you can set false in the first line of the function. only need set `true` else
##########
be/src/vec/common/sort/sorter.cpp:
##########
@@ -0,0 +1,252 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+#include "vec/common/sort/sorter.h"
+
+namespace doris::vectorized {
+
+void MergeSorterState::build_merge_tree(SortDescription& sort_description) {
+ for (const auto& block : sorted_blocks) {
+ cursors.emplace_back(block, sort_description);
+ }
+
+ if (sorted_blocks.size() > 1) {
+ for (auto& cursor : cursors) priority_queue.push(SortCursor(&cursor));
+ }
+}
+
+Status MergeSorterState::merge_sort_read(doris::RuntimeState* state,
+ doris::vectorized::Block* block, bool* eos) {
+ size_t num_columns = sorted_blocks[0].columns();
+
+ bool mem_reuse = block->mem_reuse();
+ MutableColumns merged_columns =
+ mem_reuse ? block->mutate_columns() : sorted_blocks[0].clone_empty_columns();
+
+ /// Take rows from queue in right order and push to 'merged'.
+ size_t merged_rows = 0;
+ while (!priority_queue.empty()) {
+ auto current = priority_queue.top();
+ priority_queue.pop();
+
+ if (_offset == 0) {
+ for (size_t i = 0; i < num_columns; ++i)
+ merged_columns[i]->insert_from(*current->all_columns[i], current->pos);
+ ++merged_rows;
+ } else {
+ _offset--;
+ }
+
+ if (!current->isLast()) {
+ current->next();
+ priority_queue.push(current);
+ }
+
+ if (merged_rows == state->batch_size()) break;
+ }
+
+ if (merged_rows == 0) {
+ *eos = true;
+ return Status::OK();
+ }
+
+ if (!mem_reuse) {
+ Block merge_block = sorted_blocks[0].clone_with_columns(std::move(merged_columns));
+ merge_block.swap(*block);
+ }
+
+ return Status::OK();
+}
+
+Status Sorter::partial_sort(Block& block) {
+ if (_vsort_exec_exprs.need_materialize_tuple()) {
+ auto output_tuple_expr_ctxs = _vsort_exec_exprs.sort_tuple_slot_expr_ctxs();
+ std::vector<int> valid_column_ids(output_tuple_expr_ctxs.size());
+ for (int i = 0; i < output_tuple_expr_ctxs.size(); ++i) {
+ RETURN_IF_ERROR(output_tuple_expr_ctxs[i]->execute(&block, &valid_column_ids[i]));
+ }
+
+ Block new_block;
+ for (auto column_id : valid_column_ids) {
+ new_block.insert(block.get_by_position(column_id));
+ }
+ block.swap(new_block);
+ }
+
+ _sort_description.resize(_vsort_exec_exprs.lhs_ordering_expr_ctxs().size());
+ for (int i = 0; i < _sort_description.size(); i++) {
+ const auto& ordering_expr = _vsort_exec_exprs.lhs_ordering_expr_ctxs()[i];
+ RETURN_IF_ERROR(ordering_expr->execute(&block, &_sort_description[i].column_number));
+
+ _sort_description[i].direction = _is_asc_order[i] ? 1 : -1;
+ _sort_description[i].nulls_direction =
+ _nulls_first[i] ? -_sort_description[i].direction : _sort_description[i].direction;
+ }
+
+ {
+ SCOPED_TIMER(_partial_sort_timer);
+ sort_block(block, _sort_description, _offset + _limit);
+ }
+
+ return Status::OK();
+}
+
+FullSorter::FullSorter(SortDescription& sort_description, VSortExecExprs& vsort_exec_exprs,
+ int limit, int64_t offset, ObjectPool* pool, std::vector<bool>& is_asc_order,
+ std::vector<bool>& nulls_first, const RowDescriptor& row_desc)
+ : Sorter(sort_description, vsort_exec_exprs, limit, offset, pool, is_asc_order,
+ nulls_first),
+ _state(std::unique_ptr<MergeSorterState>(new MergeSorterState(row_desc, offset))) {}
+
+Status FullSorter::append_block(Block* block, bool* mem_reuse) {
+ DCHECK(block->rows() > 0);
+ {
+ SCOPED_TIMER(_merge_block_timer);
+ _state->unsorted_block->merge(*block);
+ }
+ if (_reach_limit()) {
+ RETURN_IF_ERROR(_do_sort());
+ }
+ return Status::OK();
+}
+
+Status FullSorter::prepare_for_read() {
+ if (_state->unsorted_block->rows() > 0) {
+ RETURN_IF_ERROR(_do_sort());
+ }
+ _state->build_merge_tree(_sort_description);
+ return Status::OK();
+}
+
+Status FullSorter::get_next(RuntimeState* state, Block* block, bool* eos) {
+ if (_state->sorted_blocks.empty()) {
+ *eos = true;
+ } else if (_state->sorted_blocks.size() == 1) {
+ if (_offset != 0) {
+ _state->sorted_blocks[0].skip_num_rows(_offset);
+ }
+ block->swap(_state->sorted_blocks[0]);
+ *eos = true;
+ } else {
+ RETURN_IF_ERROR(_state->merge_sort_read(state, block, eos));
+ }
+ return Status::OK();
+}
+
+Status FullSorter::_do_sort() {
+ Block block = _state->unsorted_block->to_block(0);
+ RETURN_IF_ERROR(partial_sort(block));
+ // dispose TOP-N logic
+ if (_limit != -1) {
+ // Here is a little opt to reduce the mem uasge, we build a max heap
+ // to order the block in _block_priority_queue.
+ // if one block totally greater the heap top of _block_priority_queue
+ // we can throw the block data directly.
+ if (_state->num_rows < _limit) {
+ _state->sorted_blocks.emplace_back(std::move(block));
+ _state->num_rows += block.rows();
+ _block_priority_queue.emplace(_pool->add(
+ new SortCursorImpl(_state->sorted_blocks.back(), _sort_description)));
+ } else {
+ SortBlockCursor block_cursor(_pool->add(new SortCursorImpl(block, _sort_description)));
+ if (!block_cursor.totally_greater(_block_priority_queue.top())) {
+ _state->sorted_blocks.emplace_back(std::move(block));
+ _block_priority_queue.push(block_cursor);
+ }
+ }
+ } else {
+ // dispose normal sort logic
+ _state->sorted_blocks.emplace_back(std::move(block));
+ }
+ _state->reset_block();
+ return Status::OK();
+}
+
+TopNSorter::TopNSorter(SortDescription& sort_description, VSortExecExprs& vsort_exec_exprs,
+ int limit, int64_t offset, ObjectPool* pool, std::vector<bool>& is_asc_order,
+ std::vector<bool>& nulls_first, const RowDescriptor& row_desc)
+ : Sorter(sort_description, vsort_exec_exprs, limit, offset, pool, is_asc_order,
+ nulls_first),
+ _state(std::unique_ptr<MergeSorterState>(new MergeSorterState(row_desc, offset))) {}
+
+Status TopNSorter::append_block(Block* block, bool* mem_reuse) {
+ DCHECK(block->rows() > 0);
+ RETURN_IF_ERROR(_do_sort(block, mem_reuse));
+ return Status::OK();
+}
+
+Status TopNSorter::prepare_for_read() {
+ _state->build_merge_tree(_sort_description);
+ return Status::OK();
+}
+
+Status TopNSorter::get_next(RuntimeState* state, Block* block, bool* eos) {
Review Comment:
seems the code is same as `FullSorter` `get_next` may should not virtual function and in `Sorter `
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For additional commands, e-mail: commits-help@doris.apache.org
[GitHub] [doris] github-actions[bot] commented on pull request #12604: [Improvement](sort) fallback to partial sort small block if topN is small
Posted by GitBox <gi...@apache.org>.
github-actions[bot] commented on PR #12604:
URL: https://github.com/apache/doris/pull/12604#issuecomment-1248272221
PR approved by at least one committer and no changes requested.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For additional commands, e-mail: commits-help@doris.apache.org
[GitHub] [doris] Gabriel39 commented on a diff in pull request #12604: [Improvement](sort) fallback to partial sort small block if topN is small
Posted by GitBox <gi...@apache.org>.
Gabriel39 commented on code in PR #12604:
URL: https://github.com/apache/doris/pull/12604#discussion_r970704416
##########
be/src/vec/exec/vsort_node.cpp:
##########
@@ -182,6 +199,56 @@ Status VSortNode::sort_input(RuntimeState* state) {
return Status::OK();
}
+Status VSortNode::sort_raw_block(RuntimeState* state) {
+ bool eos = false;
+ do {
+ Block block;
+ RETURN_IF_ERROR_AND_CHECK_SPAN(child(0)->get_next_after_projects(state, &block, &eos),
+ child(0)->get_next_span(), eos);
+ auto rows = block.rows();
+
+ if (rows != 0) {
+ RETURN_IF_ERROR(partial_sort(block));
+ size_t mem_usage = block.allocated_bytes();
+
+ // dispose TOP-N logic
+ if (_limit != -1) {
+ // Here is a little opt to reduce the mem uasge, we build a max heap
+ // to order the block in _block_priority_queue.
+ // if one block totally greater the heap top of _block_priority_queue
+ // we can throw the block data directly.
+ if (_num_rows_in_block < _limit) {
+ _total_mem_usage += mem_usage;
+ _sorted_blocks.emplace_back(std::move(block));
+ _num_rows_in_block += rows;
+ _block_priority_queue.emplace(_pool->add(
+ new SortCursorImpl(_sorted_blocks.back(), _sort_description)));
+ } else {
+ SortBlockCursor block_cursor(
+ _pool->add(new SortCursorImpl(block, _sort_description)));
+ if (!block_cursor.totally_greater(_block_priority_queue.top())) {
+ _sorted_blocks.emplace_back(std::move(block));
+ _block_priority_queue.push(block_cursor);
+ _total_mem_usage += mem_usage;
+ } else {
+ continue;
+ }
+ }
+ } else {
+ // dispose normal sort logic
+ _total_mem_usage += mem_usage;
Review Comment:
`_limit == -1` instead of `row == 0` here
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For additional commands, e-mail: commits-help@doris.apache.org
[GitHub] [doris] github-actions[bot] commented on pull request #12604: [Improvement](sort) fallback to partial sort small block if topN is small
Posted by GitBox <gi...@apache.org>.
github-actions[bot] commented on PR #12604:
URL: https://github.com/apache/doris/pull/12604#issuecomment-1248272289
PR approved by anyone and no changes requested.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For additional commands, e-mail: commits-help@doris.apache.org