Skip to content
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

fix(spark): casting date/time requires timezone #318

Merged
merged 1 commit into from
Dec 19, 2024
Merged

fix(spark): casting date/time requires timezone #318

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
11 changes: 9 additions & 2 deletions spark/src/main/scala/io/substrait/spark/expression/ToSparkExpression.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@ import io.substrait.spark.{DefaultExpressionVisitor, HasOutputStack, SparkExtens
import io.substrait.spark.logical.ToLogicalPlan

import org.apache.spark.sql.catalyst.expressions.{CaseWhen, Cast, Expression, In, Literal, MakeDecimal, NamedExpression, ScalarSubquery}
import org.apache.spark.sql.types.Decimal
import org.apache.spark.sql.internal.SQLConf
import org.apache.spark.sql.types.{DateType, Decimal}
import org.apache.spark.substrait.SparkTypeUtil
import org.apache.spark.unsafe.types.UTF8String

Expand Down Expand Up @@ -153,7 +154,12 @@ class ToSparkExpression(

override def visit(expr: SExpression.Cast): Expression = {
val childExp = expr.input().accept(this)
Cast(childExp, ToSubstraitType.convert(expr.getType))
val tt = ToSubstraitType.convert(expr.getType)
val tz = childExp.dataType match {
case DateType => Some(SQLConf.get.getConf(SQLConf.SESSION_LOCAL_TIMEZONE))
case _ => None
}
Cast(childExp, tt, tz)
}

override def visit(expr: exp.FieldReference): Expression = {
Expand Down Expand Up @@ -197,6 +203,7 @@ class ToSparkExpression(
val list = expr.options().asScala.map(e => e.accept(this))
In(value, list)
}

override def visit(expr: SExpression.ScalarFunctionInvocation): Expression = {
val eArgs = expr.arguments().asScala
val args = eArgs.zipWithIndex.map {
Expand Down
2 changes: 1 addition & 1 deletion spark/src/test/scala/io/substrait/spark/TPCDSPlan.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ class TPCDSPlan extends TPCDSBase with SubstraitPlanTestBase {
"q2", // because round() isn't defined in substrait to work with Decimal. https://github.com/substrait-io/substrait/pull/713
"q9", // requires implementation of named_struct()
"q10", "q35", "q45", // Unsupported join type ExistenceJoin (this is an internal spark type)
"q51", "q83", "q84", // TBD
"q51", "q84", // TBD
"q72" //requires implementation of date_add()
)
// spotless:on
Expand Down
Loading