You are viewing a plain text version of this content. The canonical link for it is here.
Posted to github@datafusion.apache.org by "2010YOUY01 (via GitHub)" <gi...@apache.org> on 2025/08/23 05:07:10 UTC
[PR] chore: split hash join to smaller modules [datafusion]
2010YOUY01 opened a new pull request, #17300:
URL: https://github.com/apache/datafusion/pull/17300
## Which issue does this PR close?
<!--
We generally require a GitHub issue to be filed for all bug fixes and enhancements and this helps us generate change logs for our releases. You can link an issue to this PR using the GitHub syntax. For example `Closes #123` indicates that this PR will close issue #123.
-->
- Closes https://github.com/apache/datafusion/issues/17260
## Rationale for this change
<!--
Why are you proposing this change? If this is already explained clearly in the issue then this section is not needed.
Explaining clearly why changes are proposed helps reviewers understand your changes and offer better suggestions for fixes.
-->
The idea of splitting is exactly the same as what the issue describes.
Besides that, it moves several shared function between Hash Join and Symmetric Hash Join to `joins/util.rs`
No additional changes are made.
## What changes are included in this PR?
<!--
There is no need to duplicate the description in the issue here but it is sometimes worth providing a summary of the individual changes in this PR.
-->
## Are these changes tested?
<!--
We typically require tests for all PRs in order to:
1. Prevent the code from being accidentally broken by subsequent changes
2. Serve as another way to document the expected behavior of the code
If tests are not included in your PR, please explain why (for example, are they covered by existing tests)?
-->
## Are there any user-facing changes?
<!--
If there are user-facing changes then we may require documentation to be updated before approving the PR.
-->
<!--
If there are any breaking changes to public APIs, please add the `api change` label.
-->
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: github-unsubscribe@datafusion.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: github-unsubscribe@datafusion.apache.org
For additional commands, e-mail: github-help@datafusion.apache.org
Re: [PR] chore: split hash join to smaller modules [datafusion]
Posted by "alamb (via GitHub)" <gi...@apache.org>.
alamb commented on PR #17300:
URL: https://github.com/apache/datafusion/pull/17300#issuecomment-3228613429
EPIC!
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: github-unsubscribe@datafusion.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: github-unsubscribe@datafusion.apache.org
For additional commands, e-mail: github-help@datafusion.apache.org
Re: [PR] chore: split hash join to smaller modules [datafusion]
Posted by "jonathanc-n (via GitHub)" <gi...@apache.org>.
jonathanc-n commented on code in PR #17300:
URL: https://github.com/apache/datafusion/pull/17300#discussion_r2296104212
##########
datafusion/physical-plan/src/joins/hash_join/shared_bounds.rs:
##########
@@ -0,0 +1,295 @@
+// Licensed to the Apache Software Foundation (ASF) under one
Review Comment:
Should we call this file `shared_bounds` or `filter_pushdown` as it isn't immediately obvious what `shared_bounds` is for, but I think it is fine.
##########
datafusion/physical-plan/src/joins/hash_join/stream.rs:
##########
@@ -0,0 +1,624 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+//! Stream implementation for Hash Join
Review Comment:
We could possibly have something more detailed here to describe:
```suggestion
//! Stream implementation for Hash Join
//!
//! This module implements [`HashJoinStream`], the streaming engine for
//! [`HashJoinExec`]. It is responsible for:
//!
//! - Collecting the build side (left input) into a [`JoinHashMap`]
//! - Iterating over the probe side (right input) in streaming fashion
//! - Looking up matches against the hash table and applying join filters
//! - Producing joined [`RecordBatch`]es incrementally
//! - Emitting unmatched rows for outer/semi/anti joins in the final stage
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: github-unsubscribe@datafusion.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: github-unsubscribe@datafusion.apache.org
For additional commands, e-mail: github-help@datafusion.apache.org
Re: [PR] chore: split hash join to smaller modules [datafusion]
Posted by "comphead (via GitHub)" <gi...@apache.org>.
comphead commented on code in PR #17300:
URL: https://github.com/apache/datafusion/pull/17300#discussion_r2299349926
##########
datafusion/physical-plan/src/joins/utils.rs:
##########
@@ -1633,6 +1640,112 @@ pub fn swap_join_projection(
}
}
+/// Updates `hash_map` with new entries from `batch` evaluated against the expressions `on`
+/// using `offset` as a start value for `batch` row indices.
+///
+/// `fifo_hashmap` sets the order of iteration over `batch` rows while updating hashmap,
+/// which allows to keep either first (if set to true) or last (if set to false) row index
+/// as a chain head for rows with equal hash values.
+#[allow(clippy::too_many_arguments)]
+pub fn update_hash(
+ on: &[PhysicalExprRef],
+ batch: &RecordBatch,
+ hash_map: &mut dyn JoinHashMapType,
+ offset: usize,
+ random_state: &RandomState,
+ hashes_buffer: &mut Vec<u64>,
+ deleted_offset: usize,
+ fifo_hashmap: bool,
+) -> Result<()> {
+ // evaluate the keys
+ let keys_values = on
+ .iter()
+ .map(|c| c.evaluate(batch)?.into_array(batch.num_rows()))
+ .collect::<Result<Vec<_>>>()?;
+
+ // calculate the hash values
+ let hash_values = create_hashes(&keys_values, random_state, hashes_buffer)?;
+
+ // For usual JoinHashmap, the implementation is void.
+ hash_map.extend_zero(batch.num_rows());
+
+ // Updating JoinHashMap from hash values iterator
+ let hash_values_iter = hash_values
+ .iter()
+ .enumerate()
+ .map(|(i, val)| (i + offset, val));
+
+ if fifo_hashmap {
+ hash_map.update_from_iter(Box::new(hash_values_iter.rev()), deleted_offset);
+ } else {
+ hash_map.update_from_iter(Box::new(hash_values_iter), deleted_offset);
+ }
+
+ Ok(())
+}
+
+pub fn equal_rows_arr(
Review Comment:
should it be pub or pub crate? if it is pub can we have description
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: github-unsubscribe@datafusion.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: github-unsubscribe@datafusion.apache.org
For additional commands, e-mail: github-help@datafusion.apache.org
Re: [PR] chore: split hash join to smaller modules [datafusion]
Posted by "2010YOUY01 (via GitHub)" <gi...@apache.org>.
2010YOUY01 commented on code in PR #17300:
URL: https://github.com/apache/datafusion/pull/17300#discussion_r2300740774
##########
datafusion/physical-plan/src/joins/utils.rs:
##########
@@ -1633,6 +1640,112 @@ pub fn swap_join_projection(
}
}
+/// Updates `hash_map` with new entries from `batch` evaluated against the expressions `on`
+/// using `offset` as a start value for `batch` row indices.
+///
+/// `fifo_hashmap` sets the order of iteration over `batch` rows while updating hashmap,
+/// which allows to keep either first (if set to true) or last (if set to false) row index
+/// as a chain head for rows with equal hash values.
+#[allow(clippy::too_many_arguments)]
+pub fn update_hash(
+ on: &[PhysicalExprRef],
+ batch: &RecordBatch,
+ hash_map: &mut dyn JoinHashMapType,
+ offset: usize,
+ random_state: &RandomState,
+ hashes_buffer: &mut Vec<u64>,
+ deleted_offset: usize,
+ fifo_hashmap: bool,
+) -> Result<()> {
+ // evaluate the keys
+ let keys_values = on
+ .iter()
+ .map(|c| c.evaluate(batch)?.into_array(batch.num_rows()))
+ .collect::<Result<Vec<_>>>()?;
+
+ // calculate the hash values
+ let hash_values = create_hashes(&keys_values, random_state, hashes_buffer)?;
+
+ // For usual JoinHashmap, the implementation is void.
+ hash_map.extend_zero(batch.num_rows());
+
+ // Updating JoinHashMap from hash values iterator
+ let hash_values_iter = hash_values
+ .iter()
+ .enumerate()
+ .map(|(i, val)| (i + offset, val));
+
+ if fifo_hashmap {
+ hash_map.update_from_iter(Box::new(hash_values_iter.rev()), deleted_offset);
+ } else {
+ hash_map.update_from_iter(Box::new(hash_values_iter), deleted_offset);
+ }
+
+ Ok(())
+}
+
+pub fn equal_rows_arr(
Review Comment:
Good catch -- it used to be a `pub` function inside a private module, so its accessible by sibling modules. I changed to `pub(super)` in [0e476a](https://github.com/apache/datafusion/pull/17300/commits/a0e476a4e44e8dcb5d99b535480f5b25c6e3fc7d)
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: github-unsubscribe@datafusion.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: github-unsubscribe@datafusion.apache.org
For additional commands, e-mail: github-help@datafusion.apache.org
Re: [PR] chore: split hash join to smaller modules [datafusion]
Posted by "jonathanc-n (via GitHub)" <gi...@apache.org>.
jonathanc-n commented on PR #17300:
URL: https://github.com/apache/datafusion/pull/17300#issuecomment-3222126183
@comphead i was thinking that it was fine since it is `hash_join/stream.rs`
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: github-unsubscribe@datafusion.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: github-unsubscribe@datafusion.apache.org
For additional commands, e-mail: github-help@datafusion.apache.org
Re: [PR] chore: split hash join to smaller modules [datafusion]
Posted by "2010YOUY01 (via GitHub)" <gi...@apache.org>.
2010YOUY01 commented on code in PR #17300:
URL: https://github.com/apache/datafusion/pull/17300#discussion_r2296491968
##########
datafusion/physical-plan/src/joins/hash_join/stream.rs:
##########
@@ -0,0 +1,624 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+//! Stream implementation for Hash Join
Review Comment:
Updated, thanks!
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: github-unsubscribe@datafusion.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: github-unsubscribe@datafusion.apache.org
For additional commands, e-mail: github-help@datafusion.apache.org
Re: [PR] chore: split hash join to smaller modules [datafusion]
Posted by "2010YOUY01 (via GitHub)" <gi...@apache.org>.
2010YOUY01 commented on code in PR #17300:
URL: https://github.com/apache/datafusion/pull/17300#discussion_r2296491805
##########
datafusion/physical-plan/src/joins/hash_join/shared_bounds.rs:
##########
@@ -0,0 +1,295 @@
+// Licensed to the Apache Software Foundation (ASF) under one
Review Comment:
Good point, I think it's better include a link to the top-level comment for dynamic filter, but the blog post has not published yet. Left a TODO comment.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: github-unsubscribe@datafusion.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: github-unsubscribe@datafusion.apache.org
For additional commands, e-mail: github-help@datafusion.apache.org
Re: [PR] chore: split hash join to smaller modules [datafusion]
Posted by "2010YOUY01 (via GitHub)" <gi...@apache.org>.
2010YOUY01 merged PR #17300:
URL: https://github.com/apache/datafusion/pull/17300
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: github-unsubscribe@datafusion.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: github-unsubscribe@datafusion.apache.org
For additional commands, e-mail: github-help@datafusion.apache.org