Skip to content

Improve error handling for array downcasting #4445

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 3 commits into from
Dec 1, 2022
Merged

Improve error handling for array downcasting #4445

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ca1ba56
improve error handling and add some more types
retikulum Nov 30, 2022
a499562
Empty-Commit
retikulum Dec 1, 2022
33b1b9d
Empty-Commit for network issue on test amc
retikulum Dec 1, 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
58 changes: 54 additions & 4 deletions datafusion/common/src/cast.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,12 @@
use crate::{downcast_value, DataFusionError};
use arrow::{
array::{
Array, BooleanArray, Date32Array, Decimal128Array, DictionaryArray, Float32Array,
Float64Array, GenericBinaryArray, GenericListArray, Int32Array, Int64Array,
LargeListArray, ListArray, OffsetSizeTrait, PrimitiveArray, StringArray,
StructArray, UInt32Array, UInt64Array,
Array, BinaryArray, BooleanArray, Date32Array, Decimal128Array, DictionaryArray,
Float32Array, Float64Array, GenericBinaryArray, GenericListArray, Int32Array,
Int64Array, LargeListArray, ListArray, MapArray, NullArray, OffsetSizeTrait,
PrimitiveArray, StringArray, StructArray, TimestampMicrosecondArray,
TimestampMillisecondArray, TimestampNanosecondArray, TimestampSecondArray,
UInt32Array, UInt64Array, UnionArray,
},
datatypes::{ArrowDictionaryKeyType, ArrowPrimitiveType},
};
Expand Down Expand Up @@ -127,3 +129,51 @@ pub fn as_primitive_array<T: ArrowPrimitiveType>(
) -> Result<&PrimitiveArray<T>, DataFusionError> {
Ok(downcast_value!(array, PrimitiveArray, T))
}

// Downcast ArrayRef to MapArray
pub fn as_map_array(array: &dyn Array) -> Result<&MapArray, DataFusionError> {
Ok(downcast_value!(array, MapArray))
}

// Downcast ArrayRef to NullArray
pub fn as_null_array(array: &dyn Array) -> Result<&NullArray, DataFusionError> {
Ok(downcast_value!(array, NullArray))
}

// Downcast ArrayRef to NullArray
pub fn as_union_array(array: &dyn Array) -> Result<&UnionArray, DataFusionError> {
Ok(downcast_value!(array, UnionArray))
}

// Downcast ArrayRef to TimestampNanosecondArray
pub fn as_timestamp_nanosecond_array(
array: &dyn Array,
) -> Result<&TimestampNanosecondArray, DataFusionError> {
Ok(downcast_value!(array, TimestampNanosecondArray))
}

// Downcast ArrayRef to TimestampMillisecondArray
pub fn as_timestamp_millisecond_array(
array: &dyn Array,
) -> Result<&TimestampMillisecondArray, DataFusionError> {
Ok(downcast_value!(array, TimestampMillisecondArray))
}

// Downcast ArrayRef to TimestampMicrosecondArray
pub fn as_timestamp_microsecond_array(
array: &dyn Array,
) -> Result<&TimestampMicrosecondArray, DataFusionError> {
Ok(downcast_value!(array, TimestampMicrosecondArray))
}

// Downcast ArrayRef to TimestampSecondArray
pub fn as_timestamp_second_array(
array: &dyn Array,
) -> Result<&TimestampSecondArray, DataFusionError> {
Ok(downcast_value!(array, TimestampSecondArray))
}

