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.

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

Fix panic when hashing empty FixedSizeList Array #13533

Merged
Changes from 1 commit
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
Prev Previous commit
simplify code
findepi committed Nov 23, 2024

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
commit 4b46b8ac3ee5b87b5f5e603ea042b4c308003a96
12 changes: 4 additions & 8 deletions datafusion/common/src/hash_utils.rs
Original file line number Diff line number Diff line change
@@ -321,20 +321,16 @@ fn hash_fixed_list_array(
hashes_buffer: &mut [u64],
) -> Result<()> {
let values = Arc::clone(array.values());
let value_len = array.value_length();
let offset_size = if array.len() == 0 {
0
} else {
value_len as usize / array.len()
};
let value_length = array.value_length() as usize;
let nulls = array.nulls();
let mut values_hashes = vec![0u64; values.len()];
create_hashes(&[values], random_state, &mut values_hashes)?;
if let Some(nulls) = nulls {
for i in 0..array.len() {
if nulls.is_valid(i) {
let hash = &mut hashes_buffer[i];
for values_hash in &values_hashes[i * offset_size..(i + 1) * offset_size]
for values_hash in
&values_hashes[i * value_length..(i + 1) * value_length]
{
*hash = combine_hashes(*hash, *values_hash);
}
@@ -343,7 +339,7 @@ fn hash_fixed_list_array(
} else {
for i in 0..array.len() {
let hash = &mut hashes_buffer[i];
for values_hash in &values_hashes[i * offset_size..(i + 1) * offset_size] {
for values_hash in &values_hashes[i * value_length..(i + 1) * value_length] {
*hash = combine_hashes(*hash, *values_hash);
}
}