Skip to content

Apache DataFusion SQL Query Engine

minor: refactor with `assert_or_internal_err!()` in `datafusion/functions-nested` (#18724)

Kumar Ujjawal30b0982f24ee
diff --git a/datafusion/functions-nested/src/position.rs b/datafusion/functions-nested/src/position.rs
index dae946def8..a585da0610 100644
--- a/datafusion/functions-nested/src/position.rs
+++ b/datafusion/functions-nested/src/position.rs
@@ -37,7 +37,9 @@ use arrow::array::{
use datafusion_common::cast::{
as_generic_list_array, as_int64_array, as_large_list_array, as_list_array,
};
-use datafusion_common::{exec_err, internal_err, utils::take_function_args, Result};
+use datafusion_common::{
+ assert_or_internal_err, exec_err, utils::take_function_args, DataFusionError, Result,
+};
use itertools::Itertools;
use crate::utils::{compare_element_to_list, make_scalar_function};
@@ -172,13 +174,11 @@ fn general_position_dispatch<O: OffsetSizeTrait>(args: &[ArrayRef]) -> Result<Ar
// if `start_from` index is out of bounds, return error
for (arr, &from) in list_array.iter().zip(arr_from.iter()) {
- if let Some(arr) = arr {
- if from < 0 || from as usize > arr.len() {
- return internal_err!("start_from index out of bounds");
- }
- } else {
- // We will get null if we got null in the array, so we don't need to check
- }
+ // If `arr` is `None`: we will get null if we got null in the array, so we don't need to check
+ assert_or_internal_err!(
+ arr.is_none_or(|arr| from >= 0 && (from as usize) <= arr.len()),
+ "start_from index out of bounds"
+ );
}
generic_position::<O>(list_array, element_array, arr_from)
diff --git a/datafusion/functions-nested/src/set_ops.rs b/datafusion/functions-nested/src/set_ops.rs
index 53642bf162..1e7ae5c147 100644
--- a/datafusion/functions-nested/src/set_ops.rs
+++ b/datafusion/functions-nested/src/set_ops.rs
@@ -29,7 +29,10 @@ use arrow::datatypes::{DataType, Field, FieldRef};
use arrow::row::{RowConverter, SortField};
use datafusion_common::cast::{as_large_list_array, as_list_array};
use datafusion_common::utils::ListCoercion;
-use datafusion_common::{exec_err, internal_err, utils::take_function_args, Result};
+use datafusion_common::{
+ assert_eq_or_internal_err, exec_err, internal_err, utils::take_function_args,
+ DataFusionError, Result,
+};
use datafusion_expr::{
ColumnarValue, Documentation, ScalarUDFImpl, Signature, Volatility,
};
@@ -353,9 +356,11 @@ fn generic_set_lists<OffsetSize: OffsetSizeTrait>(
return general_array_distinct::<OffsetSize>(l, &field);
}
- if l.value_type() != r.value_type() {
- return internal_err!("{set_op:?} is not implemented for '{l:?}' and '{r:?}'");
- }
+ assert_eq_or_internal_err!(
+ l.value_type(),
+ r.value_type(),
+ "{set_op:?} is not implemented for '{l:?}' and '{r:?}'"
+ );
let mut offsets = vec![OffsetSize::usize_as(0)];
let mut new_arrays = vec![];