Skip to content

[bug](shared scan) Fix use-after-free when enable pipeline shared scanning #26199

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
Gabriel39 merged 2 commits into from
Nov 1, 2023
Merged

[bug](shared scan) Fix use-after-free when enable pipeline shared scanning #26199

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
87b0a2f
[bug](shared scan) Fix use-after-free when enable pipeline shared sca…
Gabriel39 Nov 1, 2023
d5ba59c
update
Gabriel39 Nov 1, 2023
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
10 changes: 8 additions & 2 deletions be/src/vec/exec/scan/pip_scanner_context.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,8 +84,6 @@ class PipScannerContext : public vectorized::ScannerContext {
*block = std::move(_blocks_queues[id].front());
_blocks_queues[id].pop_front();

RETURN_IF_ERROR(validate_block_schema((*block).get()));

if (_blocks_queues[id].empty() && _data_dependency) {
_data_dependency->block_reading();
}
Expand All @@ -108,6 +106,10 @@ class PipScannerContext : public vectorized::ScannerContext {
if (_need_colocate_distribute) {
std::vector<uint32_t> hash_vals;
for (const auto& block : blocks) {
auto st = validate_block_schema(block.get());
if (!st.ok()) {
set_status_on_error(st, false);
}
// vectorized calculate hash
int rows = block->rows();
const auto element_size = _num_parallel_instances;
Expand Down Expand Up @@ -141,6 +143,10 @@ class PipScannerContext : public vectorized::ScannerContext {
}
} else {
for (const auto& block : blocks) {
auto st = validate_block_schema(block.get());
if (!st.ok()) {
set_status_on_error(st, false);
}
local_bytes += block->allocated_bytes();
}

Expand Down
6 changes: 4 additions & 2 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 @@ -190,6 +190,10 @@ void ScannerContext::append_blocks_to_queue(std::vector<vectorized::BlockUPtr>&
std::lock_guard l(_transfer_lock);
auto old_bytes_in_queue = _cur_bytes_in_queue;
for (auto& b : blocks) {
auto st = validate_block_schema(b.get());
if (!st.ok()) {
set_status_on_error(st, false);
}
_cur_bytes_in_queue += b->allocated_bytes();
_blocks_queue.push_back(std::move(b));
}
Expand Down Expand Up @@ -246,8 +250,6 @@ Status ScannerContext::get_block_from_queue(RuntimeState* state, vectorized::Blo
*block = std::move(_blocks_queue.front());
_blocks_queue.pop_front();

RETURN_IF_ERROR(validate_block_schema((*block).get()));

auto block_bytes = (*block)->allocated_bytes();
_cur_bytes_in_queue -= block_bytes;

Expand Down