Skip to content

Full support for time32 and time64 literal values (ScalarValue) #4156

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 14 commits into from
Nov 20, 2022
Merged

Full support for time32 and time64 literal values (ScalarValue) #4156

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
b10fb9e
Rebase branch into most recent version of master
andre-cc-natzka Nov 14, 2022
e7b1c6a
Implement Time32 and Time64 in hash_join and hash_util
andre-cc-natzka Nov 9, 2022
fec5754
Add review comments
andre-cc-natzka Nov 9, 2022
46e5088
Changes in proto to provide full support for Time32 and Time64
andre-cc-natzka Nov 10, 2022
60e069e
Add test to ensure Time32 and Time64 are fully supported
andre-cc-natzka Nov 14, 2022
0f2c58c
Changes in protos to allow full support of Time32 and Time64
andre-cc-natzka Nov 14, 2022
cd08e71
Correct changes in protos to allow full support of Time32 and Time64
andre-cc-natzka Nov 14, 2022
5d147d9
Fix tests
andre-cc-natzka Nov 14, 2022
b3f98d5
Remove core/src/physical_plan/hash_utils.rs and useless comment
andre-cc-natzka Nov 15, 2022
5d9e1eb
Fix failing test
andre-cc-natzka Nov 16, 2022
7d86e33
Merge remote-tracking branch 'apache/master' into Support_Time32_and_…
alamb Nov 20, 2022
7ea1d8f
Update to avoid deprecated chrono feature
alamb Nov 20, 2022
28a933c
Remove generated file
alamb Nov 20, 2022
0397fe6
Clippy
alamb Nov 20, 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
157 changes: 134 additions & 23 deletions datafusion/common/src/scalar.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,8 +89,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 @@ -170,8 +176,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 @@ -263,8 +275,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 @@ -670,7 +688,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 @@ -1036,7 +1057,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 @@ -1120,7 +1144,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 @@ -1380,8 +1407,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 @@ -1541,10 +1577,15 @@ impl ScalarValue {
Arc::new(array)
}
// explicitly enumerate unsupported types so newly added
// types must be aknowledged
// types must be aknowledged, Time32 and Time64 types are
// not supported if the TimeUnit is not valid (Time32 can
// only be used with Second and Millisecond, Time64 only
// with Microsecond and Nanosecond)
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::FixedSizeList(_, _)
| DataType::Interval(_)
Expand Down Expand Up @@ -1813,7 +1854,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 @@ -1957,8 +2025,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 @@ -2163,7 +2240,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 @@ -2295,14 +2381,16 @@ macro_rules! impl_try_from {
impl_try_from!(Int8, i8);
impl_try_from!(Int16, i16);

// special implementation for i32 because of Date32
// special implementation for i32 because of Date32 and Time32
impl TryFrom<ScalarValue> for i32 {
type Error = DataFusionError;

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 @@ -2312,15 +2400,16 @@ impl TryFrom<ScalarValue> for i32 {
}
}

// special implementation for i64 because of TimeNanosecond
// special implementation for i64 because of Date64, Time64 and Timestamp
impl TryFrom<ScalarValue> for i64 {
type Error = DataFusionError;

fn try_from(value: ScalarValue) -> Result<Self> {
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 @@ -2394,7 +2483,14 @@ impl TryFrom<&DataType> for ScalarValue {
DataType::LargeBinary => ScalarValue::LargeBinary(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 @@ -2515,7 +2611,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 @@ -2582,7 +2681,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 @@ -3212,7 +3320,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
34 changes: 32 additions & 2 deletions datafusion/core/src/physical_plan/joins/hash_join.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,10 @@ use arrow::{
array::{
as_dictionary_array, ArrayData, ArrayRef, BooleanArray, Date32Array, Date64Array,
Decimal128Array, DictionaryArray, LargeStringArray, PrimitiveArray,
TimestampMicrosecondArray, TimestampMillisecondArray, TimestampSecondArray,
UInt32BufferBuilder, UInt32Builder, UInt64BufferBuilder, UInt64Builder,
Time32MillisecondArray, Time32SecondArray, Time64MicrosecondArray,
Time64NanosecondArray, TimestampMicrosecondArray, TimestampMillisecondArray,
TimestampSecondArray, UInt32BufferBuilder, UInt32Builder, UInt64BufferBuilder,
UInt64Builder,
},
compute,
datatypes::{
Expand Down Expand Up @@ -1218,6 +1220,34 @@ fn equal_rows(
DataType::Date64 => {
equal_rows_elem!(Date64Array, l, r, left, right, null_equals_null)
}
DataType::Time32(time_unit) => match time_unit {
TimeUnit::Second => {
equal_rows_elem!(Time32SecondArray, l, r, left, right, null_equals_null)
}
TimeUnit::Millisecond => {
equal_rows_elem!(Time32MillisecondArray, l, r, left, right, null_equals_null)
}
_ => {
err = Some(Err(DataFusionError::Internal(
"Unsupported data type in hasher".to_string(),
)));
false
}
}
DataType::Time64(time_unit) => match time_unit {
TimeUnit::Microsecond => {
equal_rows_elem!(Time64MicrosecondArray, l, r, left, right, null_equals_null)
}
TimeUnit::Nanosecond => {
equal_rows_elem!(Time64NanosecondArray, l, r, left, right, null_equals_null)
}
_ => {
err = Some(Err(DataFusionError::Internal(
"Unsupported data type in hasher".to_string(),
)));
false
}
}
DataType::Timestamp(time_unit, None) => match time_unit {
TimeUnit::Second => {
equal_rows_elem!(
Expand Down
Loading