Skip to content

Support Date32/Date64 in unwrap_cast optimization #21665

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

Open
Dandandan wants to merge 2 commits into
base: main
Choose a base branch
from
+52 −32
Open

Support Date32/Date64 in unwrap_cast optimization #21665

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
df0953c
Support Date32/Date64 in unwrap_cast optimization
Dandandan Apr 16, 2026
f003e36
Merge branch 'main' into unwrap-cast-date-types
Dandandan Apr 16, 2026
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
28 changes: 24 additions & 4 deletions datafusion/expr-common/src/casts.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,11 @@ pub fn is_supported_type(data_type: &DataType) -> bool {
|| is_supported_binary_type(data_type)
}

/// Returns true if unwrap_cast_in_comparison support this numeric type
fn is_date_type(data_type: &DataType) -> bool {
matches!(data_type, DataType::Date32 | DataType::Date64)
}

/// Returns true if unwrap_cast_in_comparison supports this numeric type
fn is_supported_numeric_type(data_type: &DataType) -> bool {
matches!(
data_type,
Expand All @@ -70,6 +74,8 @@ fn is_supported_numeric_type(data_type: &DataType) -> bool {
| DataType::Int16
| DataType::Int32
| DataType::Int64
| DataType::Date32
| DataType::Date64
| DataType::Decimal32(_, _)
| DataType::Decimal64(_, _)
| DataType::Decimal128(_, _)
Expand Down Expand Up @@ -107,6 +113,14 @@ fn try_cast_numeric_literal(
return None;
}

// Date↔Timestamp casts are lossy (drop time-of-day or add midnight),
// so unwrapping would change comparison semantics.
if (is_date_type(&lit_data_type) && target_type.is_temporal())
Copy link
Copy Markdown
Member

@martin-g martin-g Apr 16, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The comment is about Data<->Timestamp casts but this includes other temporal types like Duration and Interval. Maybe the comment should be extended.

But this also would prevent casting from Date32 to Date64. I think this might be desirable by someone.

Copy link
Copy Markdown
Contributor

@alamb alamb Apr 16, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should probably at least include a test that shows the date/timetamp cast not being done. I also found the logic here subtle so having some explanation would help. Here is a suggestion:

I also found this pretty subtle

Copy link
Copy Markdown
Contributor

@alamb alamb Apr 16, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we could make this PR as a follow on too

|| (is_date_type(target_type) && lit_data_type.is_temporal())
{
return None;
}

let mul = match target_type {
DataType::UInt8
| DataType::UInt16
Expand All @@ -115,7 +129,9 @@ fn try_cast_numeric_literal(
| DataType::Int8
| DataType::Int16
| DataType::Int32
| DataType::Int64 => 1_i128,
| DataType::Int64
| DataType::Date32
| DataType::Date64 => 1_i128,
DataType::Timestamp(_, _) => 1_i128,
DataType::Decimal32(_, scale) => 10_i128.pow(*scale as u32),
DataType::Decimal64(_, scale) => 10_i128.pow(*scale as u32),
Expand All @@ -129,8 +145,8 @@ fn try_cast_numeric_literal(
DataType::UInt64 => (u64::MIN as i128, u64::MAX as i128),
DataType::Int8 => (i8::MIN as i128, i8::MAX as i128),
DataType::Int16 => (i16::MIN as i128, i16::MAX as i128),
DataType::Int32 => (i32::MIN as i128, i32::MAX as i128),
DataType::Int64 => (i64::MIN as i128, i64::MAX as i128),
DataType::Int32 | DataType::Date32 => (i32::MIN as i128, i32::MAX as i128),
DataType::Int64 | DataType::Date64 => (i64::MIN as i128, i64::MAX as i128),
DataType::Timestamp(_, _) => (i64::MIN as i128, i64::MAX as i128),
DataType::Decimal32(precision, _) => (
// Different precision for decimal32 can store different range of value.
Expand Down Expand Up @@ -164,6 +180,8 @@ fn try_cast_numeric_literal(
ScalarValue::UInt16(Some(v)) => (*v as i128).checked_mul(mul),
ScalarValue::UInt32(Some(v)) => (*v as i128).checked_mul(mul),
ScalarValue::UInt64(Some(v)) => (*v as i128).checked_mul(mul),
ScalarValue::Date32(Some(v)) => (*v as i128).checked_mul(mul),
ScalarValue::Date64(Some(v)) => (*v as i128).checked_mul(mul),
ScalarValue::TimestampSecond(Some(v), _) => (*v as i128).checked_mul(mul),
ScalarValue::TimestampMillisecond(Some(v), _) => (*v as i128).checked_mul(mul),
ScalarValue::TimestampMicrosecond(Some(v), _) => (*v as i128).checked_mul(mul),
Expand Down Expand Up @@ -241,6 +259,8 @@ fn try_cast_numeric_literal(
DataType::Int16 => ScalarValue::Int16(Some(value as i16)),
DataType::Int32 => ScalarValue::Int32(Some(value as i32)),
DataType::Int64 => ScalarValue::Int64(Some(value as i64)),
DataType::Date32 => ScalarValue::Date32(Some(value as i32)),
DataType::Date64 => ScalarValue::Date64(Some(value as i64)),
DataType::UInt8 => ScalarValue::UInt8(Some(value as u8)),
DataType::UInt16 => ScalarValue::UInt16(Some(value as u16)),
DataType::UInt32 => ScalarValue::UInt32(Some(value as u32)),
Expand Down
Loading
Loading