tustvold commented on a change in pull request #1469:
URL: https://github.com/apache/arrow-rs/pull/1469#discussion_r834430646
##########
File path: arrow/src/array/equal/utils.rs
##########
@@ -66,7 +66,14 @@ pub(super) fn equal_nulls(
#[inline]
pub(super) fn base_equal(lhs: &ArrayData, rhs: &ArrayData) -> bool {
- lhs.data_type() == rhs.data_type() && lhs.len() == rhs.len()
+ let equal_type = match (lhs.data_type(), rhs.data_type()) {
+ (DataType::Union(l_fields, l_mode), DataType::Union(r_fields, r_mode))
=> {
+ // Defer field datatype check to `union_equal`
Review comment:
Why?
##########
File path: arrow/src/array/equal/union.rs
##########
@@ -0,0 +1,171 @@
+// 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.
+
+use crate::datatypes::Field;
+use crate::{
+ array::ArrayData, buffer::Buffer, datatypes::DataType,
datatypes::UnionMode,
+};
+
+use super::{
+ equal_range, equal_values, utils::child_logical_null_buffer,
utils::equal_nulls,
+};
+
+// Checks if corresponding slots in two UnionArrays are same data types
+fn equal_types(
+ lhs_fields: &[Field],
+ rhs_fields: &[Field],
+ lhs_type_ids: &[i8],
+ rhs_type_ids: &[i8],
+) -> bool {
+ let lhs_slots_types = lhs_type_ids
+ .iter()
+ .map(|type_id| lhs_fields.get(*type_id as usize).unwrap().data_type());
+
+ let rhs_slots_types = rhs_type_ids
+ .iter()
+ .map(|type_id| rhs_fields.get(*type_id as usize).unwrap().data_type());
+
+ lhs_slots_types.zip(rhs_slots_types).all(|(l, r)| l == r)
+}
+
+fn equal_dense(
+ lhs: &ArrayData,
+ rhs: &ArrayData,
+ lhs_type_ids: &[i8],
+ rhs_type_ids: &[i8],
+ lhs_offsets: &[i32],
+ rhs_offsets: &[i32],
+) -> bool {
+ let offsets = lhs_offsets.iter().zip(rhs_offsets.iter());
+
+ lhs_type_ids
+ .iter()
+ .zip(rhs_type_ids.iter())
+ .zip(offsets)
+ .all(|((l_type_id, r_type_id), (l_offset, r_offset))| {
+ let lhs_values = &lhs.child_data()[*l_type_id as usize];
+ let rhs_values = &rhs.child_data()[*r_type_id as usize];
+
+ equal_values(
+ lhs_values,
+ rhs_values,
+ None,
+ None,
+ *l_offset as usize,
+ *r_offset as usize,
+ 1,
+ )
+ })
+}
+
+#[allow(clippy::too_many_arguments)]
+fn equal_sparse(
Review comment:
By the time we are calling this method we have established that
* the types are equal
* the null buffers are equal
* the type ids arrays are equal
As such I'm surprised this can't just do a standard equality comparison of
the child data, which will take into null buffers of the children
--
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-unsubscr...@arrow.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
