Skip to content

Enable convert_timezone(timestamp_ntz) native execution in Velox backend. #12979

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
Mariamalmesfer wants to merge 2 commits into
base: main
Choose a base branch
from
+14 −3
Open

Enable convert_timezone(timestamp_ntz) native execution in Velox backend. #12979

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
41b9f50
Enable convert_timezone(timestamp_ntz) native execution in Velox back…
Sep 8, 2026
302a6ac
Pin Velox to dft-2026_09_10 and drop temporary PR #18508 patch override
Sep 10, 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
8 changes: 8 additions & 0 deletions backends-velox/src/test/scala/org/apache/gluten/functions/DateFunctionsValidateSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -615,6 +615,14 @@ class DateFunctionsValidateSuite extends FunctionsValidateSuite {
runQueryAndCompare("select timestampadd(hour, 1, ts) from view") {
checkGlutenPlan[ProjectExecTransformer]
}
// convert_timezone(timestamp_ntz) runs natively; output stays timestamp_ntz.
runQueryAndCompare("select convert_timezone('America/Los_Angeles', ts) from view") {
checkGlutenPlan[ProjectExecTransformer]
}
runQueryAndCompare(
"select convert_timezone('America/Los_Angeles', 'Asia/Shanghai', ts) from view") {
checkGlutenPlan[ProjectExecTransformer]
}

// cast(timestamp_ntz as timestamp)
runQueryAndCompare("select cast(ts as timestamp) from view") {
Expand Down
4 changes: 2 additions & 2 deletions ep/build-velox/src/get-velox.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ set -exu

CURRENT_DIR=$(cd "$(dirname "$BASH_SOURCE")"; pwd)
VELOX_REPO=https://github.com/IBM/velox.git
VELOX_BRANCH=dft-2026_09_08
VELOX_ENHANCED_BRANCH=ibm-2026_09_08
VELOX_BRANCH=dft-2026_09_10
VELOX_ENHANCED_BRANCH=ibm-2026_09_10
VELOX_HOME=""
RUN_SETUP_SCRIPT=ON
ENABLE_ENHANCED_FEATURES=OFF
Expand Down
1 change: 1 addition & 0 deletions gluten-substrait/src/main/scala/org/apache/gluten/expression/ExpressionMappings.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -308,6 +308,7 @@ object ExpressionMappings {
Sig[KnownNullable](KNOWN_NULLABLE),
Sig[TimestampAdd](TIMESTAMP_ADD),
Sig[TimestampDiff](TIMESTAMP_DIFF),
Sig[ConvertTimezone](CONVERT_TIMEZONE),
Sig[RoundFloor](FLOOR),
Sig[RoundCeil](CEIL)
) ++ SparkShimLoader.getSparkShims.scalarExpressionMappings
Expand Down
3 changes: 2 additions & 1 deletion ...-substrait/src/main/scala/org/apache/gluten/extension/columnar/validator/Validators.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import org.apache.gluten.extension.columnar.offload.OffloadSingleNode
import org.apache.gluten.sql.shims.SparkShimLoader

import org.apache.spark.internal.Logging
import org.apache.spark.sql.catalyst.expressions.{Cast, Hour, Minute, Second, TimestampAdd}
import org.apache.spark.sql.catalyst.expressions.{Cast, ConvertTimezone, Hour, Minute, Second, TimestampAdd}
import org.apache.spark.sql.execution._
import org.apache.spark.sql.execution.aggregate.{HashAggregateExec, ObjectHashAggregateExec, SortAggregateExec}
import org.apache.spark.sql.execution.datasources.WriteFilesExec
Expand Down Expand Up @@ -283,6 +283,7 @@ object Validators {
case Minute(child, _) => containsNTZ(child.dataType)
case Second(child, _) => containsNTZ(child.dataType)
case TimestampAdd(_, _, child, _) => containsNTZ(child.dataType)
case ConvertTimezone(_, _, child) => containsNTZ(child.dataType)
case c: Cast if isNTZ(c.dataType) || isNTZ(c.child.dataType) => true
case _ => false
}
Expand Down
1 change: 1 addition & 0 deletions shims/common/src/main/scala/org/apache/gluten/expression/ExpressionNames.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,6 +240,7 @@ object ExpressionNames {
final val MAKE_YM_INTERVAL = "make_ym_interval"
final val TO_UTC_TIMESTAMP = "to_utc_timestamp"
final val FROM_UTC_TIMESTAMP = "from_utc_timestamp"
final val CONVERT_TIMEZONE = "convert_timezone"
final val UNIX_SECONDS = "unix_seconds"
final val UNIX_MILLIS = "unix_millis"
final val UNIX_MICROS = "unix_micros"
Expand Down
Loading