Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
49 changes: 41 additions & 8 deletions datafusion/physical-plan/src/joins/hash_join/exec.rs
Original file line number Diff line number Diff line change
Expand Up @@ -886,9 +886,6 @@ impl HashJoinExec {
if self.mode == PartitionMode::Partitioned
&& !self.has_partitioned_dynamic_filter_routing()
{
// TODO: support partition-routed dynamic filters for compatible
// range co-partitioned joins.
// <https://github.com/apache/datafusion/issues/23376>.
return false;
}

Expand All @@ -904,6 +901,14 @@ impl HashJoinExec {
Partitioning::Hash(_, left_partition_count),
Partitioning::Hash(_, right_partition_count),
) => left_partition_count == right_partition_count,
(Partitioning::Range(_), Partitioning::Range(_)) => {
let children = [self.left.as_ref(), self.right.as_ref()];
matches!(
self.input_distribution_requirements()
.unsatisfied_co_partitioned_children(self.name(), &children),
Ok(unsatisfied) if unsatisfied.is_empty()
)
}
(left_partitioning, right_partitioning) => {
left_partitioning.partition_count() == 1
&& right_partitioning.partition_count() == 1
Expand Down Expand Up @@ -6759,8 +6764,7 @@ mod tests {
}

#[test]
fn test_partitioned_dynamic_filter_pushdown_rejects_range_partitioning() -> Result<()>
{
fn test_partitioned_dynamic_filter_pushdown_range_partitioning() -> Result<()> {
let (left_schema, right_schema, on) = build_schema_and_on()?;
let left_partitioning = Partitioning::Range(RangePartitioning::try_new(
[PhysicalSortExpr {
Expand All @@ -6783,7 +6787,7 @@ mod tests {
left_partitioning,
)?);
let right = Arc::new(PartitionedTestExec::try_new(
right_schema,
Arc::clone(&right_schema),
right_partitioning,
)?);

Expand All @@ -6794,8 +6798,35 @@ mod tests {
.enable_join_dynamic_filter_pushdown = true;

let join = HashJoinExec::try_new(
left,
Arc::clone(&left) as Arc<dyn ExecutionPlan>,
right,
on.clone(),
None,
&JoinType::Inner,
None,
PartitionMode::Partitioned,
NullEquality::NullEqualsNothing,
false,
)?;

assert!(join.allow_join_dynamic_filter_pushdown(session_config.options()));

let mismatched_right_partitioning =
Partitioning::Range(RangePartitioning::try_new(
[PhysicalSortExpr {
expr: Arc::clone(&on[0].1),
options: Default::default(),
}]
.into(),
vec![SplitPoint::new(vec![ScalarValue::Int32(Some(11))])],
)?);
let mismatched_right = Arc::new(PartitionedTestExec::try_new(
right_schema,
mismatched_right_partitioning,
)?);
let mismatched_join = HashJoinExec::try_new(
left,
mismatched_right,
on,
None,
&JoinType::Inner,
Expand All @@ -6805,7 +6836,9 @@ mod tests {
false,
)?;

assert!(!join.allow_join_dynamic_filter_pushdown(session_config.options()));
assert!(
!mismatched_join.allow_join_dynamic_filter_pushdown(session_config.options())
);

Ok(())
}
Expand Down
Loading
Loading