Incorporate changes

sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/datetimeExpressions.scala

@@ -1723,7 +1723,7 @@ case class DateAddInterval(
   override def nullSafeEval(start: Any, interval: Any): Any = {
     val itvl = interval.asInstanceOf[CalendarInterval]
     if (ansiEnabled || itvl.microseconds == 0) {
-      DateTimeUtils.dateAddInterval(start.asInstanceOf[Int], itvl, prettyName)
+      DateTimeUtils.dateAddInterval(start.asInstanceOf[Int], itvl)
     } else {
       val startTs = DateTimeUtils.daysToMicros(start.asInstanceOf[Int], zoneId)
       val resultTs = DateTimeUtils.timestampAddInterval(

sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/util/DateTimeUtils.scala

@@ -302,10 +302,9 @@ object DateTimeUtils extends SparkDateTimeUtils {
    */
   def dateAddInterval(
      start: Int,
-     interval: CalendarInterval,
-     funcName: String): Int = {
+     interval: CalendarInterval): Int = {
     if (interval.microseconds != 0) {
-      throw QueryExecutionErrors.invalidIntervalWithMicrosecondsAdditionError(funcName)
+      throw QueryExecutionErrors.invalidIntervalWithMicrosecondsAdditionError()
     }
     val ld = daysToLocalDate(start).plusMonths(interval.months).plusDays(interval.days)
     localDateToDays(ld)

sql/catalyst/src/main/scala/org/apache/spark/sql/errors/QueryExecutionErrors.scala

@@ -287,8 +287,7 @@ private[sql] object QueryExecutionErrors extends QueryErrorsBase with ExecutionE
       summary = "")
   }
 
-  def invalidIntervalWithMicrosecondsAdditionError(
-      funcName: String): SparkIllegalArgumentException = {
+  def invalidIntervalWithMicrosecondsAdditionError(): SparkIllegalArgumentException = {
     new SparkIllegalArgumentException(
       errorClass = "INVALID_INTERVAL_WITH_MICROSECONDS_ADDITION",
       messageParameters = Map("ansiConfig" -> toSQLConf(SQLConf.ANSI_ENABLED.key)))

sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/util/DateTimeUtilsSuite.scala

@@ -536,12 +536,12 @@ class DateTimeUtilsSuite extends SparkFunSuite with Matchers with SQLHelper {
 
   test("date add interval with day precision") {
     val input = days(1997, 2, 28)
-    assert(dateAddInterval(input, new CalendarInterval(36, 0, 0), "") === days(2000, 2, 28))
-    assert(dateAddInterval(input, new CalendarInterval(36, 47, 0), "") === days(2000, 4, 15))
-    assert(dateAddInterval(input, new CalendarInterval(-13, 0, 0), "") === days(1996, 1, 28))
+    assert(dateAddInterval(input, new CalendarInterval(36, 0, 0)) === days(2000, 2, 28))
+    assert(dateAddInterval(input, new CalendarInterval(36, 47, 0)) === days(2000, 4, 15))
+    assert(dateAddInterval(input, new CalendarInterval(-13, 0, 0)) === days(1996, 1, 28))
     checkError(
       exception = intercept[SparkIllegalArgumentException](
-        dateAddInterval(input, new CalendarInterval(36, 47, 1), "test")),
+        dateAddInterval(input, new CalendarInterval(36, 47, 1))),
       condition = "INVALID_INTERVAL_WITH_MICROSECONDS_ADDITION",
       parameters = Map("ansiConfig" -> "\"spark.sql.ansi.enabled\""))
   }