Skip to content
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

fix(batch): fix hash join process some remaining chunk builder (#15912) #15922

Merged
merged 2 commits into from
Mar 26, 2024
Merged

fix(batch): fix hash join process some remaining chunk builder (#15912) #15922

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8bdcdf1
fix(batch): fix hash join process some remaining chunk builder (#15912)
st1page Mar 26, 2024
2313f82
Merge branch 'release-1.8' into auto-release-1.8-d4ec7f7d450576665543…
st1page Mar 26, 2024
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
51 changes: 21 additions & 30 deletions src/batch/src/executor/join/hash_join.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -477,7 +477,8 @@ impl<K: HashKey> HashJoinExecutor<K> {
}: EquiJoinParams<K>,
cond: &BoxedExpression,
) {
let mut chunk_builder = DataChunkBuilder::new(full_data_types, chunk_size);
let mut chunk_builder = DataChunkBuilder::new(full_data_types.clone(), chunk_size);
let mut remaining_chunk_builder = DataChunkBuilder::new(full_data_types, chunk_size);
let mut non_equi_state = LeftNonEquiJoinState {
probe_column_count: probe_data_types.len(),
..Default::default()
Expand All @@ -496,10 +497,11 @@ impl<K: HashKey> HashJoinExecutor<K> {
continue;
}
non_equi_state.found_matched = false;
non_equi_state
.first_output_row_id
.push(chunk_builder.buffered_count());
if let Some(first_matched_build_row_id) = hash_map.get(probe_key) {
non_equi_state
.first_output_row_id
.push(chunk_builder.buffered_count());

let mut build_row_id_iter = next_build_row_with_same_key
.row_id_iter(Some(*first_matched_build_row_id))
.peekable();
Expand Down Expand Up @@ -527,16 +529,11 @@ impl<K: HashKey> HashJoinExecutor<K> {
shutdown_rx.check()?;
let probe_row = probe_chunk.row_at_unchecked_vis(probe_row_id);
if let Some(spilled) = Self::append_one_row_with_null_build_side(
&mut chunk_builder,
&mut remaining_chunk_builder,
probe_row,
build_data_types.len(),
) {
yield Self::process_left_outer_join_non_equi_condition(
spilled,
cond.as_ref(),
&mut non_equi_state,
)
.await?
yield spilled
}
}
}
Expand All @@ -550,6 +547,10 @@ impl<K: HashKey> HashJoinExecutor<K> {
)
.await?
}

if let Some(spilled) = remaining_chunk_builder.consume_all() {
yield spilled
}
}

#[try_stream(boxed, ok = DataChunk, error = BatchError)]
Expand Down Expand Up @@ -641,11 +642,12 @@ impl<K: HashKey> HashJoinExecutor<K> {
if !visible {
continue;
}
non_equi_state
.first_output_row_id
.push(chunk_builder.buffered_count());
non_equi_state.found_matched = false;
if let Some(first_matched_build_row_id) = hash_map.get(probe_key) {
non_equi_state
.first_output_row_id
.push(chunk_builder.buffered_count());

for build_row_id in
next_build_row_with_same_key.row_id_iter(Some(*first_matched_build_row_id))
{
Expand Down Expand Up @@ -749,12 +751,7 @@ impl<K: HashKey> HashJoinExecutor<K> {
&probe_chunk,
probe_row_id,
) {
yield Self::process_left_semi_anti_join_non_equi_condition::<true>(
spilled,
cond.as_ref(),
&mut non_equi_state,
)
.await?
yield spilled
}
}
}
Expand Down Expand Up @@ -1187,13 +1184,7 @@ impl<K: HashKey> HashJoinExecutor<K> {
probe_row,
build_data_types.len(),
) {
yield Self::process_full_outer_join_non_equi_condition(
spilled,
cond.as_ref(),
&mut left_non_equi_state,
&mut right_non_equi_state,
)
.await?
yield spilled
}
}
}
Expand Down Expand Up @@ -2423,13 +2414,13 @@ mod tests {

let expected_chunk = DataChunk::from_pretty(
"i f i F
1 6.1 . .
2 . . .
. 8.4 . .
3 3.9 . .
. . . .
4 6.6 4 7.5
3 . . .
1 6.1 . .
. 8.4 . .
. . . .
. 0.7 . .
5 . . .
. 5.5 . .",
Expand Down
Loading