fix compilation error

apache · Jun 21, 2019 · bc25c0d · bc25c0d
1 parent 37f47ef
commit bc25c0d
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/encoders/RowEncoder.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/encoders/RowEncoder.scala
@@ -114,7 +114,7 @@ object RowEncoder {
         d,
         "fromDecimal",
         inputObject :: Nil,
-        returnNullable = false), d)
+        returnNullable = false), d, SQLConf.get.decimalOperationsNullOnOverflow)
 
     case StringType => createSerializerForString(inputObject)
 

diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/internal/SQLConf.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/internal/SQLConf.scala
@@ -1446,8 +1446,8 @@ object SQLConf {
       .internal()
       .doc("When true (default), if an overflow on a decimal occurs, then NULL is returned. " +
         "Spark's older versions and Hive behave in this way. If turned to false, SQL ANSI 2011 " +
-        "specification will be followed instead: an arithmetic is thrown, as most of the SQL " +
-        "databases do.")
+        "specification will be followed instead: an arithmetic exception is thrown, as most " +
+        "of the SQL databases do.")
       .booleanConf
       .createWithDefault(true)
 

diff --git a/...yst/src/test/scala/org/apache/spark/sql/catalyst/expressions/DecimalExpressionSuite.scala b/...yst/src/test/scala/org/apache/spark/sql/catalyst/expressions/DecimalExpressionSuite.scala
@@ -50,7 +50,7 @@ class DecimalExpressionSuite extends SparkFunSuite with ExpressionEvalHelper {
     checkEvaluation(CheckOverflow(Literal(d1), DecimalType(4, 2), true), d1)
     checkEvaluation(CheckOverflow(Literal(d1), DecimalType(4, 3), true), null)
     intercept[ArithmeticException](CheckOverflow(Literal(d1), DecimalType(4, 3), false).eval())
-    intercept[ArithmeticException](checkEvaluationWithGeneratedMutableProjection(
+    intercept[ArithmeticException](checkEvaluationWithMutableProjection(
       CheckOverflow(Literal(d1), DecimalType(4, 3), false), null))
 
     val d2 = Decimal(101, 3, 1)
@@ -59,7 +59,7 @@ class DecimalExpressionSuite extends SparkFunSuite with ExpressionEvalHelper {
     checkEvaluation(CheckOverflow(Literal(d2), DecimalType(4, 2), true), d2)
     checkEvaluation(CheckOverflow(Literal(d2), DecimalType(4, 3), true), null)
     intercept[ArithmeticException](CheckOverflow(Literal(d2), DecimalType(4, 3), false).eval())
-    intercept[ArithmeticException](checkEvaluationWithGeneratedMutableProjection(
+    intercept[ArithmeticException](checkEvaluationWithMutableProjection(
       CheckOverflow(Literal(d2), DecimalType(4, 3), false), null))
 
     checkEvaluation(CheckOverflow(