-
Notifications
You must be signed in to change notification settings - Fork 1.9k
feat(spark): add trunc, date_trunc and time_trunc functions #19829
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.
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
Changes from all commits
a81ab4f
e214d65
9d7addf
e402557
120b9e9
3b6579e
48488eb
fb1f92a
a6cbe76
54e2214
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,172 @@ | ||
| // Licensed to the Apache Software Foundation (ASF) under one | ||
| // or more contributor license agreements. See the NOTICE file | ||
| // distributed with this work for additional information | ||
| // regarding copyright ownership. The ASF licenses this file | ||
| // to you under the Apache License, Version 2.0 (the | ||
| // "License"); you may not use this file except in compliance | ||
| // with the License. You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, | ||
| // software distributed under the License is distributed on an | ||
| // "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| // KIND, either express or implied. See the License for the | ||
| // specific language governing permissions and limitations | ||
| // under the License. | ||
|
|
||
| use std::any::Any; | ||
| use std::sync::Arc; | ||
|
|
||
| use arrow::datatypes::{DataType, Field, FieldRef, TimeUnit}; | ||
| use datafusion_common::types::{NativeType, logical_string}; | ||
| use datafusion_common::utils::take_function_args; | ||
| use datafusion_common::{Result, ScalarValue, internal_err, plan_err}; | ||
| use datafusion_expr::expr::ScalarFunction; | ||
| use datafusion_expr::simplify::{ExprSimplifyResult, SimplifyContext}; | ||
| use datafusion_expr::{ | ||
| Coercion, ColumnarValue, Expr, ExprSchemable, ReturnFieldArgs, ScalarFunctionArgs, | ||
| ScalarUDFImpl, Signature, TypeSignatureClass, Volatility, | ||
| }; | ||
|
|
||
| /// Spark date_trunc supports extra format aliases. | ||
| /// It also handles timestamps with timezones by converting to session timezone first. | ||
| /// <https://spark.apache.org/docs/latest/api/sql/index.html#date_trunc> | ||
| #[derive(Debug, PartialEq, Eq, Hash)] | ||
| pub struct SparkDateTrunc { | ||
| signature: Signature, | ||
| } | ||
|
|
||
| impl Default for SparkDateTrunc { | ||
| fn default() -> Self { | ||
| Self::new() | ||
| } | ||
| } | ||
|
|
||
| impl SparkDateTrunc { | ||
| pub fn new() -> Self { | ||
| Self { | ||
| signature: Signature::coercible( | ||
| vec![ | ||
| Coercion::new_exact(TypeSignatureClass::Native(logical_string())), | ||
| Coercion::new_implicit( | ||
| TypeSignatureClass::Timestamp, | ||
| vec![TypeSignatureClass::Native(logical_string())], | ||
| NativeType::Timestamp(TimeUnit::Microsecond, None), | ||
| ), | ||
| ], | ||
| Volatility::Immutable, | ||
| ), | ||
| } | ||
| } | ||
| } | ||
|
|
||
| impl ScalarUDFImpl for SparkDateTrunc { | ||
| fn as_any(&self) -> &dyn Any { | ||
| self | ||
| } | ||
|
|
||
| fn name(&self) -> &str { | ||
| "date_trunc" | ||
| } | ||
|
|
||
| fn signature(&self) -> &Signature { | ||
| &self.signature | ||
| } | ||
|
|
||
| fn return_type(&self, _arg_types: &[DataType]) -> Result<DataType> { | ||
| internal_err!("return_field_from_args should be used instead") | ||
| } | ||
|
|
||
| fn return_field_from_args(&self, args: ReturnFieldArgs) -> Result<FieldRef> { | ||
| let nullable = args.arg_fields.iter().any(|f| f.is_nullable()); | ||
|
|
||
| Ok(Arc::new(Field::new( | ||
| self.name(), | ||
| args.arg_fields[1].data_type().clone(), | ||
| nullable, | ||
| ))) | ||
| } | ||
|
|
||
| fn invoke_with_args(&self, _args: ScalarFunctionArgs) -> Result<ColumnarValue> { | ||
| internal_err!( | ||
| "spark date_trunc should have been simplified to standard date_trunc" | ||
| ) | ||
| } | ||
|
|
||
| fn simplify( | ||
| &self, | ||
| args: Vec<Expr>, | ||
| info: &SimplifyContext, | ||
| ) -> Result<ExprSimplifyResult> { | ||
| let [fmt_expr, ts_expr] = take_function_args(self.name(), args)?; | ||
|
|
||
| let fmt = match fmt_expr.as_literal() { | ||
| Some(ScalarValue::Utf8(Some(v))) | ||
| | Some(ScalarValue::Utf8View(Some(v))) | ||
| | Some(ScalarValue::LargeUtf8(Some(v))) => v.to_lowercase(), | ||
| _ => { | ||
| return plan_err!( | ||
| "First argument of `DATE_TRUNC` must be non-null scalar Utf8" | ||
| ); | ||
| } | ||
| }; | ||
|
|
||
| // Map Spark-specific fmt aliases to datafusion ones | ||
| let fmt = match fmt.as_str() { | ||
| "yy" | "yyyy" => "year", | ||
| "mm" | "mon" => "month", | ||
| "dd" => "day", | ||
andygrove marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| other => other, | ||
| }; | ||
|
|
||
| let session_tz = info.config_options().execution.time_zone.clone(); | ||
| let ts_type = ts_expr.get_type(info.schema())?; | ||
|
|
||
| // Spark interprets timestamps in the session timezone before truncating, | ||
| // then returns a timestamp at microsecond precision. | ||
| // See: https://github.com/apache/spark/blob/f310f4fcc95580a6824bc7d22b76006f79b8804a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/util/DateTimeUtils.scala#L492 | ||
| // | ||
| // For sub-second truncations (second, millisecond, microsecond), timezone | ||
| // adjustment is unnecessary since timezone offsets are whole seconds. | ||
| let ts_expr = match (&ts_type, fmt) { | ||
| // Sub-second truncations don't need timezone adjustment | ||
| (_, "second" | "millisecond" | "microsecond") => ts_expr, | ||
|
|
||
| // convert to session timezone, strip timezone and convert back to original timezone | ||
| (DataType::Timestamp(unit, tz), _) => { | ||
| let ts_expr = match &session_tz { | ||
| Some(session_tz) => ts_expr.cast_to( | ||
| &DataType::Timestamp( | ||
| TimeUnit::Microsecond, | ||
| Some(Arc::from(session_tz.as_str())), | ||
| ), | ||
| info.schema(), | ||
| )?, | ||
| None => ts_expr, | ||
| }; | ||
| Expr::ScalarFunction(ScalarFunction::new_udf( | ||
| datafusion_functions::datetime::to_local_time(), | ||
| vec![ts_expr], | ||
| )) | ||
| .cast_to(&DataType::Timestamp(*unit, tz.clone()), info.schema())? | ||
| } | ||
|
|
||
| _ => { | ||
| return plan_err!( | ||
| "Second argument of `DATE_TRUNC` must be Timestamp, got {}", | ||
| ts_type | ||
| ); | ||
| } | ||
| }; | ||
|
|
||
| let fmt_expr = Expr::Literal(ScalarValue::new_utf8(fmt), None); | ||
|
|
||
| Ok(ExprSimplifyResult::Simplified(Expr::ScalarFunction( | ||
| ScalarFunction::new_udf( | ||
| datafusion_functions::datetime::date_trunc(), | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Just concerned about if matching return field nullability here is something we should watch for?
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. yep DF's date_trunc returm field will be nullable.. if #19511 goes through it should fix this issue
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I don't see #19511 landing anytime soon so we might need to fix this in the DF date_trunc to ensure consistency here
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. done |
||
| vec![fmt_expr, ts_expr], | ||
| ), | ||
| ))) | ||
| } | ||
| } | ||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -18,26 +18,32 @@ | |
| pub mod date_add; | ||
| pub mod date_part; | ||
| pub mod date_sub; | ||
| pub mod date_trunc; | ||
| pub mod extract; | ||
| pub mod last_day; | ||
| pub mod make_dt_interval; | ||
| pub mod make_interval; | ||
| pub mod next_day; | ||
| pub mod time_trunc; | ||
| pub mod trunc; | ||
|
|
||
| use datafusion_expr::ScalarUDF; | ||
| use datafusion_functions::make_udf_function; | ||
| use std::sync::Arc; | ||
|
|
||
| make_udf_function!(date_add::SparkDateAdd, date_add); | ||
| make_udf_function!(date_part::SparkDatePart, date_part); | ||
| make_udf_function!(date_sub::SparkDateSub, date_sub); | ||
| make_udf_function!(date_trunc::SparkDateTrunc, date_trunc); | ||
| make_udf_function!(extract::SparkHour, hour); | ||
| make_udf_function!(extract::SparkMinute, minute); | ||
| make_udf_function!(extract::SparkSecond, second); | ||
| make_udf_function!(last_day::SparkLastDay, last_day); | ||
| make_udf_function!(make_dt_interval::SparkMakeDtInterval, make_dt_interval); | ||
| make_udf_function!(make_interval::SparkMakeInterval, make_interval); | ||
| make_udf_function!(next_day::SparkNextDay, next_day); | ||
| make_udf_function!(date_part::SparkDatePart, date_part); | ||
| make_udf_function!(time_trunc::SparkTimeTrunc, time_trunc); | ||
| make_udf_function!(trunc::SparkTrunc, trunc); | ||
|
|
||
| pub mod expr_fn { | ||
| use datafusion_functions::export_functions; | ||
|
|
@@ -85,24 +91,43 @@ pub mod expr_fn { | |
| "Returns the first date which is later than start_date and named as indicated. The function returns NULL if at least one of the input parameters is NULL.", | ||
| arg1 arg2 | ||
| )); | ||
| export_functions!(( | ||
| date_trunc, | ||
| "Truncates a timestamp `ts` to the unit specified by the format `fmt`.", | ||
| fmt ts | ||
| )); | ||
| export_functions!(( | ||
| time_trunc, | ||
| "Truncates a time `t` to the unit specified by the format `fmt`.", | ||
| fmt t | ||
| )); | ||
| export_functions!(( | ||
| trunc, | ||
| "Truncates a date `dt` to the unit specified by the format `fmt`.", | ||
| dt fmt | ||
| )); | ||
| export_functions!(( | ||
| date_part, | ||
| "Extracts a part of the date or time from a date, time, or timestamp expression.", | ||
| arg1 arg2 | ||
|
|
||
| )); | ||
| } | ||
|
|
||
| pub fn functions() -> Vec<Arc<ScalarUDF>> { | ||
| vec![ | ||
|
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. changes are because i sorted alphabetically |
||
| date_add(), | ||
| date_part(), | ||
| date_sub(), | ||
| date_trunc(), | ||
| hour(), | ||
| minute(), | ||
| second(), | ||
| last_day(), | ||
| make_dt_interval(), | ||
| make_interval(), | ||
| minute(), | ||
| next_day(), | ||
| date_part(), | ||
| second(), | ||
| time_trunc(), | ||
| trunc(), | ||
| ] | ||
| } | ||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This seems like a bug
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
datafusion/datafusion/catalog/src/information_schema.rs
Line 424 in 3ea21aa
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Raised
return_field_from_args#19870