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/12/23 20:23:11 UTC
[52/52] [abbrv] flink git commit: [hotfix] [tests] Clean up lots of
warnings
[hotfix] [tests] Clean up lots of warnings
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/368d0da1
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/368d0da1
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/368d0da1
Branch: refs/heads/master
Commit: 368d0da1f2bb7b91b60b3bd5bd66b1fcd497a87c
Parents: afa2717
Author: Stephan Ewen <se...@apache.org>
Authored: Fri Dec 23 19:14:40 2016 +0100
Committer: Stephan Ewen <se...@apache.org>
Committed: Fri Dec 23 20:54:28 2016 +0100
----------------------------------------------------------------------
.../savepoint/MigrationV0ToV1Test.java | 3 +-
.../hash/NonReusingHashJoinIteratorITCase.java | 51 ++++++++------------
2 files changed, 23 insertions(+), 31 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/368d0da1/flink-runtime/src/test/java/org/apache/flink/runtime/checkpoint/savepoint/MigrationV0ToV1Test.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/checkpoint/savepoint/MigrationV0ToV1Test.java b/flink-runtime/src/test/java/org/apache/flink/runtime/checkpoint/savepoint/MigrationV0ToV1Test.java
index 4208fe5..512768d 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/checkpoint/savepoint/MigrationV0ToV1Test.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/checkpoint/savepoint/MigrationV0ToV1Test.java
@@ -59,6 +59,7 @@ import java.util.concurrent.ThreadLocalRandom;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
+@SuppressWarnings("deprecation")
public class MigrationV0ToV1Test {
@Rule
@@ -135,7 +136,7 @@ public class MigrationV0ToV1Test {
StreamStateHandle stateHandle = legacyOperatorState.get(c);
try (InputStream is = stateHandle.openInputStream()) {
Tuple4<Integer, Integer, Integer, Integer> expTestState = new Tuple4<>(0, t, p, c);
- Tuple4<Integer, Integer, Integer, Integer> actTestState = null;
+ Tuple4<Integer, Integer, Integer, Integer> actTestState;
//check function state
if (p % 4 != 0) {
assertEquals(1, is.read());
http://git-wip-us.apache.org/repos/asf/flink/blob/368d0da1/flink-runtime/src/test/java/org/apache/flink/runtime/operators/hash/NonReusingHashJoinIteratorITCase.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/hash/NonReusingHashJoinIteratorITCase.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/hash/NonReusingHashJoinIteratorITCase.java
index cc5c472..d45c8c8 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/hash/NonReusingHashJoinIteratorITCase.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/hash/NonReusingHashJoinIteratorITCase.java
@@ -54,7 +54,8 @@ import java.util.Map.Entry;
import org.apache.flink.api.common.typeutils.GenericPairComparator;
import org.apache.flink.api.java.tuple.Tuple2;
-@SuppressWarnings({"serial"})
+@SuppressWarnings({"serial", "EqualsWhichDoesntCheckParameterClass",
+ "StatementWithEmptyBody", "KeySetIterationMayUseEntrySet"})
public class NonReusingHashJoinIteratorITCase {
private static final int MEMORY_SIZE = 16000000; // total memory
@@ -133,7 +134,7 @@ public class NonReusingHashJoinIteratorITCase {
collectTupleData(input1),
collectTupleData(input2));
- final FlatJoinFunction matcher = new TupleMatchRemovingJoin(expectedMatchesMap);
+ final TupleMatchRemovingJoin matcher = new TupleMatchRemovingJoin(expectedMatchesMap);
final Collector<Tuple2<Integer, String>> collector = new DiscardingOutputCollector<Tuple2<Integer, String>>();
// reset the generators
@@ -150,7 +151,8 @@ public class NonReusingHashJoinIteratorITCase {
this.memoryManager, ioManager, this.parentTask, 1.0, false, false, true);
iterator.open();
-
+
+ //noinspection StatementWithEmptyBody
while (iterator.callWithNextKey(matcher, collector));
iterator.close();
@@ -227,7 +229,7 @@ public class NonReusingHashJoinIteratorITCase {
input1 = new UnionIterator<>(inList1);
input2 = new UnionIterator<>(inList2);
- final FlatJoinFunction matcher = new TupleMatchRemovingJoin(expectedMatchesMap);
+ final TupleMatchRemovingJoin matcher = new TupleMatchRemovingJoin(expectedMatchesMap);
final Collector<Tuple2<Integer, String>> collector = new DiscardingOutputCollector<>();
NonReusingBuildFirstHashJoinIterator<Tuple2<Integer, String>, Tuple2<Integer, String>, Tuple2<Integer, String>> iterator =
@@ -269,7 +271,7 @@ public class NonReusingHashJoinIteratorITCase {
collectTupleData(input1),
collectTupleData(input2));
- final FlatJoinFunction matcher = new TupleMatchRemovingJoin(expectedMatchesMap);
+ final TupleMatchRemovingJoin matcher = new TupleMatchRemovingJoin(expectedMatchesMap);
final Collector<Tuple2<Integer, String>> collector = new DiscardingOutputCollector<>();
// reset the generators
@@ -363,7 +365,7 @@ public class NonReusingHashJoinIteratorITCase {
input1 = new UnionIterator<>(inList1);
input2 = new UnionIterator<>(inList2);
- final FlatJoinFunction matcher = new TupleMatchRemovingJoin(expectedMatchesMap);
+ final TupleMatchRemovingJoin matcher = new TupleMatchRemovingJoin(expectedMatchesMap);
final Collector<Tuple2<Integer, String>> collector = new DiscardingOutputCollector<>();
NonReusingBuildSecondHashJoinIterator<Tuple2<Integer, String>, Tuple2<Integer, String>, Tuple2<Integer, String>> iterator =
@@ -499,7 +501,7 @@ public class NonReusingHashJoinIteratorITCase {
collectTupleData(input1),
collectTupleData(input2));
- final FlatJoinFunction matcher = new TupleMatchRemovingJoin(expectedMatchesMap);
+ final TupleMatchRemovingJoin matcher = new TupleMatchRemovingJoin(expectedMatchesMap);
final Collector<Tuple2<Integer, String>> collector = new DiscardingOutputCollector<>();
// reset the generators
@@ -548,7 +550,7 @@ public class NonReusingHashJoinIteratorITCase {
collectTupleData(input1),
collectTupleData(input2));
- final FlatJoinFunction matcher = new TupleMatchRemovingJoin(expectedMatchesMap);
+ final TupleMatchRemovingJoin matcher = new TupleMatchRemovingJoin(expectedMatchesMap);
final Collector<Tuple2<Integer, String>> collector = new DiscardingOutputCollector<>();
// reset the generators
@@ -597,7 +599,7 @@ public class NonReusingHashJoinIteratorITCase {
collectTupleData(input1),
collectTupleData(input2));
- final FlatJoinFunction matcher = new TupleMatchRemovingJoin(expectedMatchesMap);
+ final TupleMatchRemovingJoin matcher = new TupleMatchRemovingJoin(expectedMatchesMap);
final Collector<Tuple2<Integer, String>> collector = new DiscardingOutputCollector<>();
// reset the generators
@@ -646,7 +648,7 @@ public class NonReusingHashJoinIteratorITCase {
collectTupleData(input1),
collectTupleData(input2));
- final FlatJoinFunction matcher = new TupleMatchRemovingJoin(expectedMatchesMap);
+ final TupleMatchRemovingJoin matcher = new TupleMatchRemovingJoin(expectedMatchesMap);
final Collector<Tuple2<Integer, String>> collector = new DiscardingOutputCollector<>();
// reset the generators
@@ -695,7 +697,7 @@ public class NonReusingHashJoinIteratorITCase {
collectTupleData(input1),
collectTupleData(input2));
- final FlatJoinFunction matcher = new TupleMatchRemovingJoin(expectedMatchesMap);
+ final TupleMatchRemovingJoin matcher = new TupleMatchRemovingJoin(expectedMatchesMap);
final Collector<Tuple2<Integer, String>> collector = new DiscardingOutputCollector<>();
// reset the generators
@@ -744,7 +746,7 @@ public class NonReusingHashJoinIteratorITCase {
collectTupleData(input1),
collectTupleData(input2));
- final FlatJoinFunction matcher = new TupleMatchRemovingJoin(expectedMatchesMap);
+ final TupleMatchRemovingJoin matcher = new TupleMatchRemovingJoin(expectedMatchesMap);
final Collector<Tuple2<Integer, String>> collector = new DiscardingOutputCollector<>();
// reset the generators
@@ -1012,23 +1014,12 @@ public class NonReusingHashJoinIteratorITCase {
@Override
public boolean equals(Object obj) {
- TupleMatch o = (TupleMatch) obj;
+ TupleMatch that = (TupleMatch) obj;
- if(left != null && o.left != null && right != null && o.right != null) {
- return this.left.equals(o.left) && this.right.equals(o.right);
- }
- else if(left == null && o.left == null) {
- return this.right.equals(o.right);
- }
- else if(right == null && o.right == null) {
- return this.left.equals(o.left);
- }
- else if(left == null && o.left == null && right == null && o.right == null) {
- return true;
- }
- else {
- return false;
- }
+ return (this.right == null ? that.right == null :
+ (that.right != null && this.right.equals(that.right))) &&
+ (this.left == null ? that.left == null :
+ (that.left != null && this.left.equals(that.left)));
}
@Override
@@ -1041,7 +1032,7 @@ public class NonReusingHashJoinIteratorITCase {
@Override
public String toString() {
String s = left == null ? "<null>" : left;
- s += ", " + right == null ? "<null>" : right;
+ s += ", " + (right == null ? "<null>" : right);
return s;
}
}
@@ -1056,7 +1047,7 @@ public class NonReusingHashJoinIteratorITCase {
public TupleIntPairMatch(int left, String right) {
this.left = left;
- this.right = new String(right);
+ this.right = right;
}
@Override