fix rebase

Author: adriangb

datafusion/common/src/scalar/mod.rs

@@ -51,7 +51,7 @@ use crate::cast::{
 };
 use crate::error::{DataFusionError, Result, _exec_err, _internal_err, _not_impl_err};
 use crate::format::DEFAULT_CAST_OPTIONS;
-use crate::hash_utils::create_hashes_from_arrays;
+use crate::hash_utils::create_hashes;
 use crate::utils::SingleRowListArrayBuilder;
 use crate::{_internal_datafusion_err, arrow_datafusion_err};
 use arrow::array::{

datafusion/physical-expr-common/src/binary_map.rs

@@ -27,7 +27,7 @@ use arrow::array::{
 };
 use arrow::buffer::{NullBuffer, OffsetBuffer, ScalarBuffer};
 use arrow::datatypes::DataType;
-use datafusion_common::hash_utils::create_hashes_from_arrays;
+use datafusion_common::hash_utils::create_hashes;
 use datafusion_common::utils::proxy::{HashTableAllocExt, VecAllocExt};
 use std::any::type_name;
 use std::fmt::Debug;

datafusion/physical-expr-common/src/binary_view_map.rs

@@ -24,7 +24,7 @@ use ahash::RandomState;
 use arrow::array::cast::AsArray;
 use arrow::array::{Array, ArrayBuilder, ArrayRef, GenericByteViewBuilder};
 use arrow::datatypes::{BinaryViewType, ByteViewType, DataType, StringViewType};
-use datafusion_common::hash_utils::create_hashes_from_arrays;
+use datafusion_common::hash_utils::create_hashes;
 use datafusion_common::utils::proxy::{HashTableAllocExt, VecAllocExt};
 use std::fmt::Debug;
 use std::sync::Arc;

datafusion/physical-expr/src/expressions/in_list.rs

@@ -32,7 +32,7 @@ use arrow::compute::{take, SortOptions};
 use arrow::datatypes::*;
 use arrow::downcast_dictionary_array;
 use arrow::util::bit_iterator::BitIndexIterator;
-use datafusion_common::hash_utils::create_hashes_from_arrays;
+use datafusion_common::hash_utils::create_hashes;
 use datafusion_common::{exec_err, internal_err, DFSchema, Result, ScalarValue};
 use datafusion_expr::ColumnarValue;
 
@@ -125,7 +125,7 @@ impl Set for ArraySet {
         let has_nulls = in_array.null_count() != 0;
 
         let mut hashes_buf = vec![0u64; v.len()];
-        create_hashes_from_arrays(&[v], &self.hash_set.state, &mut hashes_buf)?;
+        create_hashes([v], &self.hash_set.state, &mut hashes_buf)?;
         let cmp = make_comparator(v, in_array, SortOptions::default())?;
         Ok((0..v.len())
             .map(|i| {
@@ -174,7 +174,7 @@ fn make_hash_set(array: &dyn Array) -> Result<ArrayHashSet> {
     let state = RandomState::new();
     let mut map: HashMap<usize, (), ()> = HashMap::with_hasher(());
     let mut hashes = vec![0; array.len()];
-    create_hashes_from_arrays(&[array], &state, &mut hashes)?;
+    create_hashes([array], &state, &mut hashes)?;
     let cmp = make_comparator(array, array, SortOptions::default())?;
 
     let insert_value = |idx| {
@@ -564,11 +564,9 @@ impl Hash for InListExpr {
             InListStorage::Array { array, .. } => {
                 let random_state = RandomState::with_seed(0);
                 let mut hashes_buf = vec![0u64; array.len()];
-                let Ok(hashes_buf) = create_hashes_from_arrays(
-                    &[array.as_ref()],
-                    &random_state,
-                    &mut hashes_buf,
-                ) else {
+                let Ok(hashes_buf) =
+                    create_hashes([array], &random_state, &mut hashes_buf)
+                else {
                     unreachable!("Failed to create hashes for InList array. This shouldn't happen because make_set should have succeeded earlier.");
                 };
                 hashes_buf.hash(state);

datafusion/physical-plan/src/joins/hash_join/exec.rs

@@ -1513,7 +1513,7 @@ mod tests {
     use arrow::buffer::NullBuffer;
     use arrow::datatypes::{DataType, Field};
     use arrow_schema::Schema;
-    use datafusion_common::hash_utils::create_hashes_from_arrays;
+    use datafusion_common::hash_utils::create_hashes;
     use datafusion_common::test_util::{batches_to_sort_string, batches_to_string};
     use datafusion_common::{
         assert_batches_eq, assert_batches_sorted_eq, assert_contains, exec_err,
@@ -3451,8 +3451,8 @@ mod tests {
         );
 
         let random_state = RandomState::with_seeds(0, 0, 0, 0);
-        let hashes = &mut vec![0; left.num_rows()];
-        create_hashes([&left.columns()[0]], &random_state, hashes_buff)?;
+        let hashes_buff = &mut vec![0; left.num_rows()];
+        let hashes = create_hashes([&left.columns()[0]], &random_state, hashes_buff)?;
 
         // Maps both values to both indices (1 and 2, representing input 0 and 1)
         // 0 -> (0, 1)
@@ -3514,8 +3514,8 @@ mod tests {
         );
 
         let random_state = RandomState::with_seeds(0, 0, 0, 0);
-        let hashes = &mut vec![0; left.num_rows()];
-        create_hashes([&left.columns()[0]], &random_state, hashes_buff)?;
+        let hashes_buff = &mut vec![0; left.num_rows()];
+        let hashes = create_hashes([&left.columns()[0]], &random_state, hashes_buff)?;
 
         hashmap_left.insert_unique(hashes[0], (hashes[0], 1u32), |(h, _)| *h);
         hashmap_left.insert_unique(hashes[0], (hashes[0], 2u32), |(h, _)| *h);