fix ut failures

apache · Jun 29, 2019 · 4928330 · 4928330
1 parent 90b0fd2
commit 4928330
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/...atalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/decimalExpressions.scala b/...atalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/decimalExpressions.scala
@@ -61,7 +61,6 @@ case class MakeDecimal(child: Expression, precision: Int, scale: Int) extends Un
     } else {
       result.set(longInput, precision, scale)
     }
-    result
   }
 
   override def doGenCode(ctx: CodegenContext, ev: ExprCode): ExprCode = {

diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/types/Decimal.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/types/Decimal.scala
@@ -111,9 +111,10 @@ final class Decimal extends Ordered[Decimal] with Serializable {
    */
   def set(decimal: BigDecimal, precision: Int, scale: Int): Decimal = {
     this.decimalVal = decimal.setScale(scale, ROUND_HALF_UP)
-    require(
-      decimalVal.precision <= precision,
-      s"Decimal precision ${decimalVal.precision} exceeds max precision $precision")
+    if (decimalVal.precision > precision) {
+      throw new ArithmeticException(
+        s"Decimal precision ${decimalVal.precision} exceeds max precision $precision")
+    }
     this.longVal = 0L
     this._precision = precision
     this._scale = scale

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
@@ -49,7 +49,6 @@ class DecimalExpressionSuite extends SparkFunSuite with ExpressionEvalHelper {
       intercept[ArithmeticException](evaluateWithoutCodegen(overflowExpr, null))
       intercept[ArithmeticException](checkEvaluationWithUnsafeProjection(overflowExpr, null))
     }
-
   }
 
   test("PromotePrecision") {