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

Jump to bottom

Support Time32 and Time64 for Type Coercion #4104

Closed
wants to merge 1 commit into from
Closed

Support Time32 and Time64 for Type Coercion #4104

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
150 changes: 129 additions & 21 deletions datafusion/common/src/scalar.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,14 @@ pub enum ScalarValue {
Date32(Option<i32>),
/// Date stored as a signed 64bit int milliseconds since UNIX epoch 1970-01-01
Date64(Option<i64>),
/// Time stored as a signed 32bit int as seconds since midnight
Time32Second(Option<i32>),
/// Time stored as a signed 32bit int as milliseconds since midnight
Time32Millisecond(Option<i32>),
/// Time stored as a signed 64bit int as microseconds since midnight
Time64Microsecond(Option<i64>),
/// Time stored as a signed 64bit int as nanoseconds since midnight
Time64(Option<i64>),
Time64Nanosecond(Option<i64>),
/// Timestamp Second
TimestampSecond(Option<i64>, Option<String>),
/// Timestamp Milliseconds
Expand Down Expand Up @@ -168,8 +174,14 @@ impl PartialEq for ScalarValue {
(Date32(_), _) => false,
(Date64(v1), Date64(v2)) => v1.eq(v2),
(Date64(_), _) => false,
(Time64(v1), Time64(v2)) => v1.eq(v2),
(Time64(_), _) => false,
(Time32Second(v1), Time32Second(v2)) => v1.eq(v2),
(Time32Second(_), _) => false,
(Time32Millisecond(v1), Time32Millisecond(v2)) => v1.eq(v2),
(Time32Millisecond(_), _) => false,
(Time64Microsecond(v1), Time64Microsecond(v2)) => v1.eq(v2),
(Time64Microsecond(_), _) => false,
(Time64Nanosecond(v1), Time64Nanosecond(v2)) => v1.eq(v2),
(Time64Nanosecond(_), _) => false,
(TimestampSecond(v1, _), TimestampSecond(v2, _)) => v1.eq(v2),
(TimestampSecond(_, _), _) => false,
(TimestampMillisecond(v1, _), TimestampMillisecond(v2, _)) => v1.eq(v2),
Expand Down Expand Up @@ -262,8 +274,14 @@ impl PartialOrd for ScalarValue {
(Date32(_), _) => None,
(Date64(v1), Date64(v2)) => v1.partial_cmp(v2),
(Date64(_), _) => None,
(Time64(v1), Time64(v2)) => v1.partial_cmp(v2),
(Time64(_), _) => None,
(Time32Second(v1), Time32Second(v2)) => v1.partial_cmp(v2),
(Time32Second(_), _) => None,
(Time32Millisecond(v1), Time32Millisecond(v2)) => v1.partial_cmp(v2),
(Time32Millisecond(_), _) => None,
(Time64Microsecond(v1), Time64Microsecond(v2)) => v1.partial_cmp(v2),
(Time64Microsecond(_), _) => None,
(Time64Nanosecond(v1), Time64Nanosecond(v2)) => v1.partial_cmp(v2),
(Time64Nanosecond(_), _) => None,
(TimestampSecond(v1, _), TimestampSecond(v2, _)) => v1.partial_cmp(v2),
(TimestampSecond(_, _), _) => None,
(TimestampMillisecond(v1, _), TimestampMillisecond(v2, _)) => {
Expand Down Expand Up @@ -544,7 +562,10 @@ impl std::hash::Hash for ScalarValue {
}
Date32(v) => v.hash(state),
Date64(v) => v.hash(state),
Time64(v) => v.hash(state),
Time32Second(v) => v.hash(state),
Time32Millisecond(v) => v.hash(state),
Time64Microsecond(v) => v.hash(state),
Time64Nanosecond(v) => v.hash(state),
TimestampSecond(v, _) => v.hash(state),
TimestampMillisecond(v, _) => v.hash(state),
TimestampMicrosecond(v, _) => v.hash(state),
Expand Down Expand Up @@ -909,7 +930,10 @@ impl ScalarValue {
))),
ScalarValue::Date32(_) => DataType::Date32,
ScalarValue::Date64(_) => DataType::Date64,
ScalarValue::Time64(_) => DataType::Time64(TimeUnit::Nanosecond),
ScalarValue::Time32Second(_) => DataType::Time32(TimeUnit::Second),
ScalarValue::Time32Millisecond(_) => DataType::Time32(TimeUnit::Millisecond),
ScalarValue::Time64Microsecond(_) => DataType::Time64(TimeUnit::Microsecond),
ScalarValue::Time64Nanosecond(_) => DataType::Time64(TimeUnit::Nanosecond),
ScalarValue::IntervalYearMonth(_) => {
DataType::Interval(IntervalUnit::YearMonth)
}
Expand Down Expand Up @@ -992,7 +1016,10 @@ impl ScalarValue {
ScalarValue::List(v, _) => v.is_none(),
ScalarValue::Date32(v) => v.is_none(),
ScalarValue::Date64(v) => v.is_none(),
ScalarValue::Time64(v) => v.is_none(),
ScalarValue::Time32Second(v) => v.is_none(),
ScalarValue::Time32Millisecond(v) => v.is_none(),
ScalarValue::Time64Microsecond(v) => v.is_none(),
ScalarValue::Time64Nanosecond(v) => v.is_none(),
ScalarValue::TimestampSecond(v, _) => v.is_none(),
ScalarValue::TimestampMillisecond(v, _) => v.is_none(),
ScalarValue::TimestampMicrosecond(v, _) => v.is_none(),
Expand Down Expand Up @@ -1215,8 +1242,17 @@ impl ScalarValue {
DataType::LargeBinary => build_array_string!(LargeBinaryArray, LargeBinary),
DataType::Date32 => build_array_primitive!(Date32Array, Date32),
DataType::Date64 => build_array_primitive!(Date64Array, Date64),
DataType::Time32(TimeUnit::Second) => {
build_array_primitive!(Time32SecondArray, Time32Second)
}
DataType::Time32(TimeUnit::Millisecond) => {
build_array_primitive!(Time32MillisecondArray, Time32Millisecond)
}
DataType::Time64(TimeUnit::Microsecond) => {
build_array_primitive!(Time64MicrosecondArray, Time64Microsecond)
}
DataType::Time64(TimeUnit::Nanosecond) => {
build_array_primitive!(Time64NanosecondArray, Time64)
build_array_primitive!(Time64NanosecondArray, Time64Nanosecond)
}
DataType::Timestamp(TimeUnit::Second, _) => {
build_array_primitive_tz!(TimestampSecondArray, TimestampSecond)
Expand Down Expand Up @@ -1360,8 +1396,10 @@ impl ScalarValue {
// explicitly enumerate unsupported types so newly added
// types must be aknowledged
DataType::Float16
| DataType::Time32(_)
| DataType::Time64(_)
| DataType::Time32(TimeUnit::Microsecond)
| DataType::Time32(TimeUnit::Nanosecond)
| DataType::Time64(TimeUnit::Second)
| DataType::Time64(TimeUnit::Millisecond)
| DataType::Duration(_)
| DataType::FixedSizeBinary(_)
| DataType::FixedSizeList(_, _)
Expand Down Expand Up @@ -1613,7 +1651,34 @@ impl ScalarValue {
ScalarValue::Date64(e) => {
build_array_from_option!(Date64, Date64Array, e, size)
}
ScalarValue::Time64(e) => {
ScalarValue::Time32Second(e) => {
build_array_from_option!(
Time32,
TimeUnit::Second,
Time32SecondArray,
e,
size
)
}
ScalarValue::Time32Millisecond(e) => {
build_array_from_option!(
Time32,
TimeUnit::Millisecond,
Time32MillisecondArray,
e,
size
)
}
ScalarValue::Time64Microsecond(e) => {
build_array_from_option!(
Time64,
TimeUnit::Microsecond,
Time64MicrosecondArray,
e,
size
)
}
ScalarValue::Time64Nanosecond(e) => {
build_array_from_option!(
Time64,
TimeUnit::Nanosecond,
Expand Down Expand Up @@ -1756,8 +1821,17 @@ impl ScalarValue {
DataType::Date64 => {
typed_cast!(array, index, Date64Array, Date64)
}
DataType::Time32(TimeUnit::Second) => {
typed_cast!(array, index, Time32SecondArray, Time32Second)
}
DataType::Time32(TimeUnit::Millisecond) => {
typed_cast!(array, index, Time32MillisecondArray, Time32Millisecond)
}
DataType::Time64(TimeUnit::Microsecond) => {
typed_cast!(array, index, Time64MicrosecondArray, Time64Microsecond)
}
DataType::Time64(TimeUnit::Nanosecond) => {
typed_cast!(array, index, Time64NanosecondArray, Time64)
typed_cast!(array, index, Time64NanosecondArray, Time64Nanosecond)
}
DataType::Timestamp(TimeUnit::Second, tz_opt) => {
typed_cast_tz!(
Expand Down Expand Up @@ -1951,7 +2025,16 @@ impl ScalarValue {
ScalarValue::Date64(val) => {
eq_array_primitive!(array, index, Date64Array, val)
}
ScalarValue::Time64(val) => {
ScalarValue::Time32Second(val) => {
eq_array_primitive!(array, index, Time32SecondArray, val)
}
ScalarValue::Time32Millisecond(val) => {
eq_array_primitive!(array, index, Time32MillisecondArray, val)
}
ScalarValue::Time64Microsecond(val) => {
eq_array_primitive!(array, index, Time64MicrosecondArray, val)
}
ScalarValue::Time64Nanosecond(val) => {
eq_array_primitive!(array, index, Time64NanosecondArray, val)
}
ScalarValue::TimestampSecond(val, _) => {
Expand Down Expand Up @@ -2090,7 +2173,9 @@ impl TryFrom<ScalarValue> for i32 {
fn try_from(value: ScalarValue) -> Result<Self> {
match value {
ScalarValue::Int32(Some(inner_value))
| ScalarValue::Date32(Some(inner_value)) => Ok(inner_value),
| ScalarValue::Date32(Some(inner_value))
| ScalarValue::Time32Second(Some(inner_value))
| ScalarValue::Time32Millisecond(Some(inner_value)) => Ok(inner_value),
_ => Err(DataFusionError::Internal(format!(
"Cannot convert {:?} to {}",
value,
Expand All @@ -2108,7 +2193,8 @@ impl TryFrom<ScalarValue> for i64 {
match value {
ScalarValue::Int64(Some(inner_value))
| ScalarValue::Date64(Some(inner_value))
| ScalarValue::Time64(Some(inner_value))
| ScalarValue::Time64Microsecond(Some(inner_value))
| ScalarValue::Time64Nanosecond(Some(inner_value))
| ScalarValue::TimestampNanosecond(Some(inner_value), _)
| ScalarValue::TimestampMicrosecond(Some(inner_value), _)
| ScalarValue::TimestampMillisecond(Some(inner_value), _)
Expand Down Expand Up @@ -2170,7 +2256,14 @@ impl TryFrom<&DataType> for ScalarValue {
DataType::LargeUtf8 => ScalarValue::LargeUtf8(None),
DataType::Date32 => ScalarValue::Date32(None),
DataType::Date64 => ScalarValue::Date64(None),
DataType::Time64(TimeUnit::Nanosecond) => ScalarValue::Time64(None),
DataType::Time32(TimeUnit::Second) => ScalarValue::Time32Second(None),
DataType::Time32(TimeUnit::Millisecond) => {
ScalarValue::Time32Millisecond(None)
}
DataType::Time64(TimeUnit::Microsecond) => {
ScalarValue::Time64Microsecond(None)
}
DataType::Time64(TimeUnit::Nanosecond) => ScalarValue::Time64Nanosecond(None),
DataType::Timestamp(TimeUnit::Second, tz_opt) => {
ScalarValue::TimestampSecond(None, tz_opt.clone())
}
Expand Down Expand Up @@ -2309,7 +2402,10 @@ impl fmt::Display for ScalarValue {
},
ScalarValue::Date32(e) => format_option!(f, e)?,
ScalarValue::Date64(e) => format_option!(f, e)?,
ScalarValue::Time64(e) => format_option!(f, e)?,
ScalarValue::Time32Second(e) => format_option!(f, e)?,
ScalarValue::Time32Millisecond(e) => format_option!(f, e)?,
ScalarValue::Time64Microsecond(e) => format_option!(f, e)?,
ScalarValue::Time64Nanosecond(e) => format_option!(f, e)?,
ScalarValue::IntervalDayTime(e) => format_option!(f, e)?,
ScalarValue::IntervalYearMonth(e) => format_option!(f, e)?,
ScalarValue::IntervalMonthDayNano(e) => format_option!(f, e)?,
Expand Down Expand Up @@ -2370,7 +2466,16 @@ impl fmt::Debug for ScalarValue {
ScalarValue::List(_, _) => write!(f, "List([{}])", self),
ScalarValue::Date32(_) => write!(f, "Date32(\"{}\")", self),
ScalarValue::Date64(_) => write!(f, "Date64(\"{}\")", self),
ScalarValue::Time64(_) => write!(f, "Time64(\"{}\")", self),
ScalarValue::Time32Second(_) => write!(f, "Time32Second(\"{}\")", self),
ScalarValue::Time32Millisecond(_) => {
write!(f, "Time32Millisecond(\"{}\")", self)
}
ScalarValue::Time64Microsecond(_) => {
write!(f, "Time64Microsecond(\"{}\")", self)
}
ScalarValue::Time64Nanosecond(_) => {
write!(f, "Time64Nanosecond(\"{}\")", self)
}
ScalarValue::IntervalDayTime(_) => {
write!(f, "IntervalDayTime(\"{}\")", self)
}
Expand Down Expand Up @@ -2999,7 +3104,10 @@ mod tests {
make_binary_test_case!(str_vals, LargeBinaryArray, LargeBinary),
make_test_case!(i32_vals, Date32Array, Date32),
make_test_case!(i64_vals, Date64Array, Date64),
make_test_case!(i64_vals, Time64NanosecondArray, Time64),
make_test_case!(i32_vals, Time32SecondArray, Time32Second),
make_test_case!(i32_vals, Time32MillisecondArray, Time32Millisecond),
make_test_case!(i64_vals, Time64MicrosecondArray, Time64Microsecond),
make_test_case!(i64_vals, Time64NanosecondArray, Time64Nanosecond),
make_test_case!(i64_vals, TimestampSecondArray, TimestampSecond, None),
make_test_case!(
i64_vals,
Expand Down Expand Up @@ -3810,4 +3918,4 @@ mod tests {
]
);
}
}
}
56 changes: 54 additions & 2 deletions datafusion/expr/src/type_coercion/binary.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,9 @@
use crate::type_coercion::is_numeric;
use crate::Operator;
use arrow::compute::can_cast_types;
use arrow::datatypes::{DataType, DECIMAL128_MAX_PRECISION, DECIMAL128_MAX_SCALE};
use arrow::datatypes::{
DataType, TimeUnit, DECIMAL128_MAX_PRECISION, DECIMAL128_MAX_SCALE,
};
use datafusion_common::DataFusionError;
use datafusion_common::Result;

Expand Down Expand Up @@ -515,14 +517,29 @@ fn like_coercion(lhs_type: &DataType, rhs_type: &DataType) -> Option<DataType> {
/// casted to for the purpose of a date computation
fn temporal_coercion(lhs_type: &DataType, rhs_type: &DataType) -> Option<DataType> {
use arrow::datatypes::DataType::*;
use arrow::datatypes::TimeUnit;
match (lhs_type, rhs_type) {
(Date64, Date32) => Some(Date64),
(Date32, Date64) => Some(Date64),
(Utf8, Date32) => Some(Date32),
(Date32, Utf8) => Some(Date32),
(Utf8, Date64) => Some(Date64),
(Date64, Utf8) => Some(Date64),
(Utf8, Time32(unit)) => match check_time_unit(Time32(unit.clone())) {
None => None,
Some(unit) => Some(Time32(unit)),
},
(Time32(unit), Utf8) => match check_time_unit(Time32(unit.clone())) {
None => None,
Some(unit) => Some(Time32(unit)),
},
(Utf8, Time64(unit)) => match check_time_unit(Time64(unit.clone())) {
None => None,
Some(unit) => Some(Time64(unit)),
},
(Time64(unit), Utf8) => match check_time_unit(Time64(unit.clone())) {
None => None,
Some(unit) => Some(Time64(unit)),
},
(Timestamp(lhs_unit, lhs_tz), Timestamp(rhs_unit, rhs_tz)) => {
let tz = match (lhs_tz, rhs_tz) {
// can't cast across timezones
Expand Down Expand Up @@ -623,6 +640,17 @@ fn null_coercion(lhs_type: &DataType, rhs_type: &DataType) -> Option<DataType> {
}
}

fn check_time_unit(datatype: DataType) -> Option<TimeUnit> {
use arrow::datatypes::DataType::*;
match datatype {
Time32(TimeUnit::Second) => Some(TimeUnit::Second),
Time32(TimeUnit::Millisecond) => Some(TimeUnit::Millisecond),
Time64(TimeUnit::Microsecond) => Some(TimeUnit::Microsecond),
Time64(TimeUnit::Nanosecond) => Some(TimeUnit::Nanosecond),
_ => None,
}
}

#[cfg(test)]
mod tests {
use super::*;
Expand Down Expand Up @@ -824,6 +852,30 @@ mod tests {
Operator::Lt,
DataType::Date64
);
test_coercion_binary_rule!(
DataType::Utf8,
DataType::Time32(TimeUnit::Second),
Operator::Eq,
DataType::Time32(TimeUnit::Second)
);
test_coercion_binary_rule!(
DataType::Utf8,
DataType::Time32(TimeUnit::Millisecond),
Operator::Eq,
DataType::Time32(TimeUnit::Millisecond)
);
test_coercion_binary_rule!(
DataType::Utf8,
DataType::Time64(TimeUnit::Microsecond),
Operator::Eq,
DataType::Time64(TimeUnit::Microsecond)
);
test_coercion_binary_rule!(
DataType::Utf8,
DataType::Time64(TimeUnit::Nanosecond),
Operator::Eq,
DataType::Time64(TimeUnit::Nanosecond)
);
test_coercion_binary_rule!(
DataType::Utf8,
DataType::Utf8,
Expand Down