Skip to content

Improve error handling for array downcasting #4588

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

Merged
alamb merged 2 commits into from
Dec 12, 2022
Merged

Improve error handling for array downcasting #4588

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6298c0c
Improve error handling for array downcasting
retikulum Dec 12, 2022
668aa3d
fix formatting
retikulum Dec 12, 2022
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
40 changes: 15 additions & 25 deletions datafusion/physical-expr/src/unicode_expressions.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,28 +22,18 @@
//! Unicode expressions

use arrow::{
array::{ArrayRef, GenericStringArray, Int64Array, OffsetSizeTrait, PrimitiveArray},
array::{ArrayRef, GenericStringArray, OffsetSizeTrait, PrimitiveArray},
datatypes::{ArrowNativeType, ArrowPrimitiveType},
};
use datafusion_common::{cast::as_generic_string_array, DataFusionError, Result};
use datafusion_common::{
cast::{as_generic_string_array, as_int64_array},
DataFusionError, Result,
};
use hashbrown::HashMap;
use std::cmp::Ordering;
use std::cmp::{max, Ordering};
use std::sync::Arc;
use std::{any::type_name, cmp::max};
use unicode_segmentation::UnicodeSegmentation;

macro_rules! downcast_arg {
($ARG:expr, $NAME:expr, $ARRAY_TYPE:ident) => {{
$ARG.as_any().downcast_ref::<$ARRAY_TYPE>().ok_or_else(|| {
DataFusionError::Internal(format!(
"could not cast {} to {}",
$NAME,
type_name::<$ARRAY_TYPE>()
))
})?
}};
}

/// Returns number of characters in the string.
/// character_length('josé') = 4
/// The implementation counts UTF-8 code points to count the number of characters
Expand Down Expand Up @@ -72,7 +62,7 @@ where
/// The implementation uses UTF-8 code points as characters
pub fn left<T: OffsetSizeTrait>(args: &[ArrayRef]) -> Result<ArrayRef> {
let string_array = as_generic_string_array::<T>(&args[0])?;
let n_array = downcast_arg!(args[1], "n", Int64Array);
let n_array = as_int64_array(&args[1])?;
let result = string_array
.iter()
.zip(n_array.iter())
Expand Down Expand Up @@ -104,7 +94,7 @@ pub fn lpad<T: OffsetSizeTrait>(args: &[ArrayRef]) -> Result<ArrayRef> {
match args.len() {
2 => {
let string_array = as_generic_string_array::<T>(&args[0])?;
let length_array = downcast_arg!(args[1], "length", Int64Array);
let length_array = as_int64_array(&args[1])?;

let result = string_array
.iter()
Expand Down Expand Up @@ -140,7 +130,7 @@ pub fn lpad<T: OffsetSizeTrait>(args: &[ArrayRef]) -> Result<ArrayRef> {
}
3 => {
let string_array = as_generic_string_array::<T>(&args[0])?;
let length_array = downcast_arg!(args[1], "length", Int64Array);
let length_array = as_int64_array(&args[1])?;
let fill_array = as_generic_string_array::<T>(&args[2])?;

let result = string_array
Expand Down Expand Up @@ -216,7 +206,7 @@ pub fn reverse<T: OffsetSizeTrait>(args: &[ArrayRef]) -> Result<ArrayRef> {
/// The implementation uses UTF-8 code points as characters
pub fn right<T: OffsetSizeTrait>(args: &[ArrayRef]) -> Result<ArrayRef> {
let string_array = as_generic_string_array::<T>(&args[0])?;
let n_array = downcast_arg!(args[1], "n", Int64Array);
let n_array = as_int64_array(&args[1])?;

let result = string_array
.iter()
Expand Down Expand Up @@ -250,7 +240,7 @@ pub fn rpad<T: OffsetSizeTrait>(args: &[ArrayRef]) -> Result<ArrayRef> {
match args.len() {
2 => {
let string_array = as_generic_string_array::<T>(&args[0])?;
let length_array = downcast_arg!(args[1], "length", Int64Array);
let length_array = as_int64_array(&args[1])?;

let result = string_array
.iter()
Expand Down Expand Up @@ -285,7 +275,7 @@ pub fn rpad<T: OffsetSizeTrait>(args: &[ArrayRef]) -> Result<ArrayRef> {
}
3 => {
let string_array = as_generic_string_array::<T>(&args[0])?;
let length_array = downcast_arg!(args[1], "length", Int64Array);
let length_array = as_int64_array(&args[1])?;
let fill_array = as_generic_string_array::<T>(&args[2])?;

let result = string_array
Expand Down Expand Up @@ -376,7 +366,7 @@ pub fn substr<T: OffsetSizeTrait>(args: &[ArrayRef]) -> Result<ArrayRef> {
match args.len() {
2 => {
let string_array = as_generic_string_array::<T>(&args[0])?;
let start_array = downcast_arg!(args[1], "start", Int64Array);
let start_array = as_int64_array(&args[1])?;

let result = string_array
.iter()
Expand All @@ -397,8 +387,8 @@ pub fn substr<T: OffsetSizeTrait>(args: &[ArrayRef]) -> Result<ArrayRef> {
}
3 => {
let string_array = as_generic_string_array::<T>(&args[0])?;
let start_array = downcast_arg!(args[1], "start", Int64Array);
let count_array = downcast_arg!(args[2], "count", Int64Array);
let start_array = as_int64_array(&args[1])?;
let count_array = as_int64_array(&args[2])?;

let result = string_array
.iter()
Expand Down