flink-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rmetz...@apache.org
Subject [1/3] git commit: [FLINK-909] Adjust aggregators test case
Date Fri, 08 Aug 2014 13:30:12 GMT
Repository: incubator-flink
Updated Branches:
  refs/heads/release-0.6 4046e6a26 -> cb81fac88


[FLINK-909] Adjust aggregators test case


Project: http://git-wip-us.apache.org/repos/asf/incubator-flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-flink/commit/18f13eaf
Tree: http://git-wip-us.apache.org/repos/asf/incubator-flink/tree/18f13eaf
Diff: http://git-wip-us.apache.org/repos/asf/incubator-flink/diff/18f13eaf

Branch: refs/heads/release-0.6
Commit: 18f13eaf5fb8208e6c1867b18cd5643bf86809fe
Parents: 38cbf0b
Author: Stephan Ewen <sewen@apache.org>
Authored: Fri Aug 8 14:47:43 2014 +0200
Committer: Robert Metzger <rmetzger@apache.org>
Committed: Fri Aug 8 15:27:30 2014 +0200

----------------------------------------------------------------------
 .../runtime/iterative/concurrent/SuperstepKickoffLatch.java     | 2 +-
 .../iterative/concurrent/SuperstepKickoffLatchBroker.java       | 1 -
 .../ConnectedComponentsWithParametrizableAggregatorITCase.java  | 5 ++++-
 3 files changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/18f13eaf/flink-runtime/src/main/java/org/apache/flink/runtime/iterative/concurrent/SuperstepKickoffLatch.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/iterative/concurrent/SuperstepKickoffLatch.java
b/flink-runtime/src/main/java/org/apache/flink/runtime/iterative/concurrent/SuperstepKickoffLatch.java
index b53928c..91b1db0 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/iterative/concurrent/SuperstepKickoffLatch.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/iterative/concurrent/SuperstepKickoffLatch.java
@@ -29,7 +29,7 @@ public class SuperstepKickoffLatch {
 	public void triggerNextSuperstep() {
 		synchronized (monitor) {
 			if (terminated) {
-				throw new IllegalStateException("Already teriminated.");
+				throw new IllegalStateException("Already terminated.");
 			}
 			superstepNumber++;
 			monitor.notifyAll();

http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/18f13eaf/flink-runtime/src/main/java/org/apache/flink/runtime/iterative/concurrent/SuperstepKickoffLatchBroker.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/iterative/concurrent/SuperstepKickoffLatchBroker.java
b/flink-runtime/src/main/java/org/apache/flink/runtime/iterative/concurrent/SuperstepKickoffLatchBroker.java
index 41f6985..4439acf 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/iterative/concurrent/SuperstepKickoffLatchBroker.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/iterative/concurrent/SuperstepKickoffLatchBroker.java
@@ -16,7 +16,6 @@
  * limitations under the License.
  */
 
-
 package org.apache.flink.runtime.iterative.concurrent;
 
 public class SuperstepKickoffLatchBroker extends Broker<SuperstepKickoffLatch> {

http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/18f13eaf/flink-tests/src/test/java/org/apache/flink/test/iterative/aggregators/ConnectedComponentsWithParametrizableAggregatorITCase.java
----------------------------------------------------------------------
diff --git a/flink-tests/src/test/java/org/apache/flink/test/iterative/aggregators/ConnectedComponentsWithParametrizableAggregatorITCase.java
b/flink-tests/src/test/java/org/apache/flink/test/iterative/aggregators/ConnectedComponentsWithParametrizableAggregatorITCase.java
index 9382708..e1ae706 100644
--- a/flink-tests/src/test/java/org/apache/flink/test/iterative/aggregators/ConnectedComponentsWithParametrizableAggregatorITCase.java
+++ b/flink-tests/src/test/java/org/apache/flink/test/iterative/aggregators/ConnectedComponentsWithParametrizableAggregatorITCase.java
@@ -96,11 +96,14 @@ public class ConnectedComponentsWithParametrizableAggregatorITCase extends
JavaP
 	protected void postSubmit() throws Exception {
 		compareResultsByLinesInMemory(expectedResult, resultPath);
 		long[] aggr_values = ConnectedComponentsWithAggregatorProgram.aggr_value;
+		
+		// note that position 0 has the end result from superstep 1, retrieved at the start of
iteration 2
+		// position one as superstep 2, retrieved at the start of iteration 3.
+		// the result from iteration 5 is not available, because no iteration 6 happens
 		Assert.assertEquals(3, aggr_values[0]);
 		Assert.assertEquals(4, aggr_values[1]);
 		Assert.assertEquals(5, aggr_values[2]);
 		Assert.assertEquals(6, aggr_values[3]);
-		Assert.assertEquals(6, aggr_values[4]);
 	}
 
 


Mime
View raw message