Skip to content

[fix](hashjoin) fix coredump of hash join in ubsan build #13479

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 4 commits into from
Oct 20, 2022
Merged

[fix](hashjoin) fix coredump of hash join in ubsan build #13479

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e8447df
[fix](hashjoin) fix coredump of hash join in ubsan build
jacktengg Oct 19, 2022
188ee91
ormat code
jacktengg Oct 19, 2022
09bdee7
improve according to comment
jacktengg Oct 19, 2022
2514b71
format code
jacktengg Oct 19, 2022
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
2 changes: 1 addition & 1 deletion be/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -556,7 +556,7 @@ SET(CXX_FLAGS_LSAN "${CXX_GCC_FLAGS} -O0 -fsanitize=leak -DLEAK_SANITIZER")

# Set the flags to the undefined behavior sanitizer, also known as "ubsan"
# Turn on sanitizer and debug symbols to get stack traces:
SET(CXX_FLAGS_UBSAN "${CXX_GCC_FLAGS} -O0 -fno-wrapv -fsanitize=undefined")
SET(CXX_FLAGS_UBSAN "${CXX_GCC_FLAGS} -O0 -fno-wrapv -fsanitize=undefined -DUNDEFINED_BEHAVIOR_SANITIZER")

# Set the flags to the thread sanitizer, also known as "tsan"
# Turn on sanitizer and debug symbols to get stack traces:
Expand Down
27 changes: 16 additions & 11 deletions be/src/vec/exec/join/vhash_join_node.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,12 +192,17 @@ ProcessHashTableProbe<JoinOpType, ignore_null>::ProcessHashTableProbe(HashJoinNo
: _join_node(join_node),
_batch_size(batch_size),
_build_blocks(join_node->_build_blocks),
_tuple_is_null_left_flags(
reinterpret_cast<ColumnUInt8&>(*join_node->_tuple_is_null_left_flag_column)
.get_data()),
_tuple_is_null_left_flags(join_node->_is_outer_join
? &(reinterpret_cast<ColumnUInt8&>(
*join_node->_tuple_is_null_left_flag_column)
.get_data())
: nullptr),
_tuple_is_null_right_flags(
reinterpret_cast<ColumnUInt8&>(*join_node->_tuple_is_null_right_flag_column)
.get_data()),
join_node->_is_outer_join
? &(reinterpret_cast<ColumnUInt8&>(
*join_node->_tuple_is_null_right_flag_column)
.get_data())
: nullptr),
_rows_returned_counter(join_node->_rows_returned_counter),
_search_hashtable_timer(join_node->_search_hashtable_timer),
_build_side_output_timer(join_node->_build_side_output_timer),
Expand Down Expand Up @@ -268,8 +273,8 @@ void ProcessHashTableProbe<JoinOpType, ignore_null>::build_side_output_column(

// Dispose right tuple is null flags columns
if constexpr (probe_all && !have_other_join_conjunct) {
_tuple_is_null_right_flags.resize(size);
auto* __restrict null_data = _tuple_is_null_right_flags.data();
_tuple_is_null_right_flags->resize(size);
Copy link
Contributor

@Gabriel39 Gabriel39 Oct 19, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

DCHECK(_tuple_is_null_right_flags)

auto* __restrict null_data = _tuple_is_null_right_flags->data();
for (int i = 0; i < size; ++i) {
null_data[i] = _build_block_rows[i] == -1;
}
Expand Down Expand Up @@ -298,7 +303,7 @@ void ProcessHashTableProbe<JoinOpType, ignore_null>::probe_side_output_column(
}

if constexpr (JoinOpType::value == TJoinOp::RIGHT_OUTER_JOIN && !have_other_join_conjunct) {
_tuple_is_null_left_flags.resize_fill(size, 0);
_tuple_is_null_left_flags->resize_fill(size, 0);
}
}

Expand Down Expand Up @@ -616,7 +621,7 @@ Status ProcessHashTableProbe<JoinOpType, ignore_null>::do_process_with_other_joi

for (int i = 0; i < column->size(); ++i) {
if (filter_map[i]) {
_tuple_is_null_right_flags.emplace_back(null_map_data[i]);
_tuple_is_null_right_flags->emplace_back(null_map_data[i]);
}
}
output_block->get_by_position(result_column_id).column = std::move(new_filter_column);
Expand Down Expand Up @@ -672,7 +677,7 @@ Status ProcessHashTableProbe<JoinOpType, ignore_null>::do_process_with_other_joi
*visited_map[i] |= result;
filter_size += result;
}
_tuple_is_null_left_flags.resize_fill(filter_size, 0);
_tuple_is_null_left_flags->resize_fill(filter_size, 0);
} else {
// inner join do nothing
}
Expand Down Expand Up @@ -741,7 +746,7 @@ Status ProcessHashTableProbe<JoinOpType, ignore_null>::process_data_in_hashtable
for (int i = 0; i < right_col_idx; ++i) {
assert_cast<ColumnNullable*>(mcol[i].get())->insert_many_defaults(block_size);
}
_tuple_is_null_left_flags.resize_fill(block_size, 1);
_tuple_is_null_left_flags->resize_fill(block_size, 1);
}
*eos = iter == hash_table_ctx.hash_table.end();

Expand Down
4 changes: 2 additions & 2 deletions be/src/vec/exec/join/vhash_join_node.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,9 +198,9 @@ struct ProcessHashTableProbe {
std::vector<int8_t> _build_block_offsets;
std::vector<int> _build_block_rows;
// only need set the tuple is null in RIGHT_OUTER_JOIN and FULL_OUTER_JOIN
ColumnUInt8::Container& _tuple_is_null_left_flags;
ColumnUInt8::Container* _tuple_is_null_left_flags;
// only need set the tuple is null in LEFT_OUTER_JOIN and FULL_OUTER_JOIN
ColumnUInt8::Container& _tuple_is_null_right_flags;
ColumnUInt8::Container* _tuple_is_null_right_flags;

RuntimeProfile::Counter* _rows_returned_counter;
RuntimeProfile::Counter* _search_hashtable_timer;
Expand Down