Skip to content

[fix](join) avoid DCHECK failed in '_filter_data_and_build_output' #24162

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
BiteTheDDDDt merged 1 commit into from
Sep 11, 2023
Merged

[fix](join) avoid DCHECK failed in '_filter_data_and_build_output' #24162

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
12 changes: 9 additions & 3 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 @@ -524,7 +524,11 @@ Status HashJoinNode::pull(doris::RuntimeState* state, vectorized::Block* output_
->get_data()
.resize_fill(block_rows, 1);
}
RETURN_IF_ERROR(_filter_data_and_build_output(state, output_block, eos, &temp_block));

/// No need to check the block size in `_filter_data_and_build_output` because here dose not
/// increase the output rows count(just same as `_probe_block`'s rows count).
RETURN_IF_ERROR(
_filter_data_and_build_output(state, output_block, eos, &temp_block, false));
temp_block.clear();
release_block_memory(_probe_block);
return Status::OK();
Expand Down Expand Up @@ -612,12 +616,14 @@ Status HashJoinNode::pull(doris::RuntimeState* state, vectorized::Block* output_

Status HashJoinNode::_filter_data_and_build_output(RuntimeState* state,
vectorized::Block* output_block, bool* eos,
Block* temp_block) {
Block* temp_block, bool check_rows_count) {
if (_is_outer_join) {
_add_tuple_is_null_column(temp_block);
}
auto output_rows = temp_block->rows();
DCHECK(output_rows <= state->batch_size());
if (check_rows_count) { // If the join node does not increase the number of output rows, no need to check.
DCHECK(output_rows <= state->batch_size());
}
{
SCOPED_TIMER(_join_filter_timer);
RETURN_IF_ERROR(VExprContext::filter_block(_conjuncts, temp_block, temp_block->columns()));
Expand Down
3 changes: 2 additions & 1 deletion 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 @@ -703,7 +703,8 @@ class HashJoinNode final : public VJoinNodeBase {
void _add_tuple_is_null_column(Block* block) override;

Status _filter_data_and_build_output(RuntimeState* state, vectorized::Block* output_block,
bool* eos, Block* temp_block);
bool* eos, Block* temp_block,
bool check_rows_count = true);

template <class HashTableContext>
friend struct ProcessHashTableBuild;
Expand Down