Fixed Unit Tests

Author: cgivre

exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/conversion/DrillRexBuilder.java

@@ -59,19 +59,11 @@ public RexNode ensureType(
    * {@link RexLiteral} if {@code matchNullability} is false.
    *
    * @param type             Type to cast to
-   * @param exp              Expression being cast
-   * @param matchNullability Whether to ensure the result has the same
-   *                         nullability as {@code type}
+   * @param exp              Expression being castnullability as {@code type}
    * @return Call to CAST operator
    */
   @Override
-  public RexNode makeCast(RelDataType type, RexNode exp, boolean matchNullability) {
-    if (matchNullability) {
-      return makeAbstractCast(type, exp);
-    }
-    // for the case when BigDecimal literal has a scale or precision
-    // that differs from the value from specified RelDataType, cast cannot be removed
-    // TODO: remove this code when CALCITE-1468 is fixed
+  public RexNode makeCast(RelDataType type, RexNode exp) {
     if (type.getSqlTypeName() == SqlTypeName.DECIMAL && exp instanceof RexLiteral) {
       int precision = type.getPrecision();
       int scale = type.getScale();
@@ -85,7 +77,7 @@ public RexNode makeCast(RelDataType type, RexNode exp, boolean matchNullability)
         }
       }
     }
-    return super.makeCast(type, exp, false);
+    return super.makeCast(type, exp);
   }
 
   private void validatePrecisionAndScale(int precision, int scale) {

exec/java-exec/src/test/java/org/apache/drill/exec/fn/impl/TestCastFunctions.java

@@ -21,6 +21,7 @@
 import com.google.common.collect.Maps;
 import org.apache.drill.categories.SqlFunctionTest;
 import org.apache.drill.categories.UnlikelyTest;
+import org.apache.drill.common.exceptions.UserException;
 import org.apache.drill.common.exceptions.UserRemoteException;
 import org.apache.drill.common.types.TypeProtos;
 import org.apache.drill.common.types.Types;
@@ -41,6 +42,7 @@
 import org.junit.rules.ExpectedException;
 
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.LocalTime;
@@ -620,7 +622,7 @@ public void testCastDecimalLiteral() throws Exception {
         .sqlQuery(query)
         .ordered()
         .baselineColumns("c1")
-        .baselineValues(new BigDecimal("100.00"))
+        .baselineValues(new BigDecimal("100.00").setScale(2, RoundingMode.HALF_UP))
         .go();
   }
 
@@ -638,8 +640,8 @@ public void testCastDecimalZeroPrecision() throws Exception {
   public void testCastDecimalGreaterScaleThanPrecision() throws Exception {
     String query = "select cast('123.0' as decimal(3, 5))";
 
-    thrown.expect(UserRemoteException.class);
-    thrown.expectMessage(containsString("VALIDATION ERROR: Expected scale less than or equal to precision, but was scale 5 and precision 3."));
+    thrown.expect(UserException.class);
+    thrown.expectMessage(containsString("VALIDATION ERROR: Expected scale less than or equal to precision, but was precision 3 and scale 5."));
 
     run(query);
   }

exec/vector/src/main/java/org/apache/drill/exec/util/DecimalUtility.java

@@ -451,4 +451,22 @@ public static void checkValueOverflow(BigDecimal value, int desiredPrecision, in
           .build(logger);
     }
   }
+
+  /**
+   * Ensures that a BigDecimal value conforms to the specified precision and scale.
+   *
+   * @param value the BigDecimal to be adjusted
+   * @param precision the desired precision
+   * @param scale the desired scale
+   * @return the adjusted BigDecimal value
+   */
+  public static BigDecimal enforcePrecisionAndScale(BigDecimal value, int precision, int scale) {
+    // Log values being checked
+    logger.debug("Adjusting value: {}, desired precision: {}, desired scale: {}", value, precision, scale);
+    if (value.precision() > precision) {
+      throw new IllegalArgumentException("Precision overflow: value = " + value);
+    }
+    return value.setScale(scale, RoundingMode.HALF_UP);
+  }
+
 }