diff --git ql/src/java/org/apache/hadoop/hive/ql/parse/TypeCheckProcFactory.java ql/src/java/org/apache/hadoop/hive/ql/parse/TypeCheckProcFactory.java index 4968d16876..99520d3f4a 100644 --- ql/src/java/org/apache/hadoop/hive/ql/parse/TypeCheckProcFactory.java +++ ql/src/java/org/apache/hadoop/hive/ql/parse/TypeCheckProcFactory.java @@ -30,7 +30,6 @@ import org.apache.calcite.rel.RelNode; import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang3.math.NumberUtils; import org.apache.hadoop.hive.common.type.Date; import org.apache.hadoop.hive.common.type.HiveChar; import org.apache.hadoop.hive.common.type.HiveDecimal; @@ -1267,25 +1266,23 @@ private ExprNodeDesc interpretNodeAs(PrimitiveTypeInfo colTypeInfo, ExprNodeDesc try { PrimitiveTypeEntry primitiveTypeEntry = colTypeInfo.getPrimitiveTypeEntry(); if (PrimitiveObjectInspectorUtils.intTypeEntry.equals(primitiveTypeEntry)) { - return new ExprNodeConstantDesc(new Integer(constVal.toString())); + return new ExprNodeConstantDesc(Integer.valueOf(constVal.toString())); } else if (PrimitiveObjectInspectorUtils.longTypeEntry.equals(primitiveTypeEntry)) { - return new ExprNodeConstantDesc(new Long(constVal.toString())); + return new ExprNodeConstantDesc(Long.valueOf(constVal.toString())); } else if (PrimitiveObjectInspectorUtils.doubleTypeEntry.equals(primitiveTypeEntry)) { - return new ExprNodeConstantDesc(new Double(constVal.toString())); + return new ExprNodeConstantDesc(Double.valueOf(constVal.toString())); } else if (PrimitiveObjectInspectorUtils.floatTypeEntry.equals(primitiveTypeEntry)) { - return new ExprNodeConstantDesc(new Float(constVal.toString())); + return new ExprNodeConstantDesc(Float.valueOf(constVal.toString())); } else if (PrimitiveObjectInspectorUtils.byteTypeEntry.equals(primitiveTypeEntry)) { - return new ExprNodeConstantDesc(new Byte(constVal.toString())); + return new ExprNodeConstantDesc(Byte.valueOf(constVal.toString())); } else if (PrimitiveObjectInspectorUtils.shortTypeEntry.equals(primitiveTypeEntry)) { - return new ExprNodeConstantDesc(new Short(constVal.toString())); + return new ExprNodeConstantDesc(Short.valueOf(constVal.toString())); } else if (PrimitiveObjectInspectorUtils.decimalTypeEntry.equals(primitiveTypeEntry)) { return NumExprProcessor.createDecimal(constVal.toString(), false); } } catch (NumberFormatException nfe) { LOG.trace("Failed to narrow type of constant", nfe); - if (!NumberUtils.isNumber(constVal.toString())) { - return null; - } + return null; } }