Skip to content

Commit 27b61fa

Browse files
zhannngchengnehil
authored andcommitted
[fix](scanner) remove useless _src_block_mem_reuse to avoid core dump while loading (apache#17559)
The _src_block_mem_reuse variable actually not work, since the _src_block is cleared each time when we call get_block. But current code may cause core dump, see issue apache#17587. Because we insert some result column generated by expr into dest block, and such a column holds a pointer to some column in original schema. When clearing the data of _src_block, some column's data in dest block is also cleared. e.g. coalesce will return a result column which holds a pointer to some original column, see issue apache#17588
1 parent 406edc8 commit 27b61fa

2 files changed

Lines changed: 3 additions & 16 deletions

File tree

‎be/src/vec/exec/scan/vfile_scanner.cpp‎

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,6 @@ Status VFileScanner::prepare(
8181
_io_ctx->enable_file_cache = _state->query_options().enable_file_cache;
8282

8383
if (_is_load) {
84-
_src_block_mem_reuse = true;
8584
_src_row_desc.reset(new RowDescriptor(_state->desc_tbl(),
8685
std::vector<TupleId>({_input_tuple_desc->id()}),
8786
std::vector<bool>({false})));
@@ -403,10 +402,9 @@ Status VFileScanner::_convert_to_output_block(Block* block) {
403402
size_t rows = _src_block.rows();
404403
auto filter_column = vectorized::ColumnUInt8::create(rows, 1);
405404
auto& filter_map = filter_column->get_data();
406-
auto origin_column_num = _src_block.columns();
407405

408406
// Set block dynamic, block maybe merge or add_rows
409-
// in in later process.
407+
// in later process.
410408
if (_is_dynamic_schema) {
411409
block->set_block_type(BlockType::DYNAMIC);
412410
}
@@ -437,11 +435,7 @@ Status VFileScanner::_convert_to_output_block(Block* block) {
437435
int result_column_id = -1;
438436
// PT1 => dest primitive type
439437
RETURN_IF_ERROR(ctx->execute(&_src_block, &result_column_id));
440-
bool is_origin_column = result_column_id < origin_column_num;
441-
column_ptr = is_origin_column && _src_block_mem_reuse
442-
? _src_block.get_by_position(result_column_id)
443-
.column->clone_resized(rows)
444-
: _src_block.get_by_position(result_column_id).column;
438+
column_ptr = _src_block.get_by_position(result_column_id).column;
445439
}
446440
// column_ptr maybe a ColumnConst, convert it to a normal column
447441
column_ptr = column_ptr->convert_to_full_column_if_const();
@@ -533,11 +527,7 @@ Status VFileScanner::_convert_to_output_block(Block* block) {
533527
}
534528

535529
// after do the dest block insert operation, clear _src_block to remove the reference of origin column
536-
if (_src_block_mem_reuse) {
537-
_src_block.clear_column_data(origin_column_num);
538-
} else {
539-
_src_block.clear();
540-
}
530+
_src_block.clear();
541531

542532
size_t dest_size = block->columns();
543533
// do filter
@@ -809,8 +799,6 @@ Status VFileScanner::_init_expr_ctxes() {
809799
_is_dynamic_schema =
810800
_output_tuple_desc && _output_tuple_desc->slots().back()->type().is_variant_type();
811801
if (_is_dynamic_schema) {
812-
// should not resuse Block since Block is variable
813-
_src_block_mem_reuse = false;
814802
_full_base_schema_view.reset(new vectorized::schema_util::FullBaseSchemaView);
815803
_full_base_schema_view->db_name = _output_tuple_desc->table_desc()->database();
816804
_full_base_schema_view->table_name = _output_tuple_desc->table_desc()->name();

‎be/src/vec/exec/scan/vfile_scanner.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,6 @@ class VFileScanner : public VScanner {
106106
int _rows = 0;
107107
int _num_of_columns_from_file;
108108

109-
bool _src_block_mem_reuse = false;
110109
bool _strict_mode;
111110

112111
bool _src_block_init = false;

0 commit comments

Comments
 (0)