diff --git a/datafusion/physical-expr/src/expressions/binary.rs b/datafusion/physical-expr/src/expressions/binary.rs index d6fbb31019a9..34b561f03a7f 100644 --- a/datafusion/physical-expr/src/expressions/binary.rs +++ b/datafusion/physical-expr/src/expressions/binary.rs @@ -48,9 +48,6 @@ use arrow::compute::kernels::comparison::{ eq_dyn_utf8_scalar, gt_dyn_utf8_scalar, gt_eq_dyn_utf8_scalar, lt_dyn_utf8_scalar, lt_eq_dyn_utf8_scalar, neq_dyn_utf8_scalar, }; -use arrow::compute::kernels::comparison::{ - eq_scalar, gt_eq_scalar, gt_scalar, lt_eq_scalar, lt_scalar, neq_scalar, -}; use arrow::datatypes::*; use adapter::{eq_dyn, gt_dyn, gt_eq_dyn, lt_dyn, lt_eq_dyn, neq_dyn}; @@ -984,16 +981,16 @@ macro_rules! binary_array_op_dyn_scalar { ScalarValue::UInt64(v) => compute_op_dyn_scalar!($LEFT, v, $OP, $OP_TYPE), ScalarValue::Float32(v) => compute_op_dyn_scalar!($LEFT, v, $OP, $OP_TYPE), ScalarValue::Float64(v) => compute_op_dyn_scalar!($LEFT, v, $OP, $OP_TYPE), - ScalarValue::Date32(_) => compute_op_dyn_scalar!($LEFT, v, $OP, $OP_TYPE), - ScalarValue::Date64(_) => compute_op_dyn_scalar!($LEFT, v, $OP, $OP_TYPE), - ScalarValue::Time32Second(_) => compute_op_dyn_scalar!($LEFT, v, $OP, $OP_TYPE), - ScalarValue::Time32Millisecond(_) => compute_op_dyn_scalar!($LEFT, v, $OP, $OP_TYPE), - ScalarValue::Time64Microsecond(_) => compute_op_dyn_scalar!($LEFT, v, $OP, $OP_TYPE), - ScalarValue::Time64Nanosecond(_) => compute_op_dyn_scalar!($LEFT, v, $OP, $OP_TYPE), - ScalarValue::TimestampSecond(..) => compute_op_dyn_scalar!($LEFT, v, $OP, $OP_TYPE), - ScalarValue::TimestampMillisecond(..) => compute_op_dyn_scalar!($LEFT, v, $OP, $OP_TYPE), - ScalarValue::TimestampMicrosecond(..) => compute_op_dyn_scalar!($LEFT, v, $OP, $OP_TYPE), - ScalarValue::TimestampNanosecond(..) => compute_op_dyn_scalar!($LEFT, v, $OP, $OP_TYPE), + ScalarValue::Date32(v) => compute_op_dyn_scalar!($LEFT, v, $OP, $OP_TYPE), + ScalarValue::Date64(v) => compute_op_dyn_scalar!($LEFT, v, $OP, $OP_TYPE), + ScalarValue::Time32Second(v) => compute_op_dyn_scalar!($LEFT, v, $OP, $OP_TYPE), + ScalarValue::Time32Millisecond(v) => compute_op_dyn_scalar!($LEFT, v, $OP, $OP_TYPE), + ScalarValue::Time64Microsecond(v) => compute_op_dyn_scalar!($LEFT, v, $OP, $OP_TYPE), + ScalarValue::Time64Nanosecond(v) => compute_op_dyn_scalar!($LEFT, v, $OP, $OP_TYPE), + ScalarValue::TimestampSecond(v, _) => compute_op_dyn_scalar!($LEFT, v, $OP, $OP_TYPE), + ScalarValue::TimestampMillisecond(v, _) => compute_op_dyn_scalar!($LEFT, v, $OP, $OP_TYPE), + ScalarValue::TimestampMicrosecond(v, _) => compute_op_dyn_scalar!($LEFT, v, $OP, $OP_TYPE), + ScalarValue::TimestampNanosecond(v, _) => compute_op_dyn_scalar!($LEFT, v, $OP, $OP_TYPE), other => Err(DataFusionError::Internal(format!( "Data type {:?} not supported for scalar operation '{}' on dyn array", other, stringify!($OP)))