DRILL-6401: Precision for decimal data types may be lost for the case…

… when cast with literal is used close #1254
apache · May 11, 2018 · 16659ab · 16659ab
1 parent 11036c5
commit 16659ab
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 8 deletions.
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillOptiq.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillOptiq.java
@@ -550,7 +550,9 @@ public LogicalExpression visitLiteral(RexLiteral literal) {
                     literal.getType().getScale(),
                     literal.getType().getPrecision()));
           }
-          return ValueExpressions.getVarDecimal((BigDecimal) literal.getValue());
+          return ValueExpressions.getVarDecimal((BigDecimal) literal.getValue(),
+              literal.getType().getPrecision(),
+              literal.getType().getScale());
         }
         double dbl = ((BigDecimal) literal.getValue()).doubleValue();
         logger.warn("Converting exact decimal into approximate decimal.\n" +

diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/ParquetFilterBuilder.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/ParquetFilterBuilder.java
@@ -181,7 +181,9 @@ private LogicalExpression getValueExpressionFromConst(ValueHolder holder, TypePr
       VarDecimalHolder decimalHolder = (VarDecimalHolder) holder;
       return ValueExpressions.getVarDecimal(
           DecimalUtility.getBigDecimalFromDrillBuf(decimalHolder.buffer,
-              decimalHolder.start, decimalHolder.end - decimalHolder.start, decimalHolder.scale));
+              decimalHolder.start, decimalHolder.end - decimalHolder.start, decimalHolder.scale),
+          decimalHolder.precision,
+          decimalHolder.scale);
     case DATE:
       return ValueExpressions.getDate(((DateHolder) holder).value);
     case TIMESTAMP:

diff --git a/logical/src/main/java/org/apache/drill/common/expression/ValueExpressions.java b/logical/src/main/java/org/apache/drill/common/expression/ValueExpressions.java
@@ -110,8 +110,8 @@ public static LogicalExpression getDecimal38(BigDecimal i) {
       return new Decimal38Expression(i, ExpressionPosition.UNKNOWN);
   }
 
-  public static LogicalExpression getVarDecimal(BigDecimal i) {
-    return new VarDecimalExpression(i, ExpressionPosition.UNKNOWN);
+  public static LogicalExpression getVarDecimal(BigDecimal input, int precision, int scale) {
+    return new VarDecimalExpression(input, precision, scale, ExpressionPosition.UNKNOWN);
   }
 
   public static LogicalExpression getNumericExpression(String sign, String s, ExpressionPosition ep) {
@@ -403,11 +403,15 @@ public Iterator<LogicalExpression> iterator() {
 
   public static class VarDecimalExpression extends LogicalExpressionBase {
 
-    private BigDecimal bigDecimal;
+    private final BigDecimal bigDecimal;
+    private final int precision;
+    private final int scale;
 
-    public VarDecimalExpression(BigDecimal input, ExpressionPosition pos) {
+    public VarDecimalExpression(BigDecimal input, int precision, int scale, ExpressionPosition pos) {
       super(pos);
       this.bigDecimal = input;
+      this.precision = precision;
+      this.scale = scale;
     }
 
     public BigDecimal getBigDecimal() {
@@ -419,8 +423,8 @@ public MajorType getMajorType() {
       return MajorType
           .newBuilder()
           .setMinorType(MinorType.VARDECIMAL)
-          .setScale(bigDecimal.scale())
-          .setPrecision(bigDecimal.precision())
+          .setScale(scale)
+          .setPrecision(precision)
           .setMode(DataMode.REQUIRED)
           .build();
     }