WIP

Author: cgivre

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

@@ -17,12 +17,9 @@
  */
 package org.apache.drill.exec.planner.sql;
 
-import org.apache.calcite.sql.fun.SqlStdOperatorTable;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Lists;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.apache.calcite.avatica.util.TimeUnit;
 import org.apache.calcite.rel.type.RelDataType;
 import org.apache.calcite.rel.type.RelDataTypeFactory;
@@ -35,17 +32,18 @@
 import org.apache.calcite.sql.SqlNode;
 import org.apache.calcite.sql.SqlNumericLiteral;
 import org.apache.calcite.sql.SqlOperatorBinding;
+import org.apache.calcite.sql.fun.SqlStdOperatorTable;
 import org.apache.calcite.sql.parser.SqlParserPos;
 import org.apache.calcite.sql.type.SqlReturnTypeInference;
 import org.apache.calcite.sql.type.SqlTypeFamily;
 import org.apache.calcite.sql.type.SqlTypeName;
-
+import org.apache.calcite.util.NlsString;
+import org.apache.drill.common.exceptions.UserException;
 import org.apache.drill.common.expression.ExpressionPosition;
 import org.apache.drill.common.expression.FunctionCall;
 import org.apache.drill.common.expression.FunctionCallFactory;
 import org.apache.drill.common.expression.LogicalExpression;
 import org.apache.drill.common.expression.MajorTypeInLogicalExpression;
-import org.apache.drill.common.exceptions.UserException;
 import org.apache.drill.common.types.TypeProtos;
 import org.apache.drill.common.types.Types;
 import org.apache.drill.exec.expr.annotations.FunctionTemplate;
@@ -54,6 +52,8 @@
 import org.apache.drill.exec.resolver.FunctionResolver;
 import org.apache.drill.exec.resolver.FunctionResolverFactory;
 import org.apache.drill.exec.resolver.TypeCastRules;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.util.List;
 import java.util.Optional;
@@ -744,7 +744,7 @@ public RelDataType inferReturnType(SqlOperatorBinding opBinding) {
       }
 
       final String part = ((SqlCharStringLiteral) ((SqlCallBinding) opBinding).operand(0))
-          .getNlsString()
+          .getValueAs(NlsString.class)
           .getValue()
           .toUpperCase();
 
@@ -1023,14 +1023,19 @@ public static RelDataType createCalciteTypeWithNullability(RelDataTypeFactory ty
   public static RelDataType convertToCalciteType(RelDataTypeFactory typeFactory,
                                                  TypeProtos.MajorType drillType, boolean isNullable) {
     SqlTypeName sqlTypeName = getCalciteTypeFromDrillType(drillType.getMinorType());
+    int precision;
+    int scale;
+
     switch (sqlTypeName) {
       case DECIMAL:
+        precision = drillType.getPrecision();
+        scale = drillType.getScale();
         return typeFactory.createTypeWithNullability(
-          typeFactory.createSqlType(sqlTypeName, drillType.getPrecision(),
-              drillType.getScale()), isNullable);
+          typeFactory.createSqlType(sqlTypeName, precision,
+              scale), isNullable);
       case TIME:
       case TIMESTAMP:
-        int precision = drillType.hasPrecision()
+        precision = drillType.hasPrecision()
           ? drillType.getPrecision()
           : typeFactory.getTypeSystem().getDefaultPrecision(sqlTypeName);
         return typeFactory.createTypeWithNullability(

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

@@ -73,7 +73,7 @@ public RexNode makeCast(RelDataType type, RexNode exp) {
         BigDecimal bigDecimal = (BigDecimal) value;
         DecimalUtility.checkValueOverflow(bigDecimal, precision, scale);
         if (bigDecimal.precision() != precision || bigDecimal.scale() != scale) {
-          return makeAbstractCast(type, exp);
+          return makeAbstractCast(type, exp, false);
         }
       }
     }

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

@@ -451,22 +451,4 @@ 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);
-  }
-
 }

pom.xml

@@ -52,7 +52,7 @@
     <aircompressor.version>0.25</aircompressor.version>
     <antlr.version>4.9.3</antlr.version>
     <asm.version>9.5</asm.version>
-    <avatica.version>1.23.0</avatica.version>
+    <avatica.version>1.26.0</avatica.version>
     <avro.version>1.11.4</avro.version>
     <bouncycastle.version>1.78.1</bouncycastle.version>
     <caffeine.version>2.9.3</caffeine.version>