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

Jump to bottom

Minor code cleanup in dateTImeExpressions #1918

Merged
merged 1 commit into from
Mar 12, 2021
Merged

Minor code cleanup in dateTImeExpressions #1918

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
55 changes: 23 additions & 32 deletions sql-plugin/src/main/scala/org/apache/spark/sql/rapids/datetimeExpressions.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,40 +134,32 @@ abstract class GpuTimeMath(

override lazy val resolved: Boolean = childrenResolved && checkInputDataTypes().isSuccess

val microSecondsInOneDay: Long = TimeUnit.DAYS.toMicros(1)

override def columnarEval(batch: ColumnarBatch): Any = {
var lhs: Any = null
var rhs: Any = null
try {
lhs = left.columnarEval(batch)
rhs = right.columnarEval(batch)

(lhs, rhs) match {
case (l: GpuColumnVector, intvl: CalendarInterval) =>
if (intvl.months != 0) {
throw new UnsupportedOperationException("Months aren't supported at the moment")
}
val usToSub = intvl.days.toLong * 24 * 60 * 60 * 1000 * 1000 + intvl.microseconds
if (usToSub != 0) {
withResource(Scalar.fromLong(usToSub)) { us_s =>
withResource(l.getBase.logicalCastTo(DType.INT64)) { us =>
withResource(intervalMath(us_s, us)) { longResult =>
GpuColumnVector.from(longResult.castTo(DType.TIMESTAMP_MICROSECONDS), dataType)
withResourceIfAllowed(left.columnarEval(batch)) { lhs =>
withResourceIfAllowed(right.columnarEval(batch)) { rhs =>
(lhs, rhs) match {
case (l: GpuColumnVector, intvl: CalendarInterval) =>
if (intvl.months != 0) {
throw new UnsupportedOperationException("Months aren't supported at the moment")
}
val usToSub = intvl.days * microSecondsInOneDay + intvl.microseconds
if (usToSub != 0) {
withResource(Scalar.fromLong(usToSub)) { us_s =>
withResource(l.getBase.bitCastTo(DType.INT64)) { us =>
withResource(intervalMath(us_s, us)) { longResult =>
GpuColumnVector.from(longResult.castTo(DType.TIMESTAMP_MICROSECONDS), dataType)
}
}
}
} else {
l.incRefCount()
}
} else {
l.incRefCount()
}
case _ =>
throw new UnsupportedOperationException("GpuTimeSub takes column and interval as an " +
"argument only")
}
} finally {
if (lhs.isInstanceOf[AutoCloseable]) {
lhs.asInstanceOf[AutoCloseable].close()
}
if (rhs.isInstanceOf[AutoCloseable]) {
rhs.asInstanceOf[AutoCloseable].close()
case _ =>
throw new UnsupportedOperationException("GpuTimeSub takes column and interval as an " +
"argument only")
}
}
}
}
Expand Down Expand Up @@ -229,7 +221,6 @@ case class GpuDateAddInterval(start: Expression,
if (intvl.months != 0) {
throw new UnsupportedOperationException("Months aren't supported at the moment")
}
val microSecondsInOneDay = TimeUnit.DAYS.toMicros(1)
val microSecToDays = if (intvl.microseconds < 0) {
// This is to calculate when subtraction is performed. Need to take into account the
// interval( which are less than days). Convert it into days which needs to be
Expand All @@ -241,7 +232,7 @@ case class GpuDateAddInterval(start: Expression,
val daysToAdd = intvl.days + microSecToDays
if (daysToAdd != 0) {
withResource(Scalar.fromInt(daysToAdd)) { us_s =>
withResource(l.getBase.logicalCastTo(DType.INT32)) { us =>
withResource(l.getBase.bitCastTo(DType.INT32)) { us =>
withResource(intervalMath(us_s, us)) { intResult =>
GpuColumnVector.from(intResult.castTo(DType.TIMESTAMP_DAYS), dataType)
}
Expand Down