diff options
12 files changed, 38 insertions, 35 deletions
diff --git a/contrib/storage-hbase/src/test/java/org/apache/drill/hbase/TestOrderedBytesConvertFunctions.java b/contrib/storage-hbase/src/test/java/org/apache/drill/hbase/TestOrderedBytesConvertFunctions.java index 2ef6d6840..e376ef070 100644 --- a/contrib/storage-hbase/src/test/java/org/apache/drill/hbase/TestOrderedBytesConvertFunctions.java +++ b/contrib/storage-hbase/src/test/java/org/apache/drill/hbase/TestOrderedBytesConvertFunctions.java @@ -54,7 +54,7 @@ public class TestOrderedBytesConvertFunctions extends BaseTestQuery { @Test public void testOrderedBytesDoubleConvertFrom() throws Throwable { - verifyPhysicalPlan("convert_from(binary_string('\\x31\\x80\\x00\\x00\\x00\\x00\\x00\\x00\\x01'), 'DOUBLE_OB')", new Double(4.9e-324)); + verifyPhysicalPlan("convert_from(binary_string('\\x31\\x80\\x00\\x00\\x00\\x00\\x00\\x00\\x01'), 'DOUBLE_OB')", Double.valueOf(4.9e-324)); } protected <T> void verifyPhysicalPlan(String expression, T expectedResults) throws Throwable { diff --git a/contrib/storage-hive/core/src/main/codegen/templates/ObjectInspectors.java b/contrib/storage-hive/core/src/main/codegen/templates/ObjectInspectors.java index f79f4b1cf..9f2390062 100644 --- a/contrib/storage-hive/core/src/main/codegen/templates/ObjectInspectors.java +++ b/contrib/storage-hive/core/src/main/codegen/templates/ObjectInspectors.java @@ -169,9 +169,9 @@ public class Drill${entry.drillType}${entry.hiveOI} { if (o == null) { return null; } - return new Boolean(((NullableBitHolder)o).value == 0 ? false : true); + return Boolean.valueOf(((NullableBitHolder)o).value != 0); <#else> - return new Boolean(((BitHolder)o).value == 0 ? false : true); + return Boolean.valueOf(((BitHolder)o).value != 0); </#if> } <#elseif entry.drillType == "Decimal38Sparse"> @@ -286,7 +286,7 @@ public class Drill${entry.drillType}${entry.hiveOI} { return null; } </#if> - return new Integer(get(o)); + return Integer.valueOf(get(o)); } <#else> @Override diff --git a/contrib/storage-hive/core/src/test/java/org/apache/drill/exec/fn/hive/HiveTestUDFImpls.java b/contrib/storage-hive/core/src/test/java/org/apache/drill/exec/fn/hive/HiveTestUDFImpls.java index 27cfc5178..8abd1faee 100644 --- a/contrib/storage-hive/core/src/test/java/org/apache/drill/exec/fn/hive/HiveTestUDFImpls.java +++ b/contrib/storage-hive/core/src/test/java/org/apache/drill/exec/fn/hive/HiveTestUDFImpls.java @@ -114,17 +114,17 @@ public class HiveTestUDFImpls { case BOOLEAN: return ((BooleanObjectInspector)argumentOI).get(input) ? Boolean.TRUE : Boolean.FALSE; case BYTE: - return new Byte(((ByteObjectInspector)argumentOI).get(input)); + return Byte.valueOf(((ByteObjectInspector)argumentOI).get(input)); case SHORT: - return new Short(((ShortObjectInspector)argumentOI).get(input)); + return Short.valueOf(((ShortObjectInspector)argumentOI).get(input)); case INT: - return new Integer(((IntObjectInspector)argumentOI).get(input)); + return Integer.valueOf(((IntObjectInspector)argumentOI).get(input)); case LONG: - return new Long(((LongObjectInspector)argumentOI).get(input)); + return Long.valueOf(((LongObjectInspector)argumentOI).get(input)); case FLOAT: - return new Float(((FloatObjectInspector)argumentOI).get(input)); + return Float.valueOf(((FloatObjectInspector)argumentOI).get(input)); case DOUBLE: - return new Double(((DoubleObjectInspector)argumentOI).get(input)); + return Double.valueOf(((DoubleObjectInspector)argumentOI).get(input)); case STRING: return PrimitiveObjectInspectorUtils.getString(input, (StringObjectInspector)argumentOI); case BINARY: diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/handlers/DefaultSqlHandler.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/handlers/DefaultSqlHandler.java index 5c3432309..9b75fb700 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/handlers/DefaultSqlHandler.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/handlers/DefaultSqlHandler.java @@ -500,7 +500,7 @@ public class DefaultSqlHandler extends AbstractSqlHandler { * We want to have smaller dataset on the right side, since hash table builds on right side. */ if (context.getPlannerSettings().isHashJoinSwapEnabled()) { - phyRelNode = SwapHashJoinVisitor.swapHashJoin(phyRelNode, new Double(context.getPlannerSettings() + phyRelNode = SwapHashJoinVisitor.swapHashJoin(phyRelNode, Double.valueOf(context.getPlannerSettings() .getHashJoinSwapMarginFactor())); } diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/ssl/SSLConfigClient.java b/exec/java-exec/src/main/java/org/apache/drill/exec/ssl/SSLConfigClient.java index 83f7f8628..1cc818c77 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/ssl/SSLConfigClient.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/ssl/SSLConfigClient.java @@ -93,8 +93,11 @@ public class SSLConfigClient extends SSLConfig { private int getIntProperty(String name, int defaultValue) { int value = defaultValue; - if ( (properties != null) && (properties.containsKey(name))) { - value = new Integer(properties.getProperty(name)).intValue(); + if (properties != null) { + String property = properties.getProperty(name); + if (property != null && property.length() > 0) { + value = Integer.decode(property); + } } return value; } diff --git a/exec/java-exec/src/test/java/org/apache/drill/TestFunctionsQuery.java b/exec/java-exec/src/test/java/org/apache/drill/TestFunctionsQuery.java index 0750d61b7..f49c8ccc6 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/TestFunctionsQuery.java +++ b/exec/java-exec/src/test/java/org/apache/drill/TestFunctionsQuery.java @@ -329,7 +329,7 @@ public class TestFunctionsQuery extends BaseTestQuery { + "FROM cp.`employee.json` LIMIT 1" ) .unOrdered() .baselineColumns("ShouldBeFLOAT") - .baselineValues(new Float(1.5f)) + .baselineValues(Float.valueOf(1.5f)) .go(); } @@ -340,7 +340,7 @@ public class TestFunctionsQuery extends BaseTestQuery { + "FROM cp.`employee.json` LIMIT 1" ) .unOrdered() .baselineColumns("ShouldBeDOUBLE") - .baselineValues(new Double(1.25)) + .baselineValues(Double.valueOf(1.25)) .go(); } @@ -351,7 +351,7 @@ public class TestFunctionsQuery extends BaseTestQuery { + "FROM cp.`employee.json` LIMIT 1" ) .unOrdered() .baselineColumns("ShouldBeBIGINT") - .baselineValues(new Long(64)) + .baselineValues(Long.valueOf(64)) .go(); } @@ -362,7 +362,7 @@ public class TestFunctionsQuery extends BaseTestQuery { + "FROM cp.`employee.json` LIMIT 1" ) .unOrdered() .baselineColumns("ShouldBeINTEGER") - .baselineValues(new Integer(32)) + .baselineValues(Integer.valueOf(32)) .go(); } @@ -374,7 +374,7 @@ public class TestFunctionsQuery extends BaseTestQuery { + "FROM cp.`employee.json` LIMIT 1" ) .unOrdered() .baselineColumns("ShouldBeSMALLINT") - .baselineValues(new Short((short) 16)) + .baselineValues(Short.valueOf((short) 16)) .go(); } @@ -386,7 +386,7 @@ public class TestFunctionsQuery extends BaseTestQuery { + "FROM cp.`employee.json` LIMIT 1" ) .unOrdered() .baselineColumns("ShouldBeTINYINT") - .baselineValues(new Byte((byte) 8)) + .baselineValues(Byte.valueOf((byte) 8)) .go(); } @@ -462,8 +462,8 @@ public class TestFunctionsQuery extends BaseTestQuery { .sqlQuery(query) .unOrdered() .baselineColumns("T_1", "T_2", "T_3", "T_4", "T_5", "T_6", "T_7", "T_8", "T_9", "T_10") - .baselineValues(new Double("1234.45"), new Double("-1234.45"), new Double("1200.0"), new Double("-1200.0"), new Double("1234.0"), - new Double("-1234.0"), new Double("0.0"), new Double("0.0"), new Double("8.1246744073695232E18"), new Double("8.12467440736953E13")) + .baselineValues(Double.valueOf("1234.45"), Double.valueOf("-1234.45"), Double.valueOf("1200.0"), Double.valueOf("-1200.0"), Double.valueOf("1234.0"), + Double.valueOf("-1234.0"), Double.valueOf("0.0"), Double.valueOf("0.0"), Double.valueOf("8.1246744073695232E18"), Double.valueOf("8.12467440736953E13")) .go(); } @@ -486,8 +486,8 @@ public class TestFunctionsQuery extends BaseTestQuery { .sqlQuery(query) .unOrdered() .baselineColumns("T_1", "T_2", "T_3", "T_4", "T_5", "T_6", "T_7", "T_8", "T_9", "T_10") - .baselineValues(new Double("1234.46"), new Double("-1234.46"), new Double("1200.0"), new Double("-1200.0"), new Double("1234.0"), - new Double("-1234.0"), new Double("0.0"), new Double("0.0"), new Double("8.1246744073695201E18"), new Double("8.12467440736954E13")) + .baselineValues(Double.valueOf("1234.46"), Double.valueOf("-1234.46"), Double.valueOf("1200.0"), Double.valueOf("-1200.0"), Double.valueOf("1234.0"), + Double.valueOf("-1234.0"), Double.valueOf("0.0"), Double.valueOf("0.0"), Double.valueOf("8.1246744073695201E18"), Double.valueOf("8.12467440736954E13")) .go(); } diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/compile/TestClassCompilationTypes.java b/exec/java-exec/src/test/java/org/apache/drill/exec/compile/TestClassCompilationTypes.java index c8f348ac8..e88d65bad 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/compile/TestClassCompilationTypes.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/compile/TestClassCompilationTypes.java @@ -51,7 +51,7 @@ public class TestClassCompilationTypes extends ExecTest{ // Evaluate it with varying parameter values; very fast. return (Integer) ee.evaluate(new Object[] { // parameterValues - new Integer(10), new Integer(11), }); + Integer.valueOf(10), Integer.valueOf(11), }); } private int jdk() throws Exception{ @@ -64,6 +64,6 @@ public class TestClassCompilationTypes extends ExecTest{ // Evaluate it with varying parameter values; very fast. return (Integer) ee.evaluate(new Object[] { // parameterValues - new Integer(10), new Integer(11), }); + Integer.valueOf(10), Integer.valueOf(11), }); } } diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TestStringFunctions.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TestStringFunctions.java index 27ef5e115..7b5dff380 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TestStringFunctions.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TestStringFunctions.java @@ -102,9 +102,9 @@ public class TestStringFunctions extends ExecTest { @Test public void testCharLength() throws Throwable { - Object [] expected = new Object[] {new Long(8), new Long(0), new Long(5), new Long(5), - new Long(8), new Long(0), new Long(5), new Long(5), - new Long(8), new Long(0), new Long(5), new Long(5),}; + Object [] expected = new Object[] {Long.valueOf(8), Long.valueOf(0), Long.valueOf(5), Long.valueOf(5), + Long.valueOf(8), Long.valueOf(0), Long.valueOf(5), Long.valueOf(5), + Long.valueOf(8), Long.valueOf(0), Long.valueOf(5), Long.valueOf(5),}; runTest(expected, "functions/string/testCharLength.json"); } @@ -158,8 +158,8 @@ public class TestStringFunctions extends ExecTest { @Test public void testPosition() throws Throwable { - final Object [] expected = new Object[] {new Long(2), new Long(0), new Long(0), new Long(0), - new Long(2), new Long(0), new Long(0), new Long(0)}; + final Object [] expected = new Object[] {Long.valueOf(2), Long.valueOf(0), Long.valueOf(0), Long.valueOf(0), + Long.valueOf(2), Long.valueOf(0), Long.valueOf(0), Long.valueOf(0)}; runTest(expected, "functions/string/testPosition.json"); } diff --git a/exec/jdbc/src/test/java/org/apache/drill/jdbc/DatabaseMetaDataGetColumnsTest.java b/exec/jdbc/src/test/java/org/apache/drill/jdbc/DatabaseMetaDataGetColumnsTest.java index ac848441c..80a74c18e 100644 --- a/exec/jdbc/src/test/java/org/apache/drill/jdbc/DatabaseMetaDataGetColumnsTest.java +++ b/exec/jdbc/src/test/java/org/apache/drill/jdbc/DatabaseMetaDataGetColumnsTest.java @@ -361,7 +361,7 @@ public class DatabaseMetaDataGetColumnsTest extends JdbcTestBase { private Integer getIntOrNull( ResultSet row, String columnName ) throws SQLException { final int value = row.getInt( columnName ); - return row.wasNull() ? null : new Integer( value ); + return row.wasNull() ? null : Integer.valueOf( value ); } diff --git a/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/TestInformationSchemaColumns.java b/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/TestInformationSchemaColumns.java index 214b7caf9..ae0af116a 100644 --- a/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/TestInformationSchemaColumns.java +++ b/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/TestInformationSchemaColumns.java @@ -340,7 +340,7 @@ public class TestInformationSchemaColumns extends JdbcTestBase { private Integer getIntOrNull( ResultSet row, String columnName ) throws SQLException { final int value = row.getInt( columnName ); - return row.wasNull() ? null : new Integer( value ); + return row.wasNull() ? null : Integer.valueOf( value ); } diff --git a/exec/vector/src/main/codegen/templates/HolderReaderImpl.java b/exec/vector/src/main/codegen/templates/HolderReaderImpl.java index ccff61810..7fac563d2 100644 --- a/exec/vector/src/main/codegen/templates/HolderReaderImpl.java +++ b/exec/vector/src/main/codegen/templates/HolderReaderImpl.java @@ -199,7 +199,7 @@ public class ${holderMode}${name}HolderReaderImpl extends AbstractFieldReader { holder.scale); <#elseif minor.class == "Bit" > - return new Boolean(holder.value != 0); + return Boolean.valueOf(holder.value != 0); <#else> ${friendlyType} value = new ${friendlyType}(this.holder.value); return value; @@ -272,7 +272,7 @@ public class ${holderMode}${name}HolderReaderImpl extends AbstractFieldReader { holder.scale); <#elseif minor.class == "Bit" > - return new Boolean(holder.value != 0); + return Boolean.valueOf(holder.value != 0); <#else> ${friendlyType} value = new ${friendlyType}(this.holder.value); return value; diff --git a/exec/vector/src/main/java/org/apache/drill/exec/vector/BitVector.java b/exec/vector/src/main/java/org/apache/drill/exec/vector/BitVector.java index 219db128d..ca2be3a76 100644 --- a/exec/vector/src/main/java/org/apache/drill/exec/vector/BitVector.java +++ b/exec/vector/src/main/java/org/apache/drill/exec/vector/BitVector.java @@ -382,7 +382,7 @@ public final class BitVector extends BaseDataValueVector implements FixedWidthVe @Override public final Boolean getObject(int index) { - return new Boolean(get(index) != 0); + return Boolean.valueOf(get(index) != 0); } @Override |