Skip to content

[Enhancement](scanner) allocate blocks in scanner_context on demand #23182

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

Merged
yiguolei merged 1 commit into from
Aug 19, 2023
Merged

[Enhancement](scanner) allocate blocks in scanner_context on demand #23182

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 0 additions & 16 deletions be/src/vec/exec/scan/scanner_context.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,9 +104,6 @@ Status ScannerContext::init() {
limit == -1 ? _batch_size : std::min(static_cast<int64_t>(_batch_size), limit);
_block_per_scanner = (doris_scanner_row_num + (real_block_size - 1)) / real_block_size;
_free_blocks_capacity = _max_thread_num * _block_per_scanner;
auto pre_alloc_block_count = _max_thread_num * _block_per_scanner;

_init_free_block(pre_alloc_block_count, real_block_size);

#ifndef BE_TEST
// 3. get thread token
Expand All @@ -126,19 +123,6 @@ Status ScannerContext::init() {
return Status::OK();
}

void ScannerContext::_init_free_block(int pre_alloc_block_count, int real_block_size) {
// The free blocks is used for final output block of scanners.
// So use _output_tuple_desc;
int64_t free_blocks_memory_usage = 0;
for (int i = 0; i < pre_alloc_block_count; ++i) {
auto block = vectorized::Block::create_unique(_output_tuple_desc->slots(), real_block_size,
true /*ignore invalid slots*/);
free_blocks_memory_usage += block->allocated_bytes();
_free_blocks.enqueue(std::move(block));
}
_free_blocks_memory_usage->add(free_blocks_memory_usage);
}

vectorized::BlockUPtr ScannerContext::get_free_block(bool* has_free_block,
bool get_block_not_empty) {
vectorized::BlockUPtr block;
Expand Down
2 changes: 0 additions & 2 deletions be/src/vec/exec/scan/scanner_context.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,8 +167,6 @@ class ScannerContext {
protected:
virtual void _dispose_coloate_blocks_not_in_queue() {}

void _init_free_block(int pre_alloc_block_count, int real_block_size);

RuntimeState* _state;
VScanNode* _parent;

Expand Down