From eeefde68405d27a828d15443b5815a4e53a6b34c Mon Sep 17 00:00:00 2001 From: Alexander Pivovarov Date: Thu, 22 Sep 2016 20:27:08 -0700 Subject: [PATCH] [FLINK-4665] Remove boxing/unboxing to parse a primitive --- .../api/java/sca/NestedMethodAnalyzer.java | 2 +- .../aggregation/FloatSummaryAggregator.java | 2 +- .../flink/api/java/utils/ParameterTool.java | 16 +++++++-------- .../flink/api/java/io/CsvInputFormatTest.java | 20 +++++++++---------- .../api/java/sca/UdfAnalyzerExamplesTest.java | 2 +- .../flink/api/java/sca/UdfAnalyzerTest.java | 4 ++-- 6 files changed, 22 insertions(+), 24 deletions(-) diff --git a/flink-java/src/main/java/org/apache/flink/api/java/sca/NestedMethodAnalyzer.java b/flink-java/src/main/java/org/apache/flink/api/java/sca/NestedMethodAnalyzer.java index 302df4ebda3f98..7304c506bd6f2b 100644 --- a/flink-java/src/main/java/org/apache/flink/api/java/sca/NestedMethodAnalyzer.java +++ b/flink-java/src/main/java/org/apache/flink/api/java/sca/NestedMethodAnalyzer.java @@ -607,7 +607,7 @@ && isTagged(values.get(0)) else { final int constant = tagged(values.get(2)).getIntConstant(); - if (constant < 0 || Integer.valueOf(methodOwner.split("Tuple")[1]) <= constant ) { + if (constant < 0 || Integer.parseInt(methodOwner.split("Tuple")[1]) <= constant ) { analyzer.handleInvalidTupleAccess(); } diff --git a/flink-java/src/main/java/org/apache/flink/api/java/summarize/aggregation/FloatSummaryAggregator.java b/flink-java/src/main/java/org/apache/flink/api/java/summarize/aggregation/FloatSummaryAggregator.java index 745ca416bd8331..bc788414cad1eb 100644 --- a/flink-java/src/main/java/org/apache/flink/api/java/summarize/aggregation/FloatSummaryAggregator.java +++ b/flink-java/src/main/java/org/apache/flink/api/java/summarize/aggregation/FloatSummaryAggregator.java @@ -89,7 +89,7 @@ public void combine(Aggregator other) { @Override public Float result() { // overflow will go to infinity - return new Double(sum.value()).floatValue(); + return (float) sum.value(); } } diff --git a/flink-java/src/main/java/org/apache/flink/api/java/utils/ParameterTool.java b/flink-java/src/main/java/org/apache/flink/api/java/utils/ParameterTool.java index a9389a50daf20d..1c03c089b3526a 100644 --- a/flink-java/src/main/java/org/apache/flink/api/java/utils/ParameterTool.java +++ b/flink-java/src/main/java/org/apache/flink/api/java/utils/ParameterTool.java @@ -19,8 +19,8 @@ import org.apache.commons.cli.Option; import org.apache.commons.lang3.math.NumberUtils; -import org.apache.flink.annotation.PublicEvolving; import org.apache.flink.annotation.Public; +import org.apache.flink.annotation.PublicEvolving; import org.apache.flink.api.common.ExecutionConfig; import org.apache.flink.configuration.Configuration; import org.apache.flink.util.Preconditions; @@ -275,7 +275,7 @@ public boolean has(String value) { public int getInt(String key) { addToDefaults(key, null); String value = getRequired(key); - return Integer.valueOf(value); + return Integer.parseInt(value); } /** @@ -285,11 +285,10 @@ public int getInt(String key) { public int getInt(String key, int defaultValue) { addToDefaults(key, Integer.toString(defaultValue)); String value = get(key); - if(value == null) { + if (value == null) { return defaultValue; - } else { - return Integer.valueOf(value); } + return Integer.parseInt(value); } // -------------- LONG @@ -301,7 +300,7 @@ public int getInt(String key, int defaultValue) { public long getLong(String key) { addToDefaults(key, null); String value = getRequired(key); - return Long.valueOf(value); + return Long.parseLong(value); } /** @@ -311,11 +310,10 @@ public long getLong(String key) { public long getLong(String key, long defaultValue) { addToDefaults(key, Long.toString(defaultValue)); String value = get(key); - if(value == null) { + if (value == null) { return defaultValue; - } else { - return Long.valueOf(value); } + return Long.parseLong(value); } // -------------- FLOAT diff --git a/flink-java/src/test/java/org/apache/flink/api/java/io/CsvInputFormatTest.java b/flink-java/src/test/java/org/apache/flink/api/java/io/CsvInputFormatTest.java index fa091d97912102..54f226c72ec943 100644 --- a/flink-java/src/test/java/org/apache/flink/api/java/io/CsvInputFormatTest.java +++ b/flink-java/src/test/java/org/apache/flink/api/java/io/CsvInputFormatTest.java @@ -116,19 +116,19 @@ private void testSplitCsvInputStream(int bufferSize, boolean failAtStart) throws if (recordCounter == 1) { assertNotNull(result); assertEquals("this is", result.f0); - assertEquals(new Integer(1), result.f1); + assertEquals(Integer.valueOf(1), result.f1); assertEquals(new Double(2.0), result.f2); assertEquals((long) format.getCurrentState(), 15); } else if (recordCounter == 2) { assertNotNull(result); assertEquals("a test", result.f0); - assertEquals(new Integer(3), result.f1); + assertEquals(Integer.valueOf(3), result.f1); assertEquals(new Double(4.0), result.f2); assertEquals((long) format.getCurrentState(), 29); } else if (recordCounter == 3) { assertNotNull(result); assertEquals("#next", result.f0); - assertEquals(new Integer(5), result.f1); + assertEquals(Integer.valueOf(5), result.f1); assertEquals(new Double(6.0), result.f2); assertEquals((long) format.getCurrentState(), 42); } else { @@ -196,21 +196,21 @@ private void ignoreInvalidLines(int bufferSize) { result = format.nextRecord(result); assertNotNull(result); assertEquals("this is", result.f0); - assertEquals(new Integer(1), result.f1); + assertEquals(Integer.valueOf(1), result.f1); assertEquals(new Double(2.0), result.f2); assertEquals((long) format.getCurrentState(), 65); result = format.nextRecord(result); assertNotNull(result); assertEquals("a test", result.f0); - assertEquals(new Integer(3), result.f1); + assertEquals(Integer.valueOf(3), result.f1); assertEquals(new Double(4.0), result.f2); assertEquals((long) format.getCurrentState(), 91); result = format.nextRecord(result); assertNotNull(result); assertEquals("#next", result.f0); - assertEquals(new Integer(5), result.f1); + assertEquals(Integer.valueOf(5), result.f1); assertEquals(new Double(6.0), result.f2); assertEquals((long) format.getCurrentState(), 104); @@ -248,13 +248,13 @@ public void ignoreSingleCharPrefixComments() { result = format.nextRecord(result); assertNotNull(result); assertEquals("this is", result.f0); - assertEquals(new Integer(1), result.f1); + assertEquals(Integer.valueOf(1), result.f1); assertEquals(new Double(2.0), result.f2); result = format.nextRecord(result); assertNotNull(result); assertEquals("a test", result.f0); - assertEquals(new Integer(3), result.f1); + assertEquals(Integer.valueOf(3), result.f1); assertEquals(new Double(4.0), result.f2); result = format.nextRecord(result); @@ -292,13 +292,13 @@ public void ignoreMultiCharPrefixComments() { result = format.nextRecord(result); assertNotNull(result); assertEquals("this is", result.f0); - assertEquals(new Integer(1), result.f1); + assertEquals(Integer.valueOf(1), result.f1); assertEquals(new Double(2.0), result.f2); result = format.nextRecord(result); assertNotNull(result); assertEquals("a test", result.f0); - assertEquals(new Integer(3), result.f1); + assertEquals(Integer.valueOf(3), result.f1); assertEquals(new Double(4.0), result.f2); result = format.nextRecord(result); diff --git a/flink-java/src/test/java/org/apache/flink/api/java/sca/UdfAnalyzerExamplesTest.java b/flink-java/src/test/java/org/apache/flink/api/java/sca/UdfAnalyzerExamplesTest.java index 11ab5f22498643..01dc070488eca0 100644 --- a/flink-java/src/test/java/org/apache/flink/api/java/sca/UdfAnalyzerExamplesTest.java +++ b/flink-java/src/test/java/org/apache/flink/api/java/sca/UdfAnalyzerExamplesTest.java @@ -546,7 +546,7 @@ public PointWithLabel map(String value) throws Exception { for (int i = 0; i < split.length; i++) { if (i == 42 - 1) { - p.setLabel(new Integer(split[i].trim().substring(0, 1))); + p.setLabel(Integer.valueOf(split[i].trim().substring(0, 1))); } else { if (a < 42 && !split[i].trim().isEmpty()) { features[a++] = Double.parseDouble(split[i].trim()); diff --git a/flink-java/src/test/java/org/apache/flink/api/java/sca/UdfAnalyzerTest.java b/flink-java/src/test/java/org/apache/flink/api/java/sca/UdfAnalyzerTest.java index 20ce2616b839c0..ac357939c24a60 100644 --- a/flink-java/src/test/java/org/apache/flink/api/java/sca/UdfAnalyzerTest.java +++ b/flink-java/src/test/java/org/apache/flink/api/java/sca/UdfAnalyzerTest.java @@ -27,6 +27,7 @@ import org.apache.flink.api.common.functions.ReduceFunction; import org.apache.flink.api.common.functions.RichMapFunction; import org.apache.flink.api.common.operators.DualInputSemanticProperties; +import org.apache.flink.api.common.operators.Keys; import org.apache.flink.api.common.operators.SingleInputSemanticProperties; import org.apache.flink.api.common.typeinfo.BasicTypeInfo; import org.apache.flink.api.common.typeinfo.TypeInformation; @@ -35,7 +36,6 @@ import org.apache.flink.api.java.functions.FunctionAnnotation.ForwardedFieldsFirst; import org.apache.flink.api.java.functions.FunctionAnnotation.ForwardedFieldsSecond; import org.apache.flink.api.java.functions.SemanticPropUtil; -import org.apache.flink.api.common.operators.Keys; import org.apache.flink.api.java.tuple.Tuple1; import org.apache.flink.api.java.tuple.Tuple2; import org.apache.flink.api.java.tuple.Tuple3; @@ -700,7 +700,7 @@ public static class Map37 implements MapFunction>, Tuple1< @SuppressWarnings("unchecked") @Override public Tuple1> map(Tuple1> value) throws Exception { - ((Tuple1) value.getField(Integer.valueOf("2."))).f0 = "Hello"; + ((Tuple1) value.getField(Integer.parseInt("2."))).f0 = "Hello"; return value; } }