fix

Author: gengliangwang

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

@@ -537,7 +537,7 @@ case class Cast(child: Expression, dataType: DataType, timeZoneId: Option[String
         if (longValue == longValue.toShort) {
           longValue.toShort
         } else {
-          throw new ArithmeticException(s"Casting $t to short causes overflow.")
+          throw new ArithmeticException(s"Casting $t to short causes overflow")
         }
       })
     case TimestampType =>
@@ -548,12 +548,12 @@ case class Cast(child: Expression, dataType: DataType, timeZoneId: Option[String
           x.exactNumeric.asInstanceOf[Numeric[Any]].toInt(b)
         } catch {
           case _: ArithmeticException =>
-            throw new ArithmeticException(s"Casting $b to short causes overflow.")
+            throw new ArithmeticException(s"Casting $b to short causes overflow")
         }
         if (intValue == intValue.toShort) {
           intValue.toShort
         } else {
-          throw new ArithmeticException(s"Casting $b to short causes overflow.")
+          throw new ArithmeticException(s"Casting $b to short causes overflow")
         }
     case x: NumericType =>
       b => x.numeric.asInstanceOf[Numeric[Any]].toInt(b).toShort
@@ -578,7 +578,7 @@ case class Cast(child: Expression, dataType: DataType, timeZoneId: Option[String
         if (longValue == longValue.toByte) {
           longValue.toByte
         } else {
-          throw new ArithmeticException(s"Casting $t to byte causes overflow.")
+          throw new ArithmeticException(s"Casting $t to byte causes overflow")
         }
       })
     case TimestampType =>
@@ -589,12 +589,12 @@ case class Cast(child: Expression, dataType: DataType, timeZoneId: Option[String
           x.exactNumeric.asInstanceOf[Numeric[Any]].toInt(b)
         } catch {
           case _: ArithmeticException =>
-            throw new ArithmeticException(s"Casting $b to byte causes overflow.")
+            throw new ArithmeticException(s"Casting $b to byte causes overflow")
         }
         if (intValue == intValue.toByte) {
           intValue.toByte
         } else {
-          throw new ArithmeticException(s"Casting $b to byte causes overflow.")
+          throw new ArithmeticException(s"Casting $b to byte causes overflow")
         }
     case x: NumericType =>
       b => x.numeric.asInstanceOf[Numeric[Any]].toInt(b).toByte

sql/catalyst/src/main/scala/org/apache/spark/sql/types/Decimal.scala

@@ -239,7 +239,7 @@ final class Decimal extends Ordered[Decimal] with Serializable {
   def toByte: Byte = toLong.toByte
 
   private def overflowException(dataType: String) =
-    throw new ArithmeticException(s"Casting $this to $dataType causes overflow.")
+    throw new ArithmeticException(s"Casting $this to $dataType causes overflow")
 
   /**
    * @return the Byte value that is equal to the rounded decimal.

sql/catalyst/src/main/scala/org/apache/spark/sql/types/numerics.scala

@@ -114,13 +114,13 @@ object LongExactNumeric extends LongIsIntegral with Ordering.LongOrdering {
     if (x == x.toInt) {
       x.toInt
     } else {
-      throw new ArithmeticException(s"Casting $x to int causes overflow.")
+      throw new ArithmeticException(s"Casting $x to int causes overflow")
     }
 }
 
 object FloatExactNumeric extends FloatIsFractional with Ordering.FloatOrdering {
   private def overflowException(x: Float, dataType: String) =
-    throw new ArithmeticException(s"Casting $x to $dataType causes overflow.")
+    throw new ArithmeticException(s"Casting $x to $dataType causes overflow")
 
   private val intUpperBound = Int.MaxValue.toFloat
   private val intLowerBound = Int.MinValue.toFloat
@@ -152,7 +152,7 @@ object FloatExactNumeric extends FloatIsFractional with Ordering.FloatOrdering {
 
 object DoubleExactNumeric extends DoubleIsFractional with Ordering.DoubleOrdering {
   private def overflowException(x: Double, dataType: String) =
-    throw new ArithmeticException(s"Casting $x to $dataType causes overflow.")
+    throw new ArithmeticException(s"Casting $x to $dataType causes overflow")
 
   private val intUpperBound = Int.MaxValue.toDouble
   private val intLowerBound = Int.MinValue.toDouble

sql/core/src/test/resources/sql-tests/results/pgSQL/float4.sql.out

@@ -337,7 +337,7 @@ SELECT int(float('-2147483900'))
 struct<>
 -- !query 37 output
 java.lang.ArithmeticException
-Casting -2.1474839E9 to int causes overflow.
+Casting -2.1474839E9 to int causes overflow
 
 
 -- !query 38
@@ -370,7 +370,7 @@ SELECT bigint(float('-9223380000000000000'))
 struct<>
 -- !query 41 output
 java.lang.ArithmeticException
-Casting -9.22338E18 to int causes overflow.
+Casting -9.22338E18 to int causes overflow
 
 
 -- !query 42

sql/core/src/test/resources/sql-tests/results/pgSQL/float8.sql.out

@@ -829,7 +829,7 @@ SELECT bigint(double('-9223372036854780000'))
 struct<>
 -- !query 93 output
 java.lang.ArithmeticException
-Casting -9.22337203685478E18 to long causes overflow.
+Casting -9.22337203685478E18 to long causes overflow
 
 
 -- !query 94

sql/core/src/test/resources/sql-tests/results/pgSQL/int8.sql.out

@@ -658,7 +658,7 @@ SELECT CAST(double('922337203685477580700.0') AS bigint)
 struct<>
 -- !query 66 output
 java.lang.ArithmeticException
-Casting 9.223372036854776E20 to long causes overflow.
+Casting 9.223372036854776E20 to long causes overflow
 
 
 -- !query 67
@@ -725,7 +725,7 @@ SELECT string(int(shiftleft(bigint(-1), 63))+1)
 struct<>
 -- !query 72 output
 java.lang.ArithmeticException
-Casting -9223372036854775808 to int causes overflow.
+Casting -9223372036854775808 to int causes overflow
 
 
 -- !query 73

sql/core/src/test/scala/org/apache/spark/sql/SQLQueryTestSuite.scala

@@ -29,6 +29,7 @@ import org.apache.spark.sql.catalyst.plans.logical.sql.{DescribeColumnStatement,
 import org.apache.spark.sql.catalyst.rules.RuleExecutor
 import org.apache.spark.sql.catalyst.util.{fileToString, stringToFile}
 import org.apache.spark.sql.execution.HiveResult.hiveResultString
+import org.apache.spark.sql.execution.SQLExecution
 import org.apache.spark.sql.execution.command.{DescribeColumnCommand, DescribeCommandBase}
 import org.apache.spark.sql.internal.SQLConf
 import org.apache.spark.sql.test.SharedSparkSession
@@ -403,7 +404,10 @@ class SQLQueryTestSuite extends QueryTest with SharedSparkSession {
       val df = session.sql(sql)
       val schema = df.schema
       // Get answer, but also get rid of the #1234 expression ids that show up in explain plans
-      val answer = hiveResultString(df.queryExecution.executedPlan).map(replaceNotIncludedMsg)
+      val answer =
+        SQLExecution.withNewExecutionId(session, df.queryExecution, Some(sql)) {
+          hiveResultString(df.queryExecution.executedPlan).map(replaceNotIncludedMsg)
+        }
 
       // If the output is not pre-sorted, sort it.
       if (isSorted(df.queryExecution.analyzed)) (schema, answer) else (schema, answer.sorted)