Skip to content

[SPARK-34677][SQL] Support the +/- operators over ANSI SQL intervals #31789

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
MaxGekk wants to merge 7 commits into from
Closed

[SPARK-34677][SQL] Support the +/- operators over ANSI SQL intervals #31789

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
a5fc2c1
Negate intervals
MaxGekk Mar 9, 2021
5bb4b7c
Support +/-
MaxGekk Mar 9, 2021
18b1db3
Regen expected error message
MaxGekk Mar 9, 2021
0a202f3
Reuse exactMathMethod()
MaxGekk Mar 10, 2021
fc4a76d
Remove 's'
MaxGekk Mar 10, 2021
9a086f3
Move UnaryMinus inside of foreach
MaxGekk Mar 11, 2021
3994b69
sumDF -> addDF
MaxGekk Mar 11, 2021
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
Prev Previous commit
Next Next commit
Reuse exactMathMethod()
  • Loading branch information
@MaxGekk
MaxGekk committed Mar 10, 2021
commit 0a202f3490bbb84e19dc041d0c73ef248304498a
12 changes: 4 additions & 8 deletions sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/arithmetic.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,11 +180,6 @@ abstract class BinaryArithmetic extends BinaryOperator with NullIntolerant {
def calendarIntervalMethod: String =
sys.error("BinaryArithmetics must override either calendarIntervalMethod or genCode")

/** Name of the function for this expression on [[DayTimeIntervalType]] and
* [[YearMonthIntervalType]] types. */
def intervalMethod: String =
sys.error("BinaryArithmetics must override either intervalMethod or genCode")

// Name of the function for the exact version of this expression in [[Math]].
// If the option "spark.sql.ansi.enabled" is enabled and there is corresponding
// function in [[Math]], the exact function will be called instead of evaluation with [[symbol]].
Expand All @@ -198,8 +193,11 @@ abstract class BinaryArithmetic extends BinaryOperator with NullIntolerant {
val iu = IntervalUtils.getClass.getCanonicalName.stripSuffix("$")
defineCodeGen(ctx, ev, (eval1, eval2) => s"$iu.$calendarIntervalMethod($eval1, $eval2)")
case DayTimeIntervalType | YearMonthIntervalType =>
assert(exactMathMethod.isDefined,
s"The expression '$nodeName' must override the exactMathMethod() method " +
s"if it is supposed to operate over interval types.")
val mathClass = classOf[Math].getName
defineCodeGen(ctx, ev, (eval1, eval2) => s"$mathClass.${intervalMethod}($eval1, $eval2)")
defineCodeGen(ctx, ev, (eval1, eval2) => s"$mathClass.${exactMathMethod.get}($eval1, $eval2)")
// byte and short are casted into int when add, minus, times or divide
case ByteType | ShortType =>
nullSafeCodeGen(ctx, ev, (eval1, eval2) => {
Expand Down Expand Up @@ -272,7 +270,6 @@ case class Add(
override def decimalMethod: String = "$plus"

override def calendarIntervalMethod: String = if (failOnError) "addExact" else "add"
override def intervalMethod: String = "addExact"

private lazy val numeric = TypeUtils.getNumeric(dataType, failOnError)

Expand Down Expand Up @@ -316,7 +313,6 @@ case class Subtract(
override def decimalMethod: String = "$minus"

override def calendarIntervalMethod: String = if (failOnError) "subtractExact" else "subtract"
override def intervalMethod: String = "subtractExact"

private lazy val numeric = TypeUtils.getNumeric(dataType, failOnError)

Expand Down