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 2018/05/18 08:08:23 UTC
[3/5] flink git commit: [hotfix] [core] Fix checkstyle in
org.apache.flink.api.common.functions
http://git-wip-us.apache.org/repos/asf/flink/blob/9644df74/flink-core/src/test/java/org/apache/flink/api/common/functions/util/RuntimeUDFContextTest.java
----------------------------------------------------------------------
diff --git a/flink-core/src/test/java/org/apache/flink/api/common/functions/util/RuntimeUDFContextTest.java b/flink-core/src/test/java/org/apache/flink/api/common/functions/util/RuntimeUDFContextTest.java
index 7c5878d..fd2a5a2 100644
--- a/flink-core/src/test/java/org/apache/flink/api/common/functions/util/RuntimeUDFContextTest.java
+++ b/flink-core/src/test/java/org/apache/flink/api/common/functions/util/RuntimeUDFContextTest.java
@@ -18,24 +18,26 @@
package org.apache.flink.api.common.functions.util;
-import static org.junit.Assert.*;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.concurrent.Future;
-
import org.apache.flink.api.common.ExecutionConfig;
import org.apache.flink.api.common.TaskInfo;
-import org.apache.flink.api.common.accumulators.Accumulator;
import org.apache.flink.api.common.functions.BroadcastVariableInitializer;
-import org.apache.flink.core.fs.Path;
import org.apache.flink.metrics.groups.UnregisteredMetricsGroup;
import org.junit.Test;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+/**
+ * Test for the {@link RuntimeUDFContext}.
+ */
public class RuntimeUDFContextTest {
private final TaskInfo taskInfo = new TaskInfo("test name", 3, 1, 3, 0);
@@ -44,9 +46,9 @@ public class RuntimeUDFContextTest {
public void testBroadcastVariableNotFound() {
try {
RuntimeUDFContext ctx = new RuntimeUDFContext(
- taskInfo, getClass().getClassLoader(), new ExecutionConfig(),
- new HashMap<String, Future<Path>>(),
- new HashMap<String, Accumulator<?, ?>>(),
+ taskInfo, getClass().getClassLoader(), new ExecutionConfig(),
+ new HashMap<>(),
+ new HashMap<>(),
new UnregisteredMetricsGroup());
assertFalse(ctx.hasBroadcastVariable("some name"));
@@ -58,12 +60,14 @@ public class RuntimeUDFContextTest {
catch (IllegalArgumentException e) {
// expected
}
-
+
try {
ctx.getBroadcastVariableWithInitializer("some name", new BroadcastVariableInitializer<Object, Object>() {
- public Object initializeBroadcastVariable(Iterable<Object> data) { return null; }
+ public Object initializeBroadcastVariable(Iterable<Object> data) {
+ return null;
+ }
});
-
+
fail("should throw an exception");
}
catch (IllegalArgumentException e) {
@@ -75,16 +79,16 @@ public class RuntimeUDFContextTest {
fail(e.getMessage());
}
}
-
+
@Test
public void testBroadcastVariableSimple() {
try {
RuntimeUDFContext ctx = new RuntimeUDFContext(
taskInfo, getClass().getClassLoader(), new ExecutionConfig(),
- new HashMap<String, Future<Path>>(),
- new HashMap<String, Accumulator<?, ?>>(),
+ new HashMap<>(),
+ new HashMap<>(),
new UnregisteredMetricsGroup());
-
+
ctx.setBroadcastVariable("name1", Arrays.asList(1, 2, 3, 4));
ctx.setBroadcastVariable("name2", Arrays.asList(1.0, 2.0, 3.0, 4.0));
@@ -93,21 +97,21 @@ public class RuntimeUDFContextTest {
List<Integer> list1 = ctx.getBroadcastVariable("name1");
List<Double> list2 = ctx.getBroadcastVariable("name2");
-
+
assertEquals(Arrays.asList(1, 2, 3, 4), list1);
assertEquals(Arrays.asList(1.0, 2.0, 3.0, 4.0), list2);
-
+
// access again
List<Integer> list3 = ctx.getBroadcastVariable("name1");
List<Double> list4 = ctx.getBroadcastVariable("name2");
-
+
assertEquals(Arrays.asList(1, 2, 3, 4), list3);
assertEquals(Arrays.asList(1.0, 2.0, 3.0, 4.0), list4);
-
+
// and again ;-)
List<Integer> list5 = ctx.getBroadcastVariable("name1");
List<Double> list6 = ctx.getBroadcastVariable("name2");
-
+
assertEquals(Arrays.asList(1, 2, 3, 4), list5);
assertEquals(Arrays.asList(1.0, 2.0, 3.0, 4.0), list6);
}
@@ -122,20 +126,20 @@ public class RuntimeUDFContextTest {
try {
RuntimeUDFContext ctx = new RuntimeUDFContext(
taskInfo, getClass().getClassLoader(), new ExecutionConfig(),
- new HashMap<String, Future<Path>>(),
- new HashMap<String, Accumulator<?, ?>>(),
+ new HashMap<>(),
+ new HashMap<>(),
new UnregisteredMetricsGroup());
-
+
ctx.setBroadcastVariable("name", Arrays.asList(1, 2, 3, 4));
-
+
// access it the first time with an initializer
List<Double> list = ctx.getBroadcastVariableWithInitializer("name", new ConvertingInitializer());
assertEquals(Arrays.asList(1.0, 2.0, 3.0, 4.0), list);
-
+
// access it the second time with an initializer (which might not get executed)
List<Double> list2 = ctx.getBroadcastVariableWithInitializer("name", new ConvertingInitializer());
assertEquals(Arrays.asList(1.0, 2.0, 3.0, 4.0), list2);
-
+
// access it the third time without an initializer (should work by "chance", because the result is a list)
List<Double> list3 = ctx.getBroadcastVariable("name");
assertEquals(Arrays.asList(1.0, 2.0, 3.0, 4.0), list3);
@@ -145,25 +149,25 @@ public class RuntimeUDFContextTest {
fail(e.getMessage());
}
}
-
+
@Test
public void testResetBroadcastVariableWithInitializer() {
try {
RuntimeUDFContext ctx = new RuntimeUDFContext(
taskInfo, getClass().getClassLoader(), new ExecutionConfig(),
- new HashMap<String, Future<Path>>(),
- new HashMap<String, Accumulator<?, ?>>(),
+ new HashMap<>(),
+ new HashMap<>(),
new UnregisteredMetricsGroup());
-
+
ctx.setBroadcastVariable("name", Arrays.asList(1, 2, 3, 4));
-
+
// access it the first time with an initializer
List<Double> list = ctx.getBroadcastVariableWithInitializer("name", new ConvertingInitializer());
assertEquals(Arrays.asList(1.0, 2.0, 3.0, 4.0), list);
-
+
// set it again to something different
ctx.setBroadcastVariable("name", Arrays.asList(2, 3, 4, 5));
-
+
List<Double> list2 = ctx.getBroadcastVariableWithInitializer("name", new ConvertingInitializer());
assertEquals(Arrays.asList(2.0, 3.0, 4.0, 5.0), list2);
}
@@ -172,22 +176,22 @@ public class RuntimeUDFContextTest {
fail(e.getMessage());
}
}
-
+
@Test
public void testBroadcastVariableWithInitializerAndMismatch() {
try {
RuntimeUDFContext ctx = new RuntimeUDFContext(
taskInfo, getClass().getClassLoader(), new ExecutionConfig(),
- new HashMap<String, Future<Path>>(),
- new HashMap<String, Accumulator<?, ?>>(),
+ new HashMap<>(),
+ new HashMap<>(),
new UnregisteredMetricsGroup());
-
+
ctx.setBroadcastVariable("name", Arrays.asList(1, 2, 3, 4));
-
+
// access it the first time with an initializer
int sum = ctx.getBroadcastVariableWithInitializer("name", new SumInitializer());
assertEquals(10, sum);
-
+
// access it the second time with no initializer -> should fail due to type mismatch
try {
ctx.getBroadcastVariable("name");
@@ -202,26 +206,26 @@ public class RuntimeUDFContextTest {
fail(e.getMessage());
}
}
-
+
// --------------------------------------------------------------------------------------------
-
+
private static final class ConvertingInitializer implements BroadcastVariableInitializer<Integer, List<Double>> {
@Override
public List<Double> initializeBroadcastVariable(Iterable<Integer> data) {
- List<Double> list = new ArrayList<Double>();
-
+ List<Double> list = new ArrayList<>();
+
for (Integer i : data) {
list.add(i.doubleValue());
}
return list;
}
}
-
+
private static final class SumInitializer implements BroadcastVariableInitializer<Integer, Integer> {
@Override
public Integer initializeBroadcastVariable(Iterable<Integer> data) {
int sum = 0;
-
+
for (Integer i : data) {
sum += i;
}
http://git-wip-us.apache.org/repos/asf/flink/blob/9644df74/tools/maven/suppressions-core.xml
----------------------------------------------------------------------
diff --git a/tools/maven/suppressions-core.xml b/tools/maven/suppressions-core.xml
index e8ab211..a2cd207 100644
--- a/tools/maven/suppressions-core.xml
+++ b/tools/maven/suppressions-core.xml
@@ -52,10 +52,6 @@ under the License.
checks="NewlineAtEndOfFile|RegexpSingleline|TodoComment|RedundantImport|ImportOrder|RedundantModifier|JavadocMethod|JavadocParagraph|JavadocType|JavadocStyle|PackageName|TypeNameCheck|ConstantNameCheck|StaticVariableNameCheck|MemberNameCheck|MethodNameCheck|ParameterName|LocalFinalVariableName|LocalVariableName|LeftCurly|UpperEll|FallThrough|reliefPattern|SimplifyBooleanExpression|EmptyStatement|ModifierOrder|EmptyLineSeparator|WhitespaceAround|WhitespaceAfter|NoWhitespaceAfter|NoWhitespaceBefore|OperatorWrap|ParenPad"/>
<suppress
- files="(.*)api[/\\]common[/\\]functions[/\\](.*)"
- checks="NewlineAtEndOfFile|RegexpSingleline|TodoComment|RedundantImport|ImportOrder|RedundantModifier|JavadocMethod|JavadocParagraph|JavadocType|JavadocStyle|PackageName|TypeNameCheck|ConstantNameCheck|StaticVariableNameCheck|MemberNameCheck|MethodNameCheck|ParameterName|LocalFinalVariableName|LocalVariableName|LeftCurly|UpperEll|FallThrough|reliefPattern|SimplifyBooleanExpression|EmptyStatement|ModifierOrder|EmptyLineSeparator|WhitespaceAround|WhitespaceAfter|NoWhitespaceAfter|NoWhitespaceBefore|OperatorWrap|ParenPad"/>
-
- <suppress
files="(.*)api[/\\]common[/\\]io[/\\](.*)"
checks="NewlineAtEndOfFile|RegexpSingleline|TodoComment|RedundantImport|ImportOrder|RedundantModifier|JavadocMethod|JavadocParagraph|JavadocType|JavadocStyle|PackageName|TypeNameCheck|ConstantNameCheck|StaticVariableNameCheck|MemberNameCheck|MethodNameCheck|ParameterName|LocalFinalVariableName|LocalVariableName|LeftCurly|UpperEll|FallThrough|reliefPattern|SimplifyBooleanExpression|EmptyStatement|ModifierOrder|EmptyLineSeparator|WhitespaceAround|WhitespaceAfter|NoWhitespaceAfter|NoWhitespaceBefore|OperatorWrap|ParenPad"/>
<!--Only additional checks for test sources. Those checks were present in the "pre-strict" checkstyle but were not applied to test sources. We do not want to suppress them for sources directory-->