Skip to content

hash float arrays using primitive usigned integer type#556

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

Merged
Dandandan merged 1 commit into from
Jun 14, 2021
Merged

hash float arrays using primitive usigned integer type #556

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
36 changes: 32 additions & 4 deletions datafusion/src/physical_plan/hash_join.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -877,13 +877,19 @@ macro_rules! hash_array_float {
if $multi_col {
for (hash, value) in $hashes.iter_mut().zip(values.iter()) {
*hash = combine_hashes(
$ty::get_hash(&value.to_le_bytes(), $random_state),
$ty::get_hash(
&$ty::from_le_bytes(value.to_le_bytes()),
$random_state,
),
*hash,
);
}
} else {
for (hash, value) in $hashes.iter_mut().zip(values.iter()) {
*hash = $ty::get_hash(&value.to_le_bytes(), $random_state)
*hash = $ty::get_hash(
&$ty::from_le_bytes(value.to_le_bytes()),
$random_state,
)
}
}
} else {
Expand All@@ -893,7 +899,10 @@ macro_rules! hash_array_float {
{
if !array.is_null(i) {
*hash = combine_hashes(
$ty::get_hash(&value.to_le_bytes(), $random_state),
$ty::get_hash(
&$ty::from_le_bytes(value.to_le_bytes()),
$random_state,
),
*hash,
);
}
Expand All@@ -903,7 +912,10 @@ macro_rules! hash_array_float {
$hashes.iter_mut().zip(values.iter()).enumerate()
{
if !array.is_null(i) {
*hash = $ty::get_hash(&value.to_le_bytes(), $random_state);
*hash = $ty::get_hash(
&$ty::from_le_bytes(value.to_le_bytes()),
$random_state,
);
}
}
}
Expand DownExpand Up@@ -1838,6 +1850,22 @@ mod tests {
Ok(())
}

#[test]
fn create_hashes_for_float_arrays() -> Result<()> {
let f32_arr = Arc::new(Float32Array::from(vec![0.12, 0.5, 1f32, 444.7]));
let f64_arr = Arc::new(Float64Array::from(vec![0.12, 0.5, 1f64, 444.7]));

let random_state = RandomState::with_seeds(0, 0, 0, 0);
let hashes_buff = &mut vec![0; f32_arr.len()];
let hashes = create_hashes(&[f32_arr], &random_state, hashes_buff)?;
assert_eq!(hashes.len(), 4,);

let hashes = create_hashes(&[f64_arr], &random_state, hashes_buff)?;
assert_eq!(hashes.len(), 4,);

Ok(())
}

#[test]
fn join_with_hash_collision() -> Result<()> {
let mut hashmap_left = HashMap::with_capacity_and_hasher(2, IdHashBuilder {});
Expand Down