From e3d14626df54dff30ae30bb14e14267549309415 Mon Sep 17 00:00:00 2001 From: Ivan Suller Date: Fri, 1 Feb 2019 11:10:05 +0100 Subject: [PATCH] HIVE-21199: Replace all occurences of new Byte with Byte.valueOf --- .../org/apache/hive/beeline/Reflector.java | 2 +- .../hcatalog/data/TestDefaultHCatRecord.java | 78 +++++++++---------- .../hcatalog/data/TestHCatRecordSerDe.java | 34 ++++---- .../hive/hcatalog/data/TestJsonSerDe.java | 34 ++++---- .../ConstantPropagateProcFactory.java | 2 +- .../annotation/StatsRulesProcFactory.java | 4 +- .../ql/udf/generic/TestGenericUDFDateAdd.java | 2 +- .../ql/udf/generic/TestGenericUDFDateSub.java | 2 +- .../ql/udf/generic/TestGenericUDFRound.java | 9 ++- .../hive/serde2/lazy/LazySimpleSerDe.java | 2 +- .../avro/TestAvroLazyObjectInspector.java | 4 +- 11 files changed, 88 insertions(+), 85 deletions(-) diff --git a/beeline/src/java/org/apache/hive/beeline/Reflector.java b/beeline/src/java/org/apache/hive/beeline/Reflector.java index 60bfe40806..455c11c930 100644 --- a/beeline/src/java/org/apache/hive/beeline/Reflector.java +++ b/beeline/src/java/org/apache/hive/beeline/Reflector.java @@ -108,7 +108,7 @@ public static Object convert(Object ob, Class toType) if (toType == String.class) { return new String(ob.toString()); } else if (toType == Byte.class || toType == byte.class) { - return new Byte(ob.toString()); + return Byte.valueOf(ob.toString()); } else if (toType == Character.class || toType == char.class) { return new Character(ob.toString().charAt(0)); } else if (toType == Short.class || toType == short.class) { diff --git a/hcatalog/core/src/test/java/org/apache/hive/hcatalog/data/TestDefaultHCatRecord.java b/hcatalog/core/src/test/java/org/apache/hive/hcatalog/data/TestDefaultHCatRecord.java index d57d171675..b9d3f642dd 100644 --- a/hcatalog/core/src/test/java/org/apache/hive/hcatalog/data/TestDefaultHCatRecord.java +++ b/hcatalog/core/src/test/java/org/apache/hive/hcatalog/data/TestDefaultHCatRecord.java @@ -170,9 +170,9 @@ private HCatRecord getGetSet2InpRec() { rlist.add(new byte[]{1, 2, 3}); Map mapcol = new HashMap(3); - mapcol.put(new Short("2"), "hcat is cool"); - mapcol.put(new Short("3"), "is it?"); - mapcol.put(new Short("4"), "or is it not?"); + mapcol.put(Short.valueOf("2"), "hcat is cool"); + mapcol.put(Short.valueOf("3"), "is it?"); + mapcol.put(Short.valueOf("4"), "or is it not?"); rlist.add(mapcol); List listcol = new ArrayList(); @@ -186,66 +186,66 @@ private HCatRecord getGetSet2InpRec() { private HCatRecord[] getHCatRecords() { List rec_1 = new ArrayList(8); - rec_1.add(new Byte("123")); - rec_1.add(new Short("456")); - rec_1.add(new Integer(789)); - rec_1.add(new Long(1000L)); - rec_1.add(new Float(5.3F)); - rec_1.add(new Double(5.3D)); - rec_1.add(new Boolean(true)); - rec_1.add(new String("hcat and hadoop")); + rec_1.add(Byte.valueOf("123")); + rec_1.add(Short.valueOf("456")); + rec_1.add(Integer.valueOf(789)); + rec_1.add(Long.valueOf(1000L)); + rec_1.add(Float.valueOf(5.3F)); + rec_1.add(Double.valueOf(5.3D)); + rec_1.add(Boolean.TRUE); + rec_1.add("hcat and hadoop"); rec_1.add(null); rec_1.add("null"); HCatRecord tup_1 = new DefaultHCatRecord(rec_1); List rec_2 = new ArrayList(8); - rec_2.add(new Byte("123")); - rec_2.add(new Short("456")); - rec_2.add(new Integer(789)); - rec_2.add(new Long(1000L)); - rec_2.add(new Float(5.3F)); - rec_2.add(new Double(5.3D)); - rec_2.add(new Boolean(true)); - rec_2.add(new String("hcat and hadoop")); + rec_2.add(Byte.valueOf("123")); + rec_2.add(Short.valueOf("456")); + rec_2.add(Integer.valueOf(789)); + rec_2.add(Long.valueOf(1000L)); + rec_2.add(Float.valueOf(5.3F)); + rec_2.add(Double.valueOf(5.3D)); + rec_2.add(Boolean.TRUE); + rec_2.add("hcat and hadoop"); rec_2.add(null); rec_2.add("null"); HCatRecord tup_2 = new DefaultHCatRecord(rec_2); List rec_3 = new ArrayList(10); - rec_3.add(new Byte("123")); - rec_3.add(new Short("456")); - rec_3.add(new Integer(789)); - rec_3.add(new Long(1000L)); - rec_3.add(new Double(5.3D)); - rec_3.add(new String("hcat and hadoop")); + rec_3.add(Byte.valueOf("123")); + rec_3.add(Short.valueOf("456")); + rec_3.add(Integer.valueOf(789)); + rec_3.add(Long.valueOf(1000L)); + rec_3.add(Double.valueOf(5.3D)); + rec_3.add("hcat and hadoop"); rec_3.add(null); List innerList = new ArrayList(); innerList.add(314); innerList.add(007); rec_3.add(innerList); Map map = new HashMap(3); - map.put(new Short("2"), "hcat is cool"); - map.put(new Short("3"), "is it?"); - map.put(new Short("4"), "or is it not?"); + map.put(Short.valueOf("2"), "hcat is cool"); + map.put(Short.valueOf("3"), "is it?"); + map.put(Short.valueOf("4"), "or is it not?"); rec_3.add(map); HCatRecord tup_3 = new DefaultHCatRecord(rec_3); List rec_4 = new ArrayList(8); - rec_4.add(new Byte("123")); - rec_4.add(new Short("456")); - rec_4.add(new Integer(789)); - rec_4.add(new Long(1000L)); - rec_4.add(new Double(5.3D)); - rec_4.add(new String("hcat and hadoop")); + rec_4.add(Byte.valueOf("123")); + rec_4.add(Short.valueOf("456")); + rec_4.add(Integer.valueOf(789)); + rec_4.add(Long.valueOf(1000L)); + rec_4.add(Double.valueOf(5.3D)); + rec_4.add("hcat and hadoop"); rec_4.add(null); rec_4.add("null"); Map map2 = new HashMap(3); - map2.put(new Short("2"), "hcat is cool"); - map2.put(new Short("3"), "is it?"); - map2.put(new Short("4"), "or is it not?"); + map2.put(Short.valueOf("2"), "hcat is cool"); + map2.put(Short.valueOf("3"), "is it?"); + map2.put(Short.valueOf("4"), "or is it not?"); rec_4.add(map2); List innerList2 = new ArrayList(); innerList2.add(314); @@ -305,8 +305,8 @@ private Object getByteArray() { private List getStruct() { List struct = new ArrayList(); - struct.add(new Integer(1)); - struct.add(new String("x")); + struct.add(Integer.valueOf(1)); + struct.add("x"); return struct; } } diff --git a/hcatalog/core/src/test/java/org/apache/hive/hcatalog/data/TestHCatRecordSerDe.java b/hcatalog/core/src/test/java/org/apache/hive/hcatalog/data/TestHCatRecordSerDe.java index 8f82188ace..59715906c9 100644 --- a/hcatalog/core/src/test/java/org/apache/hive/hcatalog/data/TestHCatRecordSerDe.java +++ b/hcatalog/core/src/test/java/org/apache/hive/hcatalog/data/TestHCatRecordSerDe.java @@ -44,18 +44,18 @@ Map data = new HashMap(); List rlist = new ArrayList(11); - rlist.add(new Byte("123")); - rlist.add(new Short("456")); - rlist.add(new Integer(789)); - rlist.add(new Long(1000L)); - rlist.add(new Double(5.3D)); - rlist.add(new Float(2.39F)); - rlist.add(new String("hcat and hadoop")); + rlist.add(Byte.valueOf("123")); + rlist.add(Short.valueOf("456")); + rlist.add(Integer.valueOf(789)); + rlist.add(Long.valueOf(1000L)); + rlist.add(Double.valueOf(5.3D)); + rlist.add(Float.valueOf(2.39F)); + rlist.add("hcat and hadoop"); rlist.add(null); List innerStruct = new ArrayList(2); - innerStruct.add(new String("abc")); - innerStruct.add(new String("def")); + innerStruct.add("abc"); + innerStruct.add("def"); rlist.add(innerStruct); List innerList = new ArrayList(); @@ -64,24 +64,24 @@ rlist.add(innerList); Map map = new HashMap(3); - map.put(new Short("2"), "hcat is cool"); - map.put(new Short("3"), "is it?"); - map.put(new Short("4"), "or is it not?"); + map.put(Short.valueOf("2"), "hcat is cool"); + map.put(Short.valueOf("3"), "is it?"); + map.put(Short.valueOf("4"), "or is it not?"); rlist.add(map); - rlist.add(new Boolean(true)); + rlist.add(Boolean.TRUE); List c1 = new ArrayList(); List c1_1 = new ArrayList(); - c1_1.add(new Integer(12)); + c1_1.add(Integer.valueOf(12)); List i2 = new ArrayList(); List ii1 = new ArrayList(); - ii1.add(new Integer(13)); - ii1.add(new Integer(14)); + ii1.add(Integer.valueOf(13)); + ii1.add(Integer.valueOf(14)); i2.add(ii1); Map> ii2 = new HashMap>(); List iii1 = new ArrayList(); - iii1.add(new Integer(15)); + iii1.add(Integer.valueOf(15)); ii2.put("phew", iii1); i2.add(ii2); c1_1.add(i2); diff --git a/hcatalog/core/src/test/java/org/apache/hive/hcatalog/data/TestJsonSerDe.java b/hcatalog/core/src/test/java/org/apache/hive/hcatalog/data/TestJsonSerDe.java index d476b43b6d..00cc1eeef7 100644 --- a/hcatalog/core/src/test/java/org/apache/hive/hcatalog/data/TestJsonSerDe.java +++ b/hcatalog/core/src/test/java/org/apache/hive/hcatalog/data/TestJsonSerDe.java @@ -51,18 +51,18 @@ List> data = new ArrayList>(); List rlist = new ArrayList(13); - rlist.add(new Byte("123")); - rlist.add(new Short("456")); - rlist.add(new Integer(789)); - rlist.add(new Long(1000L)); - rlist.add(new Double(5.3D)); - rlist.add(new Float(2.39F)); - rlist.add(new String("hcat\nand\nhadoop")); + rlist.add(Byte.valueOf("123")); + rlist.add(Short.valueOf("456")); + rlist.add(Integer.valueOf(789)); + rlist.add(Long.valueOf(1000L)); + rlist.add(Double.valueOf(5.3D)); + rlist.add(Float.valueOf(2.39F)); + rlist.add("hcat\nand\nhadoop"); rlist.add(null); List innerStruct = new ArrayList(2); - innerStruct.add(new String("abc")); - innerStruct.add(new String("def")); + innerStruct.add("abc"); + innerStruct.add("def"); rlist.add(innerStruct); List innerList = new ArrayList(); @@ -71,24 +71,24 @@ rlist.add(innerList); Map map = new HashMap(3); - map.put(new Short("2"), "hcat is cool"); - map.put(new Short("3"), "is it?"); - map.put(new Short("4"), "or is it not?"); + map.put(Short.valueOf("2"), "hcat is cool"); + map.put(Short.valueOf("3"), "is it?"); + map.put(Short.valueOf("4"), "or is it not?"); rlist.add(map); - rlist.add(new Boolean(true)); + rlist.add(Boolean.TRUE); List c1 = new ArrayList(); List c1_1 = new ArrayList(); - c1_1.add(new Integer(12)); + c1_1.add(Integer.valueOf(12)); List i2 = new ArrayList(); List ii1 = new ArrayList(); - ii1.add(new Integer(13)); - ii1.add(new Integer(14)); + ii1.add(Integer.valueOf(13)); + ii1.add(Integer.valueOf(14)); i2.add(ii1); Map> ii2 = new HashMap>(); List iii1 = new ArrayList(); - iii1.add(new Integer(15)); + iii1.add(Integer.valueOf(15)); ii2.put("phew", iii1); i2.add(ii2); c1_1.add(i2); diff --git a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/ConstantPropagateProcFactory.java b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/ConstantPropagateProcFactory.java index b539787989..213f0977c4 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/ConstantPropagateProcFactory.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/ConstantPropagateProcFactory.java @@ -220,7 +220,7 @@ private static ExprNodeConstantDesc typeCast(ExprNodeDesc desc, TypeInfo ti, boo if (convObj instanceof Integer) { switch (priti.getPrimitiveCategory()) { case BYTE: - convObj = new Byte((byte) (((Integer) convObj).intValue())); + convObj = Byte.valueOf((byte) (((Integer) convObj).intValue())); break; case SHORT: convObj = new Short((short) ((Integer) convObj).intValue()); diff --git a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/stats/annotation/StatsRulesProcFactory.java b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/stats/annotation/StatsRulesProcFactory.java index b19c7de1b7..d8b57831f3 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/stats/annotation/StatsRulesProcFactory.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/stats/annotation/StatsRulesProcFactory.java @@ -604,7 +604,7 @@ public RangeResult intersect(ExprNodeDesc exprNode) { String boundValue = stringVal; switch (colType) { case serdeConstants.TINYINT_TYPE_NAME: { - byte value = new Byte(stringVal); + byte value = Byte.parseByte(stringVal); byte maxValue = range.maxValue.byteValue(); byte minValue = range.minValue.byteValue(); return RangeResult.of(value < minValue, value < maxValue, value == minValue, value == maxValue); @@ -952,7 +952,7 @@ private long evaluateComparator(Statistics stats, AnnotateStatsProcCtx aspCtx, E String colTypeLowerCase = columnDesc.getTypeString().toLowerCase(); try { if (colTypeLowerCase.equals(serdeConstants.TINYINT_TYPE_NAME)) { - byte value = new Byte(boundValue); + byte value = Byte.parseByte(boundValue); byte maxValue = cs.getRange().maxValue.byteValue(); byte minValue = cs.getRange().minValue.byteValue(); if (upperBound) { diff --git a/ql/src/test/org/apache/hadoop/hive/ql/udf/generic/TestGenericUDFDateAdd.java b/ql/src/test/org/apache/hadoop/hive/ql/udf/generic/TestGenericUDFDateAdd.java index d74a4ef165..1453029bbe 100644 --- a/ql/src/test/org/apache/hadoop/hive/ql/udf/generic/TestGenericUDFDateAdd.java +++ b/ql/src/test/org/apache/hadoop/hive/ql/udf/generic/TestGenericUDFDateAdd.java @@ -119,7 +119,7 @@ public void testByteDataTypeAsDays() throws HiveException { udf.initialize(arguments); DeferredObject valueObj1 = new DeferredJavaObject(new DateWritableV2(Date.of(109, 06, 20))); - DeferredObject valueObj2 = new DeferredJavaObject(new Byte("4")); + DeferredObject valueObj2 = new DeferredJavaObject(Byte.valueOf("4")); DeferredObject[] args = {valueObj1, valueObj2}; DateWritableV2 output = (DateWritableV2) udf.evaluate(args); diff --git a/ql/src/test/org/apache/hadoop/hive/ql/udf/generic/TestGenericUDFDateSub.java b/ql/src/test/org/apache/hadoop/hive/ql/udf/generic/TestGenericUDFDateSub.java index c71c2b7c18..3705d9994b 100644 --- a/ql/src/test/org/apache/hadoop/hive/ql/udf/generic/TestGenericUDFDateSub.java +++ b/ql/src/test/org/apache/hadoop/hive/ql/udf/generic/TestGenericUDFDateSub.java @@ -119,7 +119,7 @@ public void testByteDataTypeAsDays() throws HiveException { udf.initialize(arguments); DeferredObject valueObj1 = new DeferredJavaObject(new DateWritableV2(Date.of(109, 06, 20))); - DeferredObject valueObj2 = new DeferredJavaObject(new Byte("4")); + DeferredObject valueObj2 = new DeferredJavaObject(Byte.valueOf("4")); DeferredObject[] args = {valueObj1, valueObj2}; DateWritableV2 output = (DateWritableV2) udf.evaluate(args); diff --git a/ql/src/test/org/apache/hadoop/hive/ql/udf/generic/TestGenericUDFRound.java b/ql/src/test/org/apache/hadoop/hive/ql/udf/generic/TestGenericUDFRound.java index 8b12448177..cc4f7bdb74 100644 --- a/ql/src/test/org/apache/hadoop/hive/ql/udf/generic/TestGenericUDFRound.java +++ b/ql/src/test/org/apache/hadoop/hive/ql/udf/generic/TestGenericUDFRound.java @@ -62,9 +62,12 @@ PrimitiveObjectInspectorFactory.javaShortObjectInspector, PrimitiveObjectInspectorFactory.javaLongObjectInspector, PrimitiveObjectInspectorFactory.getPrimitiveJavaObjectInspector(TypeInfoFactory.getDecimalTypeInfo(15, 5))); - db.addRow("one", 170, new Double("1.1"), new Float("32.1234"), new Byte("25"), new Short("1234"), 123456L, HiveDecimal.create("983.7235")); - db.addRow( "-234", null, null, new Float("0.347232"), new Byte("109"), new Short("551"), 923L, HiveDecimal.create("983723.005")); - db.addRow("454.45", 22345, new Double("-23.00009"), new Float("-3.4"), new Byte("76"), new Short("2321"), 9232L, HiveDecimal.create("-932032.7")); + db.addRow("one", 170, Double.valueOf("1.1"), Float.valueOf("32.1234"), Byte.valueOf("25"), Short.valueOf("1234"), + 123456L, HiveDecimal.create("983.7235")); + db.addRow("-234", null, null, Float.valueOf("0.347232"), Byte.valueOf("109"), Short.valueOf("551"), 923L, + HiveDecimal.create("983723.005")); + db.addRow("454.45", 22345, Double.valueOf("-23.00009"), Float.valueOf("-3.4"), Byte.valueOf("76"), + Short.valueOf("2321"), 9232L, HiveDecimal.create("-932032.7")); return db.createRows(); } diff --git a/serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazySimpleSerDe.java b/serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazySimpleSerDe.java index fb194c8a74..c166d735ab 100644 --- a/serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazySimpleSerDe.java +++ b/serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazySimpleSerDe.java @@ -362,7 +362,7 @@ public static void serialize(ByteStream.Output out, Object obj, if (ois == null) { out.write(nullSequence.getBytes(), 0, nullSequence.getLength()); } else { - LazyUtils.writePrimitiveUTF8(out, new Byte(uoi.getTag(obj)), + LazyUtils.writePrimitiveUTF8(out, Byte.valueOf(uoi.getTag(obj)), PrimitiveObjectInspectorFactory.javaByteObjectInspector, escaped, escapeChar, needsEscape); out.write(separator); diff --git a/serde/src/test/org/apache/hadoop/hive/serde2/avro/TestAvroLazyObjectInspector.java b/serde/src/test/org/apache/hadoop/hive/serde2/avro/TestAvroLazyObjectInspector.java index dd3e735200..f6abcb5b7d 100644 --- a/serde/src/test/org/apache/hadoop/hive/serde2/avro/TestAvroLazyObjectInspector.java +++ b/serde/src/test/org/apache/hadoop/hive/serde2/avro/TestAvroLazyObjectInspector.java @@ -39,7 +39,7 @@ public void testEmptyData(){ fieldNames.add("myField"); List ois = new ArrayList(); - ois.add(LazyPrimitiveObjectInspectorFactory.getLazyStringObjectInspector(false, new Byte((byte) 0))); + ois.add(LazyPrimitiveObjectInspectorFactory.getLazyStringObjectInspector(false, Byte.valueOf((byte) 0))); AvroLazyObjectInspector aloi = new AvroLazyObjectInspector(fieldNames, ois, null, (byte)0, new Text(), false, false, (byte)0); LazyStruct lazyStruct = new LazyStruct(LazyObjectInspectorFactory.getLazySimpleStructObjectInspector(fieldNames, ois, (byte)0, new Text(), false, false, (byte)0)); @@ -60,7 +60,7 @@ public String getFieldName() { @Override public ObjectInspector getFieldObjectInspector() { - return LazyPrimitiveObjectInspectorFactory.getLazyStringObjectInspector(false, new Byte((byte) 0)); + return LazyPrimitiveObjectInspectorFactory.getLazyStringObjectInspector(false, Byte.valueOf((byte) 0)); } @Override -- 2.18.0