This is an automated email from the ASF dual-hosted git repository.
kgyrtkirk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hive.git
The following commit(s) were added to refs/heads/master by this push:
new 8a50f16 HIVE-21199: Replace all occurences of new Byte with
Byte.valueOf (Ivan Suller via Zoltan Haindrich)
8a50f16 is described below
commit 8a50f1699ab36d5357edc7372539d3ed5bba1dea
Author: Ivan Suller <isul...@cloudera.com>
AuthorDate: Wed Feb 6 15:31:46 2019 +0100
HIVE-21199: Replace all occurences of new Byte with Byte.valueOf (Ivan
Suller via Zoltan Haindrich)
Signed-off-by: Zoltan Haindrich <k...@rxd.hu>
---
.../java/org/apache/hive/beeline/Reflector.java | 2 +-
.../hive/hcatalog/data/TestDefaultHCatRecord.java | 78 +++++++++++-----------
.../hive/hcatalog/data/TestHCatRecordSerDe.java | 34 +++++-----
.../apache/hive/hcatalog/data/TestJsonSerDe.java | 34 +++++-----
.../ql/optimizer/ConstantPropagateProcFactory.java | 18 ++---
.../stats/annotation/StatsRulesProcFactory.java | 4 +-
.../hive/ql/udf/generic/TestGenericUDFDateAdd.java | 2 +-
.../hive/ql/udf/generic/TestGenericUDFDateSub.java | 2 +-
.../hive/ql/udf/generic/TestGenericUDFRound.java | 9 ++-
.../hadoop/hive/serde2/lazy/LazySimpleSerDe.java | 2 +-
.../serde2/avro/TestAvroLazyObjectInspector.java | 4 +-
11 files changed, 96 insertions(+), 93 deletions(-)
diff --git a/beeline/src/java/org/apache/hive/beeline/Reflector.java
b/beeline/src/java/org/apache/hive/beeline/Reflector.java
index 60bfe40..455c11c 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 @@ class Reflector {
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 d57d171..b9d3f64 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 @@ public class TestDefaultHCatRecord extends TestCase {
rlist.add(new byte[]{1, 2, 3});
Map<Short, String> mapcol = new HashMap<Short, String>(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<Integer> listcol = new ArrayList<Integer>();
@@ -186,66 +186,66 @@ public class TestDefaultHCatRecord extends TestCase {
private HCatRecord[] getHCatRecords() {
List<Object> rec_1 = new ArrayList<Object>(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<Object> rec_2 = new ArrayList<Object>(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<Object> rec_3 = new ArrayList<Object>(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<Integer> innerList = new ArrayList<Integer>();
innerList.add(314);
innerList.add(007);
rec_3.add(innerList);
Map<Short, String> map = new HashMap<Short, String>(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<Object> rec_4 = new ArrayList<Object>(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<Short, String> map2 = new HashMap<Short, String>(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<Integer> innerList2 = new ArrayList<Integer>();
innerList2.add(314);
@@ -305,8 +305,8 @@ public class TestDefaultHCatRecord extends TestCase {
private List<?> getStruct() {
List<Object> struct = new ArrayList<Object>();
- 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 8f82188..5971590 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 @@ public class TestHCatRecordSerDe extends TestCase {
Map<Properties, HCatRecord> data = new HashMap<Properties, HCatRecord>();
List<Object> rlist = new ArrayList<Object>(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<Object> innerStruct = new ArrayList<Object>(2);
- innerStruct.add(new String("abc"));
- innerStruct.add(new String("def"));
+ innerStruct.add("abc");
+ innerStruct.add("def");
rlist.add(innerStruct);
List<Integer> innerList = new ArrayList<Integer>();
@@ -64,24 +64,24 @@ public class TestHCatRecordSerDe extends TestCase {
rlist.add(innerList);
Map<Short, String> map = new HashMap<Short, String>(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<Object> c1 = new ArrayList<Object>();
List<Object> c1_1 = new ArrayList<Object>();
- c1_1.add(new Integer(12));
+ c1_1.add(Integer.valueOf(12));
List<Object> i2 = new ArrayList<Object>();
List<Integer> ii1 = new ArrayList<Integer>();
- ii1.add(new Integer(13));
- ii1.add(new Integer(14));
+ ii1.add(Integer.valueOf(13));
+ ii1.add(Integer.valueOf(14));
i2.add(ii1);
Map<String, List<?>> ii2 = new HashMap<String, List<?>>();
List<Integer> iii1 = new ArrayList<Integer>();
- 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 d476b43..00cc1ee 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 @@ public class TestJsonSerDe extends TestCase {
List<Pair<Properties, HCatRecord>> data = new ArrayList<Pair<Properties,
HCatRecord>>();
List<Object> rlist = new ArrayList<Object>(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<Object> innerStruct = new ArrayList<Object>(2);
- innerStruct.add(new String("abc"));
- innerStruct.add(new String("def"));
+ innerStruct.add("abc");
+ innerStruct.add("def");
rlist.add(innerStruct);
List<Integer> innerList = new ArrayList<Integer>();
@@ -71,24 +71,24 @@ public class TestJsonSerDe extends TestCase {
rlist.add(innerList);
Map<Short, String> map = new HashMap<Short, String>(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<Object> c1 = new ArrayList<Object>();
List<Object> c1_1 = new ArrayList<Object>();
- c1_1.add(new Integer(12));
+ c1_1.add(Integer.valueOf(12));
List<Object> i2 = new ArrayList<Object>();
List<Integer> ii1 = new ArrayList<Integer>();
- ii1.add(new Integer(13));
- ii1.add(new Integer(14));
+ ii1.add(Integer.valueOf(13));
+ ii1.add(Integer.valueOf(14));
i2.add(ii1);
Map<String, List<?>> ii2 = new HashMap<String, List<?>>();
List<Integer> iii1 = new ArrayList<Integer>();
- 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 b539787..c08168a 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
@@ -219,15 +219,15 @@ public final class ConstantPropagateProcFactory {
// Convert integer related types because converters are not sufficient
if (convObj instanceof Integer) {
switch (priti.getPrimitiveCategory()) {
- case BYTE:
- convObj = new Byte((byte) (((Integer) convObj).intValue()));
- break;
- case SHORT:
- convObj = new Short((short) ((Integer) convObj).intValue());
- break;
- case LONG:
- convObj = new Long(((Integer) convObj).intValue());
- default:
+ case BYTE:
+ convObj = Byte.valueOf((((Integer) convObj).byteValue()));
+ break;
+ case SHORT:
+ convObj = Short.valueOf(((Integer) convObj).shortValue());
+ break;
+ case LONG:
+ convObj = Long.valueOf(((Integer) convObj).intValue());
+ default:
}
}
return new ExprNodeConstantDesc(ti, convObj);
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 b19c7de..d8b5783 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 class StatsRulesProcFactory {
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 @@ public class StatsRulesProcFactory {
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 d74a4ef..1453029 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 class TestGenericUDFDateAdd extends TestCase {
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 c71c2b7..3705d99 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 class TestGenericUDFDateSub extends TestCase {
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 8b12448..cc4f7bd 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 @@ public class TestGenericUDFRound extends BaseScalarUdfTest {
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 fb194c8..c166d73 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 class LazySimpleSerDe extends
AbstractEncodingAwareSerDe {
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 dd3e735..f6abcb5 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 class TestAvroLazyObjectInspector {
fieldNames.add("myField");
List<ObjectInspector> ois = new ArrayList<ObjectInspector>();
-
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 class TestAvroLazyObjectInspector {
@Override
public ObjectInspector getFieldObjectInspector() {
- return
LazyPrimitiveObjectInspectorFactory.getLazyStringObjectInspector(false, new
Byte((byte) 0));
+ return
LazyPrimitiveObjectInspectorFactory.getLazyStringObjectInspector(false,
Byte.valueOf((byte) 0));
}
@Override
