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

feat: add to concat different data types error message the data types #7166

Merged
merged 5 commits into from
Mar 8, 2025
Merged

feat: add to concat different data types error message the data types #7166

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1018067
feat: add to concat different data types error message the data types
rluvaton Feb 20, 2025
baa6319
improve test, fix it and made the names to be in the order of appearance
rluvaton Feb 20, 2025
fd03ad3
simplify
rluvaton Feb 20, 2025
95e4553
change error message to only have up to 10 unique data types
rluvaton Mar 6, 2025
cc86087
add tests for not printing all the data types
rluvaton Mar 6, 2025
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
116 changes: 110 additions & 6 deletions arrow-select/src/concat.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ use arrow_array::*;
use arrow_buffer::{ArrowNativeType, BooleanBufferBuilder, NullBuffer, OffsetBuffer};
use arrow_data::transform::{Capacities, MutableArrayData};
use arrow_schema::{ArrowError, DataType, FieldRef, SchemaRef};
use std::sync::Arc;
use std::{collections::HashSet, sync::Arc};

fn binary_capacity<T: ByteArrayType>(arrays: &[&dyn Array]) -> Capacities {
let mut item_capacity = 0;
Expand Down Expand Up @@ -223,9 +223,35 @@ pub fn concat(arrays: &[&dyn Array]) -> Result<ArrayRef, ArrowError> {

let d = arrays[0].data_type();
if arrays.iter().skip(1).any(|array| array.data_type() != d) {
return Err(ArrowError::InvalidArgumentError(
"It is not possible to concatenate arrays of different data types.".to_string(),
));
// Create error message with up to 10 unique data types in the order they appear
let error_message = {
// 10 max unique data types to print and another 1 to know if there are more
let mut unique_data_types = HashSet::with_capacity(11);

let mut error_message =
format!("It is not possible to concatenate arrays of different data types ({d}");
unique_data_types.insert(d);

for array in arrays {
let is_unique = unique_data_types.insert(array.data_type());

if unique_data_types.len() == 11 {
error_message.push_str(", ...");
break;
}

if is_unique {
error_message.push_str(", ");
error_message.push_str(&array.data_type().to_string());
}
}

error_message.push_str(").");

error_message
};

return Err(ArrowError::InvalidArgumentError(error_message));
}

match d {
Expand Down Expand Up @@ -340,9 +366,87 @@ mod tests {
fn test_concat_incompatible_datatypes() {
let re = concat(&[
&PrimitiveArray::<Int64Type>::from(vec![Some(-1), Some(2), None]),
// 2 string to make sure we only mention unique types
&StringArray::from(vec![Some("hello"), Some("bar"), Some("world")]),
&StringArray::from(vec![Some("hey"), Some(""), Some("you")]),
// Another type to make sure we are showing all the incompatible types
&PrimitiveArray::<Int32Type>::from(vec![Some(-1), Some(2), None]),
]);
assert!(re.is_err());

assert_eq!(re.unwrap_err().to_string(), "Invalid argument error: It is not possible to concatenate arrays of different data types (Int64, Utf8, Int32).");
}

#[test]
fn test_concat_10_incompatible_datatypes_should_include_all_of_them() {
let re = concat(&[
&PrimitiveArray::<Int64Type>::from(vec![Some(-1), Some(2), None]),
// 2 string to make sure we only mention unique types
&StringArray::from(vec![Some("hello"), Some("bar"), Some("world")]),
&StringArray::from(vec![Some("hey"), Some(""), Some("you")]),
// Another type to make sure we are showing all the incompatible types
&PrimitiveArray::<Int32Type>::from(vec![Some(-1), Some(2), None]),
&PrimitiveArray::<Int8Type>::from(vec![Some(-1), Some(2), None]),
&PrimitiveArray::<Int16Type>::from(vec![Some(-1), Some(2), None]),
&PrimitiveArray::<UInt8Type>::from(vec![Some(1), Some(2), None]),
&PrimitiveArray::<UInt16Type>::from(vec![Some(1), Some(2), None]),
&PrimitiveArray::<UInt32Type>::from(vec![Some(1), Some(2), None]),
// Non unique
&PrimitiveArray::<UInt16Type>::from(vec![Some(1), Some(2), None]),
&PrimitiveArray::<UInt64Type>::from(vec![Some(1), Some(2), None]),
&PrimitiveArray::<Float32Type>::from(vec![Some(1.0), Some(2.0), None]),
]);

assert_eq!(re.unwrap_err().to_string(), "Invalid argument error: It is not possible to concatenate arrays of different data types (Int64, Utf8, Int32, Int8, Int16, UInt8, UInt16, UInt32, UInt64, Float32).");
}

#[test]
fn test_concat_11_incompatible_datatypes_should_only_include_10() {
let re = concat(&[
&PrimitiveArray::<Int64Type>::from(vec![Some(-1), Some(2), None]),
// 2 string to make sure we only mention unique types
&StringArray::from(vec![Some("hello"), Some("bar"), Some("world")]),
&StringArray::from(vec![Some("hey"), Some(""), Some("you")]),
// Another type to make sure we are showing all the incompatible types
&PrimitiveArray::<Int32Type>::from(vec![Some(-1), Some(2), None]),
&PrimitiveArray::<Int8Type>::from(vec![Some(-1), Some(2), None]),
&PrimitiveArray::<Int16Type>::from(vec![Some(-1), Some(2), None]),
&PrimitiveArray::<UInt8Type>::from(vec![Some(1), Some(2), None]),
&PrimitiveArray::<UInt16Type>::from(vec![Some(1), Some(2), None]),
&PrimitiveArray::<UInt32Type>::from(vec![Some(1), Some(2), None]),
// Non unique
&PrimitiveArray::<UInt16Type>::from(vec![Some(1), Some(2), None]),
&PrimitiveArray::<UInt64Type>::from(vec![Some(1), Some(2), None]),
&PrimitiveArray::<Float32Type>::from(vec![Some(1.0), Some(2.0), None]),
&PrimitiveArray::<Float64Type>::from(vec![Some(1.0), Some(2.0), None]),
]);

assert_eq!(re.unwrap_err().to_string(), "Invalid argument error: It is not possible to concatenate arrays of different data types (Int64, Utf8, Int32, Int8, Int16, UInt8, UInt16, UInt32, UInt64, Float32, ...).");
}

#[test]
fn test_concat_13_incompatible_datatypes_should_not_include_all_of_them() {
let re = concat(&[
&PrimitiveArray::<Int64Type>::from(vec![Some(-1), Some(2), None]),
// 2 string to make sure we only mention unique types
&StringArray::from(vec![Some("hello"), Some("bar"), Some("world")]),
&StringArray::from(vec![Some("hey"), Some(""), Some("you")]),
// Another type to make sure we are showing all the incompatible types
&PrimitiveArray::<Int32Type>::from(vec![Some(-1), Some(2), None]),
&PrimitiveArray::<Int8Type>::from(vec![Some(-1), Some(2), None]),
&PrimitiveArray::<Int16Type>::from(vec![Some(-1), Some(2), None]),
&PrimitiveArray::<UInt8Type>::from(vec![Some(1), Some(2), None]),
&PrimitiveArray::<UInt16Type>::from(vec![Some(1), Some(2), None]),
&PrimitiveArray::<UInt32Type>::from(vec![Some(1), Some(2), None]),
// Non unique
&PrimitiveArray::<UInt16Type>::from(vec![Some(1), Some(2), None]),
&PrimitiveArray::<UInt64Type>::from(vec![Some(1), Some(2), None]),
&PrimitiveArray::<Float32Type>::from(vec![Some(1.0), Some(2.0), None]),
&PrimitiveArray::<Float64Type>::from(vec![Some(1.0), Some(2.0), None]),
&PrimitiveArray::<Float16Type>::new_null(3),
&BooleanArray::from(vec![Some(true), Some(false), None]),
]);

assert_eq!(re.unwrap_err().to_string(), "Invalid argument error: It is not possible to concatenate arrays of different data types (Int64, Utf8, Int32, Int8, Int16, UInt8, UInt16, UInt32, UInt64, Float32, ...).");
}

#[test]
Expand Down Expand Up @@ -924,7 +1028,7 @@ mod tests {
.unwrap();

let error = concat_batches(&schema1, [&batch1, &batch2]).unwrap_err();
assert_eq!(error.to_string(), "Invalid argument error: It is not possible to concatenate arrays of different data types.");
assert_eq!(error.to_string(), "Invalid argument error: It is not possible to concatenate arrays of different data types (Int32, Utf8).");
}

#[test]
Expand Down
Loading