-
Notifications
You must be signed in to change notification settings - Fork 303
Fix legacy ORC timestamp rebasing [databricks] #15935
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
Open
wjxiz1992
wants to merge
5
commits into
NVIDIA:main
Choose a base branch
from
wjxiz1992:codex/fix-orc-legacy-timestamp-read-15471-v2
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
cc1d101
Fix legacy ORC timestamp rebasing
wjxiz1992 58833a3
Move legacy ORC regression coverage to integration tests
wjxiz1992 8a6c316
Address ORC rebase retry review feedback
wjxiz1992 7425160
Cover legacy ORC timezone rebasing boundaries
wjxiz1992 de169e5
Move legacy ORC timestamp coverage to integration tests
wjxiz1992 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
164 changes: 164 additions & 0 deletions
164
sql-plugin/src/main/scala/com/nvidia/spark/rapids/GpuTimestampRebaseUtils.scala
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,164 @@ | ||
| /* | ||
| * Copyright (c) 2026, NVIDIA CORPORATION. | ||
| * | ||
| * Licensed 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. | ||
| */ | ||
|
|
||
| package com.nvidia.spark.rapids | ||
|
|
||
| import ai.rapids.cudf.{BinaryOp, ColumnVector, ColumnView, DType} | ||
| import ai.rapids.cudf.{HostColumnVector, OrderByArg, Table} | ||
| import com.nvidia.spark.rapids.Arm.{closeOnExcept, withResource} | ||
|
|
||
| import org.apache.spark.sql.rapids.RebaseDateTimeBridge | ||
|
|
||
| private[rapids] object GpuTimestampRebaseUtils { | ||
|
|
||
| private def retainOrCopy(input: ColumnView): ColumnVector = input match { | ||
| case columnVector: ColumnVector => columnVector.incRefCount() | ||
| case _ => input.copyToColumnVector() | ||
| } | ||
|
|
||
| private def isModernOrAllNull(input: ColumnView): Boolean = { | ||
| withResource(input.min()) { minValue => | ||
| !minValue.isValid || minValue.getLong >= RebaseDateTimeBridge.lastSwitchJulianTs | ||
| } | ||
| } | ||
|
|
||
| final class JulianToGregorianMicrosContext( | ||
| timeZoneId: String, | ||
| switches: Option[Table], | ||
| paddedDiffs: Option[Table]) extends AutoCloseable { | ||
|
|
||
| private def rebaseOnHost(input: ColumnView): ColumnVector = { | ||
| val rowCount = input.getRowCount.toInt | ||
| withResource(input.copyToHost()) { hostInput => | ||
| withResource(HostColumnVector.builder(DType.TIMESTAMP_MICROSECONDS, rowCount)) { builder => | ||
| var row = 0 | ||
| while (row < rowCount) { | ||
| if (hostInput.isNull(row)) { | ||
| builder.appendNull() | ||
| } else { | ||
| builder.append(RebaseDateTimeBridge.rebaseJulianToGregorianMicros( | ||
| timeZoneId, hostInput.getLong(row))) | ||
| } | ||
| row += 1 | ||
| } | ||
| withResource(builder.build()) { hostOutput => | ||
| hostOutput.copyToDevice() | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| private def rebaseWithSearchColumn( | ||
| input: ColumnView, | ||
| searchColumn: ColumnVector): ColumnVector = { | ||
| withResource(new Table(searchColumn)) { searchTable => | ||
| withResource(switches.get.upperBound(searchTable, OrderByArg.asc(0, false))) { indices => | ||
| val hasBeforeFirstSwitch = withResource(indices.min()) { minIndex => | ||
| minIndex.isValid && minIndex.getInt == 0 | ||
| } | ||
| if (hasBeforeFirstSwitch) { | ||
| // Spark's precomputed maps intentionally stop at the Common Era boundary. Preserve | ||
| // exact Spark semantics for rarer BCE data by using its Calendar-based slow path. | ||
| rebaseOnHost(input) | ||
| } else { | ||
| withResource(paddedDiffs.get.gather(indices)) { gatheredDiffs => | ||
| input.binaryOp( | ||
| BinaryOp.ADD, gatheredDiffs.getColumn(0), DType.TIMESTAMP_MICROSECONDS) | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| def rebase(input: ColumnView): ColumnVector = { | ||
| require(input.getType == DType.TIMESTAMP_MICROSECONDS, | ||
| s"expected TIMESTAMP_MICROSECONDS but found ${input.getType}") | ||
| if (input.getRowCount == 0 || isModernOrAllNull(input)) { | ||
| retainOrCopy(input) | ||
| } else if (switches.isEmpty) { | ||
| // Spark's bundled map can lag valid IDs added by newer JDK timezone databases. | ||
| rebaseOnHost(input) | ||
| } else { | ||
| input match { | ||
| case columnVector: ColumnVector => | ||
| rebaseWithSearchColumn(input, columnVector) | ||
| case _ => | ||
| withResource(input.copyToColumnVector()) { searchColumn => | ||
| rebaseWithSearchColumn(input, searchColumn) | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| override def close(): Unit = { | ||
| try { | ||
| switches.foreach(_.close()) | ||
| } finally { | ||
| paddedDiffs.foreach(_.close()) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| final class LazyJulianToGregorianMicrosContext(timeZoneId: String) extends AutoCloseable { | ||
| private var delegate: JulianToGregorianMicrosContext = _ | ||
|
|
||
| def rebase(input: ColumnView): ColumnVector = { | ||
| require(input.getType == DType.TIMESTAMP_MICROSECONDS, | ||
| s"expected TIMESTAMP_MICROSECONDS but found ${input.getType}") | ||
| if (input.getRowCount == 0 || isModernOrAllNull(input)) { | ||
| retainOrCopy(input) | ||
| } else { | ||
| if (delegate == null) { | ||
| delegate = createJulianToGregorianMicrosContext(timeZoneId) | ||
| } | ||
| delegate.rebase(input) | ||
| } | ||
|
Comment on lines
+130
to
+134
Collaborator
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. Updated. |
||
| } | ||
|
|
||
| override def close(): Unit = if (delegate != null) { | ||
| delegate.close() | ||
| delegate = null | ||
| } | ||
| } | ||
|
|
||
| def createJulianToGregorianMicrosContext( | ||
| timeZoneId: String): JulianToGregorianMicrosContext = { | ||
| RebaseDateTimeBridge.getJulianToGregorianMicros(timeZoneId).map { info => | ||
| require(info.switches.nonEmpty, s"empty Spark timestamp rebase map for '$timeZoneId'") | ||
| require(info.switches.length == info.diffs.length, | ||
| s"invalid Spark timestamp rebase map for '$timeZoneId'") | ||
|
|
||
| val switchTable = withResource( | ||
| ColumnVector.timestampMicroSecondsFromLongs(info.switches: _*)) { switchColumn => | ||
| new Table(switchColumn) | ||
| } | ||
| closeOnExcept(switchTable) { _ => | ||
| // upperBound returns 0 before the first switch and k + 1 at switch k. The leading | ||
| // sentinel aligns every valid upper-bound index directly with its Spark rebase diff. | ||
| val padded = new Array[Long](info.diffs.length + 1) | ||
| System.arraycopy(info.diffs, 0, padded, 1, info.diffs.length) | ||
| val diffTable = withResource( | ||
| ColumnVector.durationMicroSecondsFromLongs(padded: _*)) { diffColumn => | ||
| new Table(diffColumn) | ||
| } | ||
| new JulianToGregorianMicrosContext( | ||
| timeZoneId, Some(switchTable), Some(diffTable)) | ||
| } | ||
| }.getOrElse { | ||
| new JulianToGregorianMicrosContext(timeZoneId, None, None) | ||
| } | ||
| } | ||
| } | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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.
Updated.