Skip to content

[SQL][SPARK-50318] Add IntervalUtils.makeYearMonthInterval to deduplicate code between interpreted and codegen #48848

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

Closed
gotocoding-DB wants to merge 1 commit into from
Closed

[SQL][SPARK-50318] Add IntervalUtils.makeYearMonthInterval to deduplicate code between interpreted and codegen #48848

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
23 changes: 4 additions & 19 deletions ...talyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/intervalExpressions.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ import com.google.common.math.{DoubleMath, IntMath, LongMath}

import org.apache.spark.QueryContext
import org.apache.spark.sql.catalyst.expressions.codegen.{CodegenContext, CodeGenerator, ExprCode}
import org.apache.spark.sql.catalyst.util.DateTimeConstants.MONTHS_PER_YEAR
import org.apache.spark.sql.catalyst.util.IntervalUtils
import org.apache.spark.sql.catalyst.util.IntervalUtils._
import org.apache.spark.sql.errors.{QueryCompilationErrors, QueryExecutionErrors}
Expand Down Expand Up @@ -572,28 +571,14 @@ case class MakeYMInterval(years: Expression, months: Expression)
override def dataType: DataType = YearMonthIntervalType()

override def nullSafeEval(year: Any, month: Any): Any = {
try {
Math.toIntExact(
Math.addExact(month.asInstanceOf[Int],
Math.multiplyExact(year.asInstanceOf[Int], MONTHS_PER_YEAR)))
} catch {
case _: ArithmeticException =>
throw QueryExecutionErrors.withoutSuggestionIntervalArithmeticOverflowError(origin.context)
}
makeYearMonthInterval(year.asInstanceOf[Int], month.asInstanceOf[Int], origin.context)
}

override def doGenCode(ctx: CodegenContext, ev: ExprCode): ExprCode = {
nullSafeCodeGen(ctx, ev, (years, months) => {
val math = classOf[Math].getName.stripSuffix("$")
defineCodeGen(ctx, ev, (years, months) => {
val errorContext = getContextOrNullCode(ctx)
// scalastyle:off line.size.limit
s"""
|try {
| ${ev.value} = $math.toIntExact($math.addExact($months, $math.multiplyExact($years, $MONTHS_PER_YEAR)));
|} catch (java.lang.ArithmeticException e) {
| throw QueryExecutionErrors.withoutSuggestionIntervalArithmeticOverflowError($errorContext);
|}""".stripMargin
// scalastyle:on line.size.limit
val iu = IntervalUtils.getClass.getName.stripSuffix("$")
s"$iu.makeYearMonthInterval($years, $months, $errorContext)"
})
}

Expand Down
9 changes: 9 additions & 0 deletions sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/util/IntervalUtils.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -797,6 +797,15 @@ object IntervalUtils extends SparkIntervalUtils {
}
}

def makeYearMonthInterval(year: Int, month: Int, context: QueryContext): Int = {
try {
Math.toIntExact(Math.addExact(month, Math.multiplyExact(year, MONTHS_PER_YEAR)))
} catch {
case _: ArithmeticException =>
throw QueryExecutionErrors.withoutSuggestionIntervalArithmeticOverflowError(context)
}
}

def intToYearMonthInterval(v: Int, startField: Byte, endField: Byte): Int = {
endField match {
case YEAR =>
Expand Down