Skip to content

fix: resolve HashJoin deadlock with dynamic filtering and empty partitions #21631

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

Closed
RatulDawar wants to merge 1 commit into from
Closed

fix: resolve HashJoin deadlock with dynamic filtering and empty partitions #21631

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
10 changes: 4 additions & 6 deletions datafusion/physical-plan/src/joins/hash_join/stream.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -409,11 +409,11 @@ impl HashJoinStream {
/// Returns the next state after the build side has been fully collected
/// and any required build-side coordination has completed.
fn state_after_build_ready(
join_type: JoinType,
&self,
left_data: &JoinLeftData,
) -> HashJoinStreamState {
if left_data.map().is_empty()
&& join_type.empty_build_side_produces_empty_result()
&& self.join_type.empty_build_side_produces_empty_result()
{
HashJoinStreamState::Completed
} else {
Expand Down Expand Up @@ -485,8 +485,7 @@ impl HashJoinStream {
ready!(fut.get_shared(cx))?;
}
let build_side = self.build_side.try_as_ready()?;
self.state =
Self::state_after_build_ready(self.join_type, build_side.left_data.as_ref());
self.state = self.state_after_build_ready(build_side.left_data.as_ref());
Poll::Ready(Ok(StatefulStreamResult::Continue))
}

Expand Down Expand Up @@ -557,8 +556,7 @@ impl HashJoinStream {
}));
self.state = HashJoinStreamState::WaitPartitionBoundsReport;
} else {
self.state =
Self::state_after_build_ready(self.join_type, left_data.as_ref());
self.state = self.state_after_build_ready(left_data.as_ref());
}

self.build_side = BuildSide::Ready(BuildSideReadyState { left_data });
Expand Down
Loading