You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by se...@apache.org on 2016/09/23 12:01:24 UTC
[4/5] flink git commit: [FLINK-4665] [misc] Remove unnecessary
boxing/unboxing of primitive types in various places
[FLINK-4665] [misc] Remove unnecessary boxing/unboxing of primitive types in various places
This closes #2537
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/37c9512f
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/37c9512f
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/37c9512f
Branch: refs/heads/master
Commit: 37c9512fadb2b2ad6d3167b97d25fd00a2fa7620
Parents: 335a282
Author: Alexander Pivovarov <ap...@gmail.com>
Authored: Thu Sep 22 20:27:08 2016 -0700
Committer: Stephan Ewen <se...@apache.org>
Committed: Fri Sep 23 12:33:18 2016 +0200
----------------------------------------------------------------------
.../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(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/37c9512f/flink-java/src/main/java/org/apache/flink/api/java/sca/NestedMethodAnalyzer.java
----------------------------------------------------------------------
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 302df4e..7304c50 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 @@ public class NestedMethodAnalyzer extends BasicInterpreter {
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();
}
http://git-wip-us.apache.org/repos/asf/flink/blob/37c9512f/flink-java/src/main/java/org/apache/flink/api/java/summarize/aggregation/FloatSummaryAggregator.java
----------------------------------------------------------------------
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 745ca41..bc78841 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 class FloatSummaryAggregator extends NumericSummaryAggregator<Float> {
@Override
public Float result() {
// overflow will go to infinity
- return new Double(sum.value()).floatValue();
+ return (float) sum.value();
}
}
http://git-wip-us.apache.org/repos/asf/flink/blob/37c9512f/flink-java/src/main/java/org/apache/flink/api/java/utils/ParameterTool.java
----------------------------------------------------------------------
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 a9389a5..1c03c08 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 @@ package org.apache.flink.api.java.utils;
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 class ParameterTool extends ExecutionConfig.GlobalJobParameters implement
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 class ParameterTool extends ExecutionConfig.GlobalJobParameters implement
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 class ParameterTool extends ExecutionConfig.GlobalJobParameters implement
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 class ParameterTool extends ExecutionConfig.GlobalJobParameters implement
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
http://git-wip-us.apache.org/repos/asf/flink/blob/37c9512f/flink-java/src/test/java/org/apache/flink/api/java/io/CsvInputFormatTest.java
----------------------------------------------------------------------
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 fa091d9..54f226c 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 @@ public class CsvInputFormatTest {
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 @@ public class CsvInputFormatTest {
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 class CsvInputFormatTest {
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 class CsvInputFormatTest {
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);
http://git-wip-us.apache.org/repos/asf/flink/blob/37c9512f/flink-java/src/test/java/org/apache/flink/api/java/sca/UdfAnalyzerExamplesTest.java
----------------------------------------------------------------------
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 11ab5f2..01dc070 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 class UdfAnalyzerExamplesTest {
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());
http://git-wip-us.apache.org/repos/asf/flink/blob/37c9512f/flink-java/src/test/java/org/apache/flink/api/java/sca/UdfAnalyzerTest.java
----------------------------------------------------------------------
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 20ce261..ac35793 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.MapFunction;
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.ForwardedFields;
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 class UdfAnalyzerTest {
@SuppressWarnings("unchecked")
@Override
public Tuple1<Tuple1<String>> map(Tuple1<Tuple1<String>> value) throws Exception {
- ((Tuple1<String>) value.getField(Integer.valueOf("2."))).f0 = "Hello";
+ ((Tuple1<String>) value.getField(Integer.parseInt("2."))).f0 = "Hello";
return value;
}
}