// Downcast ArrayRef to BinaryArray
pub fn as_binary_array(array: &dyn Array) -> Result<&BinaryArray, DataFusionError> {
Ok(downcast_value!(array, BinaryArray))
}
12 changes: 5 additions & 7 deletions datafusion/core/src/avro_to_arrow/arrow_array_reader.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -975,9 +975,10 @@ mod test {
use crate::arrow::array::Array;
use crate::arrow::datatypes::{Field, TimeUnit};
use crate::avro_to_arrow::{Reader, ReaderBuilder};
use arrow::array::TimestampMicrosecondArray;
use arrow::datatypes::DataType;
use datafusion_common::cast::{as_int32_array, as_int64_array, as_list_array};
use datafusion_common::cast::{
as_int32_array, as_int64_array, as_list_array, as_timestamp_microsecond_array,
};
use std::fs::File;

fn build_reader(name: &str, batch_size: usize) -> Reader<File> {
Expand Down Expand Up @@ -1008,11 +1009,8 @@ mod test {
&DataType::Timestamp(TimeUnit::Microsecond, None),
timestamp_col.1.data_type()
);
let timestamp_array = batch
.column(timestamp_col.0)
.as_any()
.downcast_ref::<TimestampMicrosecondArray>()
.unwrap();
let timestamp_array =
as_timestamp_microsecond_array(batch.column(timestamp_col.0)).unwrap();
for i in 0..timestamp_array.len() {
assert!(timestamp_array.is_valid(i));
}
Expand Down
16 changes: 4 additions & 12 deletions datafusion/core/src/datasource/file_format/avro.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,9 +92,9 @@ mod tests {
use crate::datasource::file_format::test_util::scan_format;
use crate::physical_plan::collect;
use crate::prelude::{SessionConfig, SessionContext};
use arrow::array::{BinaryArray, TimestampMicrosecondArray};
use datafusion_common::cast::{
as_boolean_array, as_float32_array, as_float64_array, as_int32_array,
as_binary_array, as_boolean_array, as_float32_array, as_float64_array,
as_int32_array, as_timestamp_microsecond_array,
};
use futures::StreamExt;

Expand Down Expand Up @@ -248,11 +248,7 @@ mod tests {
assert_eq!(1, batches[0].num_columns());
assert_eq!(8, batches[0].num_rows());

let array = batches[0]
.column(0)
.as_any()
.downcast_ref::<TimestampMicrosecondArray>()
.unwrap();
let array = as_timestamp_microsecond_array(batches[0].column(0))?;
let mut values: Vec<i64> = vec![];
for i in 0..batches[0].num_rows() {
values.push(array.value(i));
Expand Down Expand Up @@ -327,11 +323,7 @@ mod tests {
assert_eq!(1, batches[0].num_columns());
assert_eq!(8, batches[0].num_rows());

let array = batches[0]
.column(0)
.as_any()
.downcast_ref::<BinaryArray>()
.unwrap();
let array = as_binary_array(batches[0].column(0))?;
let mut values: Vec<&str> = vec![];
for i in 0..batches[0].num_rows() {
values.push(std::str::from_utf8(array.value(i)).unwrap());
Expand Down
19 changes: 5 additions & 14 deletions datafusion/core/src/datasource/file_format/parquet.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -585,14 +585,13 @@ mod tests {
use crate::datasource::file_format::parquet::test_util::store_parquet;
use crate::physical_plan::metrics::MetricValue;
use crate::prelude::{SessionConfig, SessionContext};
use arrow::array::{
Array, ArrayRef, BinaryArray, StringArray, TimestampNanosecondArray,
};
use arrow::array::{Array, ArrayRef, StringArray};
use arrow::record_batch::RecordBatch;
use async_trait::async_trait;
use bytes::Bytes;
use datafusion_common::cast::{
as_boolean_array, as_float32_array, as_float64_array, as_int32_array,
as_binary_array, as_boolean_array, as_float32_array, as_float64_array,
as_int32_array, as_timestamp_nanosecond_array,
};
use datafusion_common::ScalarValue;
use futures::stream::BoxStream;
Expand Down Expand Up @@ -996,11 +995,7 @@ mod tests {
assert_eq!(1, batches[0].num_columns());
assert_eq!(8, batches[0].num_rows());

let array = batches[0]
.column(0)
.as_any()
.downcast_ref::<TimestampNanosecondArray>()
.unwrap();
let array = as_timestamp_nanosecond_array(batches[0].column(0))?;
let mut values: Vec<i64> = vec![];
for i in 0..batches[0].num_rows() {
values.push(array.value(i));
Expand Down Expand Up @@ -1075,11 +1070,7 @@ mod tests {
assert_eq!(1, batches[0].num_columns());
assert_eq!(8, batches[0].num_rows());

let array = batches[0]
.column(0)
.as_any()
.downcast_ref::<BinaryArray>()
.unwrap();
let array = as_binary_array(batches[0].column(0))?;
let mut values: Vec<&str> = vec![];
for i in 0..batches[0].num_rows() {
values.push(std::str::from_utf8(array.value(i)).unwrap());
Expand Down
12 changes: 2 additions & 10 deletions datafusion/physical-expr/src/crypto_expressions.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ use arrow::{
};
use blake2::{Blake2b512, Blake2s256, Digest};
use blake3::Hasher as Blake3;
use datafusion_common::cast::as_generic_binary_array;
use datafusion_common::cast::{as_binary_array, as_generic_binary_array};
use datafusion_common::ScalarValue;
use datafusion_common::{DataFusionError, Result};
use datafusion_expr::ColumnarValue;
Expand Down Expand Up @@ -284,15 +284,7 @@ pub fn md5(args: &[ColumnarValue]) -> Result<ColumnarValue> {
// md5 requires special handling because of its unique utf8 return type
Ok(match value {
ColumnarValue::Array(array) => {
let binary_array = array
.as_ref()
.as_any()
.downcast_ref::<BinaryArray>()
.ok_or_else(|| {
DataFusionError::Internal(
"Impossibly got non-binary array data from digest".into(),
)
})?;
let binary_array = as_binary_array(&array)?;
let string_array: StringArray = binary_array
.iter()
.map(|opt| opt.map(hex_encode::<_>))
Expand Down
45 changes: 15 additions & 30 deletions datafusion/physical-expr/src/datetime_expressions.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,17 +26,17 @@ use arrow::{
},
};
use arrow::{
array::{
Date64Array, TimestampMicrosecondArray, TimestampMillisecondArray,
TimestampNanosecondArray, TimestampSecondArray,
},
array::{Date64Array, TimestampNanosecondArray},
compute::kernels::temporal,
datatypes::TimeUnit,
temporal_conversions::timestamp_ns_to_datetime,
};
use chrono::prelude::*;
use chrono::Duration;
use datafusion_common::cast::as_date32_array;
use datafusion_common::cast::{
as_date32_array, as_timestamp_microsecond_array, as_timestamp_millisecond_array,
as_timestamp_nanosecond_array, as_timestamp_second_array,
};
use datafusion_common::{DataFusionError, Result};
use datafusion_common::{ScalarType, ScalarValue};
use datafusion_expr::ColumnarValue;
Expand Down Expand Up @@ -292,10 +292,7 @@ pub fn date_trunc(args: &[ColumnarValue]) -> Result<ColumnarValue> {
))
}
ColumnarValue::Array(array) => {
let array = array
.as_any()
.downcast_ref::<TimestampNanosecondArray>()
.unwrap();
let array = as_timestamp_nanosecond_array(array)?;
let array = array
.iter()
.map(f)
Expand Down Expand Up @@ -384,10 +381,7 @@ pub fn date_bin(args: &[ColumnarValue]) -> Result<ColumnarValue> {
}
ColumnarValue::Array(array) => match array.data_type() {
DataType::Timestamp(TimeUnit::Nanosecond, _) => {
let array = array
.as_any()
.downcast_ref::<TimestampNanosecondArray>()
.unwrap()
let array = as_timestamp_nanosecond_array(array)?
.iter()
.map(f)
.collect::<TimestampNanosecondArray>();
Expand Down Expand Up @@ -423,31 +417,19 @@ macro_rules! extract_date_part {
}
DataType::Timestamp(time_unit, None) => match time_unit {
TimeUnit::Second => {
let array = $ARRAY
.as_any()
.downcast_ref::<TimestampSecondArray>()
.unwrap();
let array = as_timestamp_second_array($ARRAY)?;
Ok($FN(array)?)
}
TimeUnit::Millisecond => {
let array = $ARRAY
.as_any()
.downcast_ref::<TimestampMillisecondArray>()
.unwrap();
let array = as_timestamp_millisecond_array($ARRAY)?;
Ok($FN(array)?)
}
TimeUnit::Microsecond => {
let array = $ARRAY
.as_any()
.downcast_ref::<TimestampMicrosecondArray>()
.unwrap();
let array = as_timestamp_microsecond_array($ARRAY)?;
Ok($FN(array)?)
}
TimeUnit::Nanosecond => {
let array = $ARRAY
.as_any()
.downcast_ref::<TimestampNanosecondArray>()
.unwrap();
let array = as_timestamp_nanosecond_array($ARRAY)?;
Ok($FN(array)?)
}
},
Expand Down Expand Up @@ -514,7 +496,10 @@ pub fn date_part(args: &[ColumnarValue]) -> Result<ColumnarValue> {
mod tests {
use std::sync::Arc;

use arrow::array::{ArrayRef, Int64Array, IntervalDayTimeArray, StringBuilder};
use arrow::array::{
ArrayRef, Int64Array, IntervalDayTimeArray, StringBuilder,
TimestampMicrosecondArray,
};

use super::*;

Expand Down
30 changes: 9 additions & 21 deletions datafusion/physical-expr/src/expressions/datetime.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,17 +17,17 @@

use crate::physical_expr::down_cast_any_ref;
use crate::PhysicalExpr;
use arrow::array::{
Array, ArrayRef, Date64Array, TimestampMicrosecondArray, TimestampMillisecondArray,
TimestampNanosecondArray, TimestampSecondArray,
};
use arrow::array::{Array, ArrayRef, Date64Array};
use arrow::compute::unary;
use arrow::datatypes::{
DataType, Date32Type, Date64Type, Schema, TimeUnit, TimestampMicrosecondType,
TimestampMillisecondType, TimestampNanosecondType, TimestampSecondType,
};
use arrow::record_batch::RecordBatch;
use datafusion_common::cast::as_date32_array;
use datafusion_common::cast::{
as_date32_array, as_timestamp_microsecond_array, as_timestamp_millisecond_array,
as_timestamp_nanosecond_array, as_timestamp_second_array,
};
use datafusion_common::scalar::{
date32_add, date64_add, microseconds_add, milliseconds_add, nanoseconds_add,
seconds_add,
Expand Down Expand Up @@ -200,20 +200,14 @@ pub fn evaluate_array(
})) as ArrayRef
}
DataType::Timestamp(TimeUnit::Second, _) => {
let array = array
.as_any()
.downcast_ref::<TimestampSecondArray>()
.unwrap();
let array = as_timestamp_second_array(&array)?;
Arc::new(unary::<TimestampSecondType, _, TimestampSecondType>(
array,
|ts_s| seconds_add(ts_s, scalar, sign).unwrap(),
)) as ArrayRef
}
DataType::Timestamp(TimeUnit::Millisecond, _) => {
let array = array
.as_any()
.downcast_ref::<TimestampMillisecondArray>()
.unwrap();
let array = as_timestamp_millisecond_array(&array)?;
Arc::new(
unary::<TimestampMillisecondType, _, TimestampMillisecondType>(
array,
Expand All @@ -222,10 +216,7 @@ pub fn evaluate_array(
) as ArrayRef
}
DataType::Timestamp(TimeUnit::Microsecond, _) => {
let array = array
.as_any()
.downcast_ref::<TimestampMicrosecondArray>()
.unwrap();
let array = as_timestamp_microsecond_array(&array)?;
Arc::new(
unary::<TimestampMicrosecondType, _, TimestampMicrosecondType>(
array,
Expand All @@ -234,10 +225,7 @@ pub fn evaluate_array(
) as ArrayRef
}
DataType::Timestamp(TimeUnit::Nanosecond, _) => {
let array = array
.as_any()
.downcast_ref::<TimestampNanosecondArray>()
.unwrap();
let array = as_timestamp_nanosecond_array(&array)?;
Arc::new(
unary::<TimestampNanosecondType, _, TimestampNanosecondType>(
array,
Expand Down
4 changes: 2 additions & 2 deletions datafusion/row/src/writer.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ use arrow::array::*;
use arrow::datatypes::{DataType, Schema};
use arrow::record_batch::RecordBatch;
use arrow::util::bit_util::{round_upto_power_of_2, set_bit_raw, unset_bit_raw};
use datafusion_common::cast::{as_date32_array, as_string_array};
use datafusion_common::cast::{as_binary_array, as_date32_array, as_string_array};
use datafusion_common::Result;
use std::cmp::max;
use std::sync::Arc;
Expand Down Expand Up @@ -364,7 +364,7 @@ pub(crate) fn write_field_binary(
col_idx: usize,
row_idx: usize,
) {
let from = from.as_any().downcast_ref::<BinaryArray>().unwrap();
let from = as_binary_array(from).unwrap();
let s = from.value(row_idx);
let new_width = to.current_width() + s.len();
if new_width > to.data.len() {
Expand Down