-
Notifications
You must be signed in to change notification settings - Fork 2.1k
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 2 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,131 @@ | ||
| // 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}; | ||
| use datafusion_expr::expr::ScalarFunction; | ||
| use datafusion_expr::simplify::{ExprSimplifyResult, SimplifyContext}; | ||
| use datafusion_expr::{ | ||
| Coercion, ColumnarValue, Expr, ReturnFieldArgs, ScalarFunctionArgs, ScalarUDFImpl, | ||
| Signature, TypeSignatureClass, Volatility, | ||
| }; | ||
|
|
||
| /// Spark date_trunc supports extra format aliases. | ||
| /// <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 internal_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.
|
||
| other => other, | ||
| }; | ||
|
|
||
| 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 | ||||
|---|---|---|---|---|---|---|
| @@ -0,0 +1,122 @@ | ||||||
| // 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}; | ||||||
| use datafusion_common::types::logical_string; | ||||||
| use datafusion_common::{Result, ScalarValue, internal_err}; | ||||||
| use datafusion_expr::expr::ScalarFunction; | ||||||
| use datafusion_expr::simplify::{ExprSimplifyResult, SimplifyContext}; | ||||||
| use datafusion_expr::{ | ||||||
| Coercion, ColumnarValue, Expr, ReturnFieldArgs, ScalarFunctionArgs, ScalarUDFImpl, | ||||||
| Signature, TypeSignatureClass, Volatility, | ||||||
| }; | ||||||
|
|
||||||
| /// Spark time_trunc function only handles time inputs. | ||||||
| /// <https://spark.apache.org/docs/latest/api/sql/index.html#time_trunc> | ||||||
| #[derive(Debug, PartialEq, Eq, Hash)] | ||||||
| pub struct SparkTimeTrunc { | ||||||
| signature: Signature, | ||||||
| } | ||||||
|
|
||||||
| impl Default for SparkTimeTrunc { | ||||||
| fn default() -> Self { | ||||||
| Self::new() | ||||||
| } | ||||||
| } | ||||||
|
|
||||||
| impl SparkTimeTrunc { | ||||||
| pub fn new() -> Self { | ||||||
| Self { | ||||||
| signature: Signature::coercible( | ||||||
| vec![ | ||||||
| Coercion::new_exact(TypeSignatureClass::Native(logical_string())), | ||||||
| Coercion::new_exact(TypeSignatureClass::Time), | ||||||
| ], | ||||||
| Volatility::Immutable, | ||||||
| ), | ||||||
| } | ||||||
| } | ||||||
| } | ||||||
|
|
||||||
| impl ScalarUDFImpl for SparkTimeTrunc { | ||||||
| fn as_any(&self) -> &dyn Any { | ||||||
| self | ||||||
| } | ||||||
|
|
||||||
| fn name(&self) -> &str { | ||||||
| "time_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 time_trunc should have been simplified to standard date_trunc" | ||||||
| ) | ||||||
| } | ||||||
|
|
||||||
| fn simplify( | ||||||
| &self, | ||||||
| args: Vec<Expr>, | ||||||
| _info: &SimplifyContext, | ||||||
| ) -> Result<ExprSimplifyResult> { | ||||||
| let fmt_expr = &args[0]; | ||||||
|
Member
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.
Suggested change
|
||||||
|
|
||||||
| 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 internal_err!( | ||||||
| "First argument of `TIME_TRUNC` must be non-null scalar Utf8" | ||||||
| ); | ||||||
| } | ||||||
| }; | ||||||
|
|
||||||
| if !matches!( | ||||||
| fmt.as_str(), | ||||||
| "hour" | "minute" | "second" | "millisecond" | "microsecond" | ||||||
| ) { | ||||||
| return internal_err!( | ||||||
|
cht42 marked this conversation as resolved.
Outdated
|
||||||
| "The format argument of `TIME_TRUNC` must be one of: hour, minute, second, millisecond, microsecond" | ||||||
| ); | ||||||
| } | ||||||
|
|
||||||
| Ok(ExprSimplifyResult::Simplified(Expr::ScalarFunction( | ||||||
| ScalarFunction::new_udf(datafusion_functions::datetime::date_trunc(), args), | ||||||
|
Member
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.
let fmt_expr = Expr::Literal(ScalarValue::new_utf8(fmt.as_str()), None);
...
ScalarFunction::new_udf(
datafusion_functions::datetime::date_trunc(),
vec![fmt_expr, time_expr],
),
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. shouldn't matter, DF will handle the original argument as well and lowercase it |
||||||
| ))) | ||||||
| } | ||||||
| } | ||||||
Uh oh!
There was an error while loading. Please reload this page.