Skip to content

feat(substrait): add time literal support #17655

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
wants to merge 1 commit into
base: main
Choose a base branch
from
+48 −5
Open

feat(substrait): add time literal support #17655

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 25 additions & 2 deletions datafusion/substrait/src/logical_plan/consumer/expr/literal.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ use crate::variation_const::{
INTERVAL_MONTH_DAY_NANO_TYPE_REF, INTERVAL_YEAR_MONTH_TYPE_REF,
LARGE_CONTAINER_TYPE_VARIATION_REF, TIMESTAMP_MICRO_TYPE_VARIATION_REF,
TIMESTAMP_MILLI_TYPE_VARIATION_REF, TIMESTAMP_NANO_TYPE_VARIATION_REF,
TIMESTAMP_SECOND_TYPE_VARIATION_REF, UNSIGNED_INTEGER_TYPE_VARIATION_REF,
VIEW_CONTAINER_TYPE_VARIATION_REF,
TIMESTAMP_SECOND_TYPE_VARIATION_REF, TIME_64_TYPE_VARIATION_REF,
UNSIGNED_INTEGER_TYPE_VARIATION_REF, VIEW_CONTAINER_TYPE_VARIATION_REF,
};
use datafusion::arrow::array::{new_empty_array, AsArray, MapArray};
use datafusion::arrow::buffer::OffsetBuffer;
Expand Down Expand Up @@ -155,6 +155,29 @@ pub(crate) fn from_substrait_literal(
}
},
Some(LiteralType::Date(d)) => ScalarValue::Date32(Some(*d)),
Some(LiteralType::PrecisionTime(pt)) => match pt.precision {
6 => match lit.type_variation_reference {
Copy link
Contributor

@gabotechs gabotechs Sep 19, 2025 •
edited
Loading

Choose a reason for hiding this comment

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

Nice, I imagine if we wanted to support the rest of the type variations it would look something like:

            0 => match lit.type_variation_reference {
                TIME_32_TYPE_VARIATION_REF => {
                    ScalarValue::Time32Second(Some(pt.value as i32))
                }
                others => {
                    return substrait_err!("Unknown type variation reference {others}");
                }
            },
            3 => match lit.type_variation_reference {
                TIME_32_TYPE_VARIATION_REF => {
                    ScalarValue::Time32Millisecond(Some(pt.value as i32))
                }
                others => {
                    return substrait_err!("Unknown type variation reference {others}");
                }
            },

If you are up for the ride I think we could also add them, otherwise I think it's fine as is

TIME_64_TYPE_VARIATION_REF => {
ScalarValue::Time64Microsecond(Some(pt.value))
}
others => {
return substrait_err!("Unknown type variation reference {others}");
}
},
9 => match lit.type_variation_reference {
TIME_64_TYPE_VARIATION_REF => {
ScalarValue::Time64Nanosecond(Some(pt.value))
}
others => {
return substrait_err!("Unknown type variation reference {others}");
}
},
p => {
return not_impl_err!(
"Unsupported Substrait precision {p} for PrecisionTime"
);
}
},
Some(LiteralType::String(s)) => match lit.type_variation_reference {
DEFAULT_CONTAINER_TYPE_VARIATION_REF => ScalarValue::Utf8(Some(s.clone())),
LARGE_CONTAINER_TYPE_VARIATION_REF => ScalarValue::LargeUtf8(Some(s.clone())),
Expand Down
26 changes: 23 additions & 3 deletions datafusion/substrait/src/logical_plan/producer/expr/literal.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ use crate::logical_plan::producer::{to_substrait_type, SubstraitProducer};
use crate::variation_const::{
DATE_32_TYPE_VARIATION_REF, DECIMAL_128_TYPE_VARIATION_REF,
DEFAULT_CONTAINER_TYPE_VARIATION_REF, DEFAULT_TYPE_VARIATION_REF,
LARGE_CONTAINER_TYPE_VARIATION_REF, UNSIGNED_INTEGER_TYPE_VARIATION_REF,
VIEW_CONTAINER_TYPE_VARIATION_REF,
LARGE_CONTAINER_TYPE_VARIATION_REF, TIME_64_TYPE_VARIATION_REF,
UNSIGNED_INTEGER_TYPE_VARIATION_REF, VIEW_CONTAINER_TYPE_VARIATION_REF,
};
use datafusion::arrow::array::{Array, GenericListArray, OffsetSizeTrait};
use datafusion::arrow::temporal_conversions::NANOSECONDS;
Expand All @@ -29,7 +29,7 @@ use substrait::proto::expression::literal::interval_day_to_second::PrecisionMode
use substrait::proto::expression::literal::map::KeyValue;
use substrait::proto::expression::literal::{
Decimal, IntervalCompound, IntervalDayToSecond, IntervalYearToMonth, List,
LiteralType, Map, PrecisionTimestamp, Struct,
LiteralType, Map, PrecisionTime, PrecisionTimestamp, Struct,
};
use substrait::proto::expression::{Literal, RexType};
use substrait::proto::{r#type, Expression};
Expand Down Expand Up @@ -280,6 +280,20 @@ pub(crate) fn to_substrait_literal(
};
(map, DEFAULT_CONTAINER_TYPE_VARIATION_REF)
}
ScalarValue::Time64Microsecond(Some(t)) => (
LiteralType::PrecisionTime(PrecisionTime {
precision: 6,
value: *t,
}),
TIME_64_TYPE_VARIATION_REF,
),
ScalarValue::Time64Nanosecond(Some(t)) => (
LiteralType::PrecisionTime(PrecisionTime {
precision: 9,
value: *t,
}),
TIME_64_TYPE_VARIATION_REF,
),
ScalarValue::Struct(s) => (
LiteralType::Struct(Struct {
fields: s
Expand Down Expand Up @@ -398,6 +412,12 @@ mod tests {
round_trip_literal(ScalarValue::TimestampNanosecond(ts, tz))?;
}

// Test Time64 literals
round_trip_literal(ScalarValue::Time64Microsecond(Some(45296789123)))?;
round_trip_literal(ScalarValue::Time64Microsecond(None))?;
round_trip_literal(ScalarValue::Time64Nanosecond(Some(45296789123000)))?;
round_trip_literal(ScalarValue::Time64Nanosecond(None))?;

round_trip_literal(ScalarValue::List(ScalarValue::new_list_nullable(
&[ScalarValue::Float32(Some(1.0))],
&DataType::Float32,
Expand Down