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

Jump to bottom

Fix right, full join handling when having multiple non-matching rows at the left side #845

Merged
merged 5 commits into from
Aug 10, 2021
Merged

Fix right, full join handling when having multiple non-matching rows at the left side #845

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5922450
Fix right, full join handling
Dandandan Aug 9, 2021
0364b5f
Remove comment
Dandandan Aug 9, 2021
83b0000
Clippy
Dandandan Aug 9, 2021
33a6f5a
Update datafusion/src/physical_plan/hash_join.rs
Dandandan Aug 9, 2021
b7f3792
Fmt
Dandandan Aug 9, 2021
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
23 changes: 10 additions & 13 deletions datafusion/src/physical_plan/hash_join.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,9 @@ use ahash::RandomState;

use arrow::{
array::{
ArrayData, ArrayRef, BooleanArray, LargeStringArray, PrimitiveArray,
UInt32BufferBuilder, UInt32Builder, UInt64BufferBuilder, UInt64Builder,
ArrayBuilder, ArrayData, ArrayRef, BooleanArray, LargeStringArray,
PrimitiveArray, UInt32BufferBuilder, UInt32Builder, UInt64BufferBuilder,
UInt64Builder,
},
compute,
datatypes::{UInt32Type, UInt64Type},
Expand Down Expand Up @@ -737,6 +738,7 @@ fn build_join_indexes(
for (row, hash_value) in hash_values.iter().enumerate() {
match left.0.get(*hash_value, |(hash, _)| *hash_value == *hash) {
Some((_, indices)) => {
let mut no_match = true;
for &i in indices {
if equal_rows(
i as usize,
Expand All @@ -745,9 +747,12 @@ fn build_join_indexes(
&keys_values,
)? {
left_indices.append_value(i)?;
} else {
left_indices.append_null()?;
right_indices.append_value(row as u32)?;
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is the fix, instead of adding the (left=null, right) to every non-match, it does it only once at the end if there wasn't a single match.

no_match = false;
}
}
if no_match {
Dandandan marked this conversation as resolved.
Show resolved Hide resolved
left_indices.append_null()?;
right_indices.append_value(row as u32)?;
}
}
Expand All @@ -768,7 +773,7 @@ macro_rules! equal_rows_elem {
let left_array = $l.as_any().downcast_ref::<$array_type>().unwrap();
let right_array = $r.as_any().downcast_ref::<$array_type>().unwrap();

match (left_array.is_null($left), left_array.is_null($right)) {
match (left_array.is_null($left), right_array.is_null($right)) {
(false, false) => left_array.value($left) == right_array.value($right),
_ => false,
}
Expand Down Expand Up @@ -1372,8 +1377,6 @@ mod tests {
}

#[tokio::test]
// Disable until https://github.com/apache/arrow-datafusion/issues/843 fixed
#[cfg(not(feature = "force_hash_collisions"))]
async fn join_full_multi_batch() {
let left = build_table(
("a1", &vec![1, 2, 3]),
Expand Down Expand Up @@ -1639,8 +1642,6 @@ mod tests {
}

#[tokio::test]
// Disable until https://github.com/apache/arrow-datafusion/issues/843 fixed
#[cfg(not(feature = "force_hash_collisions"))]
async fn join_right_one() -> Result<()> {
let left = build_table(
("a1", &vec![1, 2, 3]),
Expand Down Expand Up @@ -1677,8 +1678,6 @@ mod tests {
}

#[tokio::test]
// Disable until https://github.com/apache/arrow-datafusion/issues/843 fixed
#[cfg(not(feature = "force_hash_collisions"))]
async fn partitioned_join_right_one() -> Result<()> {
let left = build_table(
("a1", &vec![1, 2, 3]),
Expand Down Expand Up @@ -1716,8 +1715,6 @@ mod tests {
}

#[tokio::test]
// Disable until https://github.com/apache/arrow-datafusion/issues/843 fixed
#[cfg(not(feature = "force_hash_collisions"))]
async fn join_full_one() -> Result<()> {
let left = build_table(
("a1", &vec![1, 2, 3]),
Expand Down
6 changes: 0 additions & 6 deletions datafusion/tests/sql.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1797,8 +1797,6 @@ async fn equijoin_left_and_condition_from_right() -> Result<()> {
}

#[tokio::test]
// Disable until https://github.com/apache/arrow-datafusion/issues/843 fixed
#[cfg(not(feature = "force_hash_collisions"))]
async fn equijoin_right_and_condition_from_left() -> Result<()> {
let mut ctx = create_join_context("t1_id", "t2_id")?;
let sql =
Expand Down Expand Up @@ -1852,8 +1850,6 @@ async fn left_join() -> Result<()> {
}

#[tokio::test]
// Disable until https://github.com/apache/arrow-datafusion/issues/843 fixed
#[cfg(not(feature = "force_hash_collisions"))]
async fn right_join() -> Result<()> {
let mut ctx = create_join_context("t1_id", "t2_id")?;
let equivalent_sql = [
Expand All @@ -1874,8 +1870,6 @@ async fn right_join() -> Result<()> {
}

#[tokio::test]
// Disable until https://github.com/apache/arrow-datafusion/issues/843 fixed
#[cfg(not(feature = "force_hash_collisions"))]
async fn full_join() -> Result<()> {
let mut ctx = create_join_context("t1_id", "t2_id")?;
let equivalent_sql = [
Expand Down