chongguang commented on a change in pull request #30807:
URL: https://github.com/apache/spark/pull/30807#discussion_r549826991
##########
File path:
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/datetimeExpressions.scala
##########
@@ -1170,52 +1175,51 @@ case class LastDay(startDate: Expression)
group = "datetime_funcs",
since = "1.5.0")
// scalastyle:on line.size.limit
-case class NextDay(startDate: Expression, dayOfWeek: Expression)
+case class NextDay(startDate: Expression,
+ dayOfWeek: Expression,
+ failOnError: Boolean = SQLConf.get.ansiEnabled)
extends BinaryExpression with ImplicitCastInputTypes with NullIntolerant {
override def left: Expression = startDate
override def right: Expression = dayOfWeek
+ def this(left: Expression, right: Expression) = this(left, right,
SQLConf.get.ansiEnabled)
+
override def inputTypes: Seq[AbstractDataType] = Seq(DateType, StringType)
override def dataType: DataType = DateType
override def nullable: Boolean = true
override def nullSafeEval(start: Any, dayOfW: Any): Any = {
- val dow =
DateTimeUtils.getDayOfWeekFromString(dayOfW.asInstanceOf[UTF8String])
- if (dow == -1) {
- null
- } else {
+ try {
+ val dow =
DateTimeUtils.getDayOfWeekFromString(dayOfW.asInstanceOf[UTF8String])
val sd = start.asInstanceOf[Int]
DateTimeUtils.getNextDateForDayOfWeek(sd, dow)
+ } catch {
+ case e: IllegalArgumentException => if (failOnError) throw e else null
}
}
override protected def doGenCode(ctx: CodegenContext, ev: ExprCode):
ExprCode = {
nullSafeCodeGen(ctx, ev, (sd, dowS) => {
- val dateTimeUtilClass = DateTimeUtils.getClass.getName.stripSuffix("$")
- val dayOfWeekTerm = ctx.freshName("dayOfWeek")
- if (dayOfWeek.foldable) {
- val input = dayOfWeek.eval().asInstanceOf[UTF8String]
- if ((input eq null) || DateTimeUtils.getDayOfWeekFromString(input) ==
-1) {
- s"""
- |${ev.isNull} = true;
- """.stripMargin
- } else {
- val dayOfWeekValue = DateTimeUtils.getDayOfWeekFromString(input)
+ val input = dayOfWeek.eval().asInstanceOf[UTF8String]
Review comment:
good point. That actually failed a unit test. Corrected.
##########
File path:
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/datetimeExpressions.scala
##########
@@ -1170,52 +1175,51 @@ case class LastDay(startDate: Expression)
group = "datetime_funcs",
since = "1.5.0")
// scalastyle:on line.size.limit
-case class NextDay(startDate: Expression, dayOfWeek: Expression)
+case class NextDay(startDate: Expression,
+ dayOfWeek: Expression,
+ failOnError: Boolean = SQLConf.get.ansiEnabled)
extends BinaryExpression with ImplicitCastInputTypes with NullIntolerant {
override def left: Expression = startDate
override def right: Expression = dayOfWeek
+ def this(left: Expression, right: Expression) = this(left, right,
SQLConf.get.ansiEnabled)
+
override def inputTypes: Seq[AbstractDataType] = Seq(DateType, StringType)
override def dataType: DataType = DateType
override def nullable: Boolean = true
override def nullSafeEval(start: Any, dayOfW: Any): Any = {
- val dow =
DateTimeUtils.getDayOfWeekFromString(dayOfW.asInstanceOf[UTF8String])
- if (dow == -1) {
- null
- } else {
+ try {
+ val dow =
DateTimeUtils.getDayOfWeekFromString(dayOfW.asInstanceOf[UTF8String])
val sd = start.asInstanceOf[Int]
DateTimeUtils.getNextDateForDayOfWeek(sd, dow)
+ } catch {
+ case e: IllegalArgumentException => if (failOnError) throw e else null
}
}
override protected def doGenCode(ctx: CodegenContext, ev: ExprCode):
ExprCode = {
nullSafeCodeGen(ctx, ev, (sd, dowS) => {
- val dateTimeUtilClass = DateTimeUtils.getClass.getName.stripSuffix("$")
- val dayOfWeekTerm = ctx.freshName("dayOfWeek")
- if (dayOfWeek.foldable) {
- val input = dayOfWeek.eval().asInstanceOf[UTF8String]
- if ((input eq null) || DateTimeUtils.getDayOfWeekFromString(input) ==
-1) {
- s"""
- |${ev.isNull} = true;
- """.stripMargin
- } else {
- val dayOfWeekValue = DateTimeUtils.getDayOfWeekFromString(input)
+ val input = dayOfWeek.eval().asInstanceOf[UTF8String]
+ (dayOfWeek.foldable, input) match {
+ case (true, null) => s"""${ev.isNull} = true;"""
+ case _ =>
+ val dayOfWeekTerm = ctx.freshName("dayOfWeek")
+ val dateTimeUtilClass =
DateTimeUtils.getClass.getName.stripSuffix("$")
+ val illegalInputBranch = if (failOnError) { s"""throw e;""" } else {
+ s"""${ev.isNull} = true;"""
+ }
s"""
- |${ev.value} = $dateTimeUtilClass.getNextDateForDayOfWeek($sd,
$dayOfWeekValue);
- """.stripMargin
- }
- } else {
- s"""
- |int $dayOfWeekTerm =
$dateTimeUtilClass.getDayOfWeekFromString($dowS);
- |if ($dayOfWeekTerm == -1) {
- | ${ev.isNull} = true;
- |} else {
- | ${ev.value} = $dateTimeUtilClass.getNextDateForDayOfWeek($sd,
$dayOfWeekTerm);
- |}
- """.stripMargin
+ |int $dayOfWeekTerm;
+ |try {
Review comment:
done
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
