flink-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From g...@apache.org
Subject [1/5] flink git commit: [hotfix] [gelly] Reduce time to run integration tests
Date Wed, 26 Jul 2017 14:32:06 GMT
Repository: flink
Updated Branches:
  refs/heads/master 3e12673a5 -> 94559bae0


[hotfix] [gelly] Reduce time to run integration tests

Removes the "large" tests and increases the size of the "small" tests
from scale=7 to scale=8.


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

Branch: refs/heads/master
Commit: 94559bae086e4285b24e6fc29bb89007cfa71a33
Parents: 4a88f65
Author: Greg Hogan <code@greghogan.com>
Authored: Wed Jul 26 07:08:46 2017 -0400
Committer: Greg Hogan <code@greghogan.com>
Committed: Wed Jul 26 10:31:20 2017 -0400

----------------------------------------------------------------------
 .../flink/graph/drivers/AdamicAdarITCase.java   |   7 +-
 .../drivers/ClusteringCoefficientITCase.java    |  62 +++-------
 .../drivers/ConnectedComponentsITCase.java      |  18 +--
 .../flink/graph/drivers/EdgeListITCase.java     |   3 +-
 .../flink/graph/drivers/GraphMetricsITCase.java |  68 +----------
 .../apache/flink/graph/drivers/HITSITCase.java  |  16 +--
 .../flink/graph/drivers/JaccardIndexITCase.java |  22 +---
 .../flink/graph/drivers/PageRankITCase.java     |  16 +--
 .../graph/drivers/TriangleListingITCase.java    | 115 ++++++-------------
 9 files changed, 63 insertions(+), 264 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flink/blob/94559bae/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/drivers/AdamicAdarITCase.java
----------------------------------------------------------------------
diff --git a/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/drivers/AdamicAdarITCase.java
b/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/drivers/AdamicAdarITCase.java
index b048f08..6650d0d 100644
--- a/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/drivers/AdamicAdarITCase.java
+++ b/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/drivers/AdamicAdarITCase.java
@@ -30,8 +30,7 @@ import org.junit.runners.Parameterized;
  * Tests for {@link AdamicAdar}.
  */
 @RunWith(Parameterized.class)
-public class AdamicAdarITCase
-extends CopyableValueDriverBaseITCase {
+public class AdamicAdarITCase extends CopyableValueDriverBaseITCase {
 
 	public AdamicAdarITCase(String idType, TestExecutionMode mode) {
 		super(idType, mode);
@@ -61,8 +60,6 @@ extends CopyableValueDriverBaseITCase {
 		// skip 'char' since it is not printed as a number
 		Assume.assumeFalse(idType.equals("char") || idType.equals("nativeChar"));
 
-		expectedCount(
-			parameters(7, "print"),
-			11388);
+		expectedCount(parameters(8, "print"), 39276);
 	}
 }

http://git-wip-us.apache.org/repos/asf/flink/blob/94559bae/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/drivers/ClusteringCoefficientITCase.java
----------------------------------------------------------------------
diff --git a/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/drivers/ClusteringCoefficientITCase.java
b/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/drivers/ClusteringCoefficientITCase.java
index 6bcab6b..a31e862 100644
--- a/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/drivers/ClusteringCoefficientITCase.java
+++ b/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/drivers/ClusteringCoefficientITCase.java
@@ -21,7 +21,6 @@ package org.apache.flink.graph.drivers;
 import org.apache.flink.client.program.ProgramParametrizationException;
 import org.apache.flink.graph.asm.dataset.ChecksumHashCode.Checksum;
 
-import org.junit.Assume;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
@@ -30,8 +29,7 @@ import org.junit.runners.Parameterized;
  * Tests for {@link ClusteringCoefficient}.
  */
 @RunWith(Parameterized.class)
-public class ClusteringCoefficientITCase
-extends CopyableValueDriverBaseITCase {
+public class ClusteringCoefficientITCase extends CopyableValueDriverBaseITCase {
 
 	public ClusteringCoefficientITCase(String idType, TestExecutionMode mode) {
 		super(idType, mode);
@@ -55,58 +53,24 @@ extends CopyableValueDriverBaseITCase {
 	}
 
 	@Test
-	public void testHashWithSmallDirectedRMatGraph() throws Exception {
+	public void testHashWithDirectedRMatGraph() throws Exception {
 		String expected = "\n" +
-			new Checksum(117, 0x0000003621c62ca1L) + "\n\n" +
-			"triplet count: 29286, triangle count: 11466, global clustering coefficient: 0.39151813[0-9]+\n"
+
-			"vertex count: 117, average clustering coefficient: 0.45125697[0-9]+\n";
+			new Checksum(233, 0x00000075d99a55b6L) + "\n\n" +
+			"triplet count: 97315, triangle count: 30705, global clustering coefficient: 0.31552175[0-9]+\n"
+
+			"vertex count: 233, average clustering coefficient: 0.41178524[0-9]+\n";
 
-		expectedOutput(parameters(7, "directed", "directed", "hash"), expected);
+		expectedOutput(parameters(8, "directed", "directed", "hash"), expected);
 	}
 
 	@Test
-	public void testHashWithSmallUndirectedRMatGraph() throws Exception {
+	public void testHashWithUndirectedRMatGraph() throws Exception {
 		String expected = "\n\n" +
-			"triplet count: 29286, triangle count: 11466, global clustering coefficient: 0.39151813[0-9]+\n"
+
-			"vertex count: 117, average clustering coefficient: 0.57438679[0-9]+\n";
+			"triplet count: 97315, triangle count: 30705, global clustering coefficient: 0.31552175[0-9]+\n"
+
+			"vertex count: 233, average clustering coefficient: 0.50945459[0-9]+\n";
 
-		expectedOutput(parameters(7, "directed", "undirected", "hash"),
-			"\n" + new Checksum(117, 0x0000003875b38c43L) + expected);
-		expectedOutput(parameters(7, "undirected", "undirected", "hash"),
-			"\n" + new Checksum(117, 0x0000003c20344c75L) + expected);
-	}
-
-	@Test
-	public void testHashWithLargeDirectedRMatGraph() throws Exception {
-		// computation is too large for collection mode
-		Assume.assumeFalse(mode == TestExecutionMode.COLLECTION);
-
-		// skip 'byte' which cannot store vertex IDs for scale > 8
-		Assume.assumeFalse(idType.equals("byte") || idType.equals("nativeByte"));
-
-		String expected = "\n" +
-			new Checksum(3349, 0x0000067a9d18e7f3L) + "\n\n" +
-			"triplet count: 9276207, triangle count: 1439454, global clustering coefficient: 0.15517700[0-9]+\n"
+
-			"vertex count: 3349, average clustering coefficient: 0.24571815[0-9]+\n";
-
-		expectedOutput(parameters(12, "directed", "directed", "hash"), expected);
-	}
-
-	@Test
-	public void testHashWithLargeUndirectedRMatGraph() throws Exception {
-		// computation is too large for collection mode
-		Assume.assumeFalse(mode == TestExecutionMode.COLLECTION);
-
-		// skip 'byte' which cannot store vertex IDs for scale > 8
-		Assume.assumeFalse(idType.equals("byte") || idType.equals("nativeByte"));
-
-		String expected = "\n\n" +
-			"triplet count: 9276207, triangle count: 1439454, global clustering coefficient: 0.15517700[0-9]+\n"
+
-			"vertex count: 3349, average clustering coefficient: 0.33029442[0-9]+\n";
-
-		expectedOutput(parameters(12, "directed", "undirected", "hash"),
-			"\n" + new Checksum(3349, 0x00000681fad1587eL) + expected);
-		expectedOutput(parameters(12, "undirected", "undirected", "hash"),
-			"\n" + new Checksum(3349, 0x0000068713b3b7f1L) + expected);
+		expectedOutput(parameters(8, "directed", "undirected", "hash"),
+			"\n" + new Checksum(233, 0x00000076635e00e2L) + expected);
+		expectedOutput(parameters(8, "undirected", "undirected", "hash"),
+			"\n" + new Checksum(233, 0x000000743ef6d14bL) + expected);
 	}
 }

http://git-wip-us.apache.org/repos/asf/flink/blob/94559bae/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/drivers/ConnectedComponentsITCase.java
----------------------------------------------------------------------
diff --git a/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/drivers/ConnectedComponentsITCase.java
b/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/drivers/ConnectedComponentsITCase.java
index d6913c4..d14412d 100644
--- a/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/drivers/ConnectedComponentsITCase.java
+++ b/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/drivers/ConnectedComponentsITCase.java
@@ -30,8 +30,7 @@ import org.junit.runners.Parameterized;
  * Tests for {@link ConnectedComponents}.
  */
 @RunWith(Parameterized.class)
-public class ConnectedComponentsITCase
-extends NonTransformableDriverBaseITCase {
+public class ConnectedComponentsITCase extends NonTransformableDriverBaseITCase {
 
 	public ConnectedComponentsITCase(String idType, TestExecutionMode mode) {
 		super(idType, mode);
@@ -56,23 +55,12 @@ extends NonTransformableDriverBaseITCase {
 	}
 
 	@Test
-	public void testHashWithSmallRMatGraph() throws Exception {
+	public void testHashWithRMatGraph() throws Exception {
 		expectedChecksum(parameters(7, "hash"), 106, 0x0000000000033e88L);
 	}
 
 	@Test
-	public void testHashWithLargeRMatGraph() throws Exception {
-		// computation is too large for collection mode
-		Assume.assumeFalse(mode == TestExecutionMode.COLLECTION);
-
-		// skip 'byte' which cannot store vertex IDs for scale > 8
-		Assume.assumeFalse(idType.equals("byte") || idType.equals("nativeByte"));
-
-		expectedChecksum(parameters(15, "hash"), 25572, 0x00000003094ffba2L);
-	}
-
-	@Test
-	public void testPrintWithSmallRMatGraph() throws Exception {
+	public void testPrintWithRMatGraph() throws Exception {
 		// skip 'char' since it is not printed as a number
 		Assume.assumeFalse(idType.equals("char") || idType.equals("nativeChar"));
 

http://git-wip-us.apache.org/repos/asf/flink/blob/94559bae/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/drivers/EdgeListITCase.java
----------------------------------------------------------------------
diff --git a/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/drivers/EdgeListITCase.java
b/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/drivers/EdgeListITCase.java
index 2f8eb0d..6d84833 100644
--- a/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/drivers/EdgeListITCase.java
+++ b/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/drivers/EdgeListITCase.java
@@ -31,8 +31,7 @@ import org.junit.runners.Parameterized;
  * Tests for {@link EdgeList}.
  */
 @RunWith(Parameterized.class)
-public class EdgeListITCase
-extends NonTransformableDriverBaseITCase {
+public class EdgeListITCase extends NonTransformableDriverBaseITCase {
 
 	public EdgeListITCase(String idType, TestExecutionMode mode) {
 		super(idType, mode);

http://git-wip-us.apache.org/repos/asf/flink/blob/94559bae/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/drivers/GraphMetricsITCase.java
----------------------------------------------------------------------
diff --git a/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/drivers/GraphMetricsITCase.java
b/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/drivers/GraphMetricsITCase.java
index 1045a38..f417f53 100644
--- a/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/drivers/GraphMetricsITCase.java
+++ b/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/drivers/GraphMetricsITCase.java
@@ -20,7 +20,6 @@ package org.apache.flink.graph.drivers;
 
 import org.apache.flink.client.program.ProgramParametrizationException;
 
-import org.junit.Assume;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
@@ -29,8 +28,7 @@ import org.junit.runners.Parameterized;
  * Tests for {@link GraphMetrics}.
  */
 @RunWith(Parameterized.class)
-public class GraphMetricsITCase
-extends DriverBaseITCase {
+public class GraphMetricsITCase extends DriverBaseITCase {
 
 	public GraphMetricsITCase(String idType, TestExecutionMode mode) {
 		super(idType, mode);
@@ -54,7 +52,7 @@ extends DriverBaseITCase {
 	}
 
 	@Test
-	public void testWithSmallDirectedRMatIntegerGraph() throws Exception {
+	public void testWithDirectedRMatGraph() throws Exception {
 		String expected = "\n" +
 			"Vertex metrics:\n" +
 			"  vertex count: 117\n" +
@@ -80,39 +78,7 @@ extends DriverBaseITCase {
 	}
 
 	@Test
-	public void testWithLargeDirectedRMatIntegerGraph() throws Exception {
-		// skip 'byte' which cannot store vertex IDs for scale > 8
-		Assume.assumeFalse(idType.equals("byte") || idType.equals("nativeByte"));
-
-		// skip 'string' which does not compare numerically and generates a different triangle
count
-		Assume.assumeFalse(idType.equals("string") || idType.equals("nativeString"));
-
-		String expected = "\n" +
-			"Vertex metrics:\n" +
-			"  vertex count: 3,349\n" +
-			"  edge count: 53,368\n" +
-			"  unidirectional edge count: 43,602\n" +
-			"  bidirectional edge count: 4,883\n" +
-			"  average degree: 15.936\n" +
-			"  density: 0.00475971\n" +
-			"  triplet count: 9,276,207\n" +
-			"  maximum degree: 1,356\n" +
-			"  maximum out degree: 921\n" +
-			"  maximum in degree: 966\n" +
-			"  maximum triplets: 918,690\n" +
-			"\n" +
-			"Edge metrics:\n" +
-			"  triangle triplet count: 779,202\n" +
-			"  rectangle triplet count: 2,506,371\n" +
-			"  maximum triangle triplets: 3,160\n" +
-			"  maximum rectangle triplets: 16,835\n";
-
-		expectedOutput(parameters(12, "directed", "hash"), expected);
-		expectedOutput(parameters(12, "directed", "print"), expected);
-	}
-
-	@Test
-	public void testWithSmallUndirectedRMatIntegerGraph() throws Exception {
+	public void testWithUndirectedRMatGraph() throws Exception {
 		String expected = "\n" +
 			"Vertex metrics:\n" +
 			"  vertex count: 117\n" +
@@ -132,32 +98,4 @@ extends DriverBaseITCase {
 		expectedOutput(parameters(7, "undirected", "hash"), expected);
 		expectedOutput(parameters(7, "undirected", "print"), expected);
 	}
-
-	@Test
-	public void testWithLargelUndirectedRMatIntegerGraph() throws Exception {
-		// skip 'byte' which cannot store vertex IDs for scale > 8
-		Assume.assumeFalse(idType.equals("byte") || idType.equals("nativeByte"));
-
-		// skip 'string' which does not compare numerically and generates a different triangle
count
-		Assume.assumeFalse(idType.equals("string") || idType.equals("nativeString"));
-
-		String expected = "\n" +
-			"Vertex metrics:\n" +
-			"  vertex count: 3,349\n" +
-			"  edge count: 48,485\n" +
-			"  average degree: 28.955\n" +
-			"  density: 0.00864842\n" +
-			"  triplet count: 9,276,207\n" +
-			"  maximum degree: 1,356\n" +
-			"  maximum triplets: 918,690\n" +
-			"\n" +
-			"Edge metrics:\n" +
-			"  triangle triplet count: 779,202\n" +
-			"  rectangle triplet count: 2,506,371\n" +
-			"  maximum triangle triplets: 3,160\n" +
-			"  maximum rectangle triplets: 16,835\n";
-
-		expectedOutput(parameters(12, "undirected", "hash"), expected);
-		expectedOutput(parameters(12, "undirected", "print"), expected);
-	}
 }

http://git-wip-us.apache.org/repos/asf/flink/blob/94559bae/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/drivers/HITSITCase.java
----------------------------------------------------------------------
diff --git a/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/drivers/HITSITCase.java
b/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/drivers/HITSITCase.java
index 51a63eb..72048ee 100644
--- a/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/drivers/HITSITCase.java
+++ b/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/drivers/HITSITCase.java
@@ -29,8 +29,7 @@ import org.junit.runners.Parameterized;
  * Tests for {@link HITS}.
  */
 @RunWith(Parameterized.class)
-public class HITSITCase
-extends DriverBaseITCase {
+public class HITSITCase extends DriverBaseITCase {
 
 	public HITSITCase(String idType, TestExecutionMode mode) {
 		super(idType, mode);
@@ -54,21 +53,10 @@ extends DriverBaseITCase {
 	}
 
 	@Test
-	public void testPrintWithSmallRMatGraph() throws Exception {
+	public void testPrintWithRMatGraph() throws Exception {
 		// skip 'char' since it is not printed as a number
 		Assume.assumeFalse(idType.equals("char") || idType.equals("nativeChar"));
 
 		expectedCount(parameters(8, "print"), 233);
 	}
-
-	@Test
-	public void testPrintWithLargeRMatGraph() throws Exception {
-		// skip 'char' since it is not printed as a number
-		Assume.assumeFalse(idType.equals("char") || idType.equals("nativeChar"));
-
-		// skip 'byte' which cannot store vertex IDs for scale > 8
-		Assume.assumeFalse(idType.equals("byte") || idType.equals("nativeByte"));
-
-		expectedCount(parameters(12, "print"), 3349);
-	}
 }

http://git-wip-us.apache.org/repos/asf/flink/blob/94559bae/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/drivers/JaccardIndexITCase.java
----------------------------------------------------------------------
diff --git a/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/drivers/JaccardIndexITCase.java
b/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/drivers/JaccardIndexITCase.java
index 25eec22..a350bf0 100644
--- a/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/drivers/JaccardIndexITCase.java
+++ b/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/drivers/JaccardIndexITCase.java
@@ -31,8 +31,7 @@ import org.junit.runners.Parameterized;
  * Tests for {@link JaccardIndex}.
  */
 @RunWith(Parameterized.class)
-public class JaccardIndexITCase
-extends CopyableValueDriverBaseITCase {
+public class JaccardIndexITCase extends CopyableValueDriverBaseITCase {
 
 	public JaccardIndexITCase(String idType, TestExecutionMode mode) {
 		super(idType, mode);
@@ -58,26 +57,15 @@ extends CopyableValueDriverBaseITCase {
 	}
 
 	@Test
-	public void testHashWithSmallRMatGraph() throws Exception {
-		expectedChecksum(parameters(7, "hash"), 11388, 0x0000164757052eebL);
+	public void testHashWithRMatGraph() throws Exception {
+		expectedChecksum(parameters(8, "hash"), 39276, 0x00004caba2e663d5L);
 	}
 
 	@Test
-	public void testHashWithLargeRMatGraph() throws Exception {
-		// computation is too large for collection mode
-		Assume.assumeFalse(mode == TestExecutionMode.COLLECTION);
-
-		// skip 'byte' which cannot store vertex IDs for scale > 8
-		Assume.assumeFalse(idType.equals("byte") || idType.equals("nativeByte"));
-
-		expectedChecksum(parameters(12, "hash"), 4432058, 0x0021ce158d811c4eL);
-	}
-
-	@Test
-	public void testPrintWithSmallRMatGraph() throws Exception {
+	public void testPrintWithRMatGraph() throws Exception {
 		// skip 'char' since it is not printed as a number
 		Assume.assumeFalse(idType.equals("char") || idType.equals("nativeChar"));
 
-		expectedOutputChecksum(parameters(7, "print"), new Checksum(11388, 0x0000163b17088256L));
+		expectedOutputChecksum(parameters(8, "print"), new Checksum(39276, 0x00004c5a726220c0L));
 	}
 }

http://git-wip-us.apache.org/repos/asf/flink/blob/94559bae/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/drivers/PageRankITCase.java
----------------------------------------------------------------------
diff --git a/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/drivers/PageRankITCase.java
b/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/drivers/PageRankITCase.java
index 8e86810..2d772ef 100644
--- a/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/drivers/PageRankITCase.java
+++ b/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/drivers/PageRankITCase.java
@@ -29,8 +29,7 @@ import org.junit.runners.Parameterized;
  * Tests for {@link PageRank}.
  */
 @RunWith(Parameterized.class)
-public class PageRankITCase
-extends DriverBaseITCase {
+public class PageRankITCase extends DriverBaseITCase {
 
 	public PageRankITCase(String idType, TestExecutionMode mode) {
 		super(idType, mode);
@@ -54,21 +53,10 @@ extends DriverBaseITCase {
 	}
 
 	@Test
-	public void testPrintWithSmallRMatGraph() throws Exception {
+	public void testPrintWithRMatGraph() throws Exception {
 		// skip 'char' since it is not printed as a number
 		Assume.assumeFalse(idType.equals("char") || idType.equals("nativeChar"));
 
 		expectedCount(parameters(8, "print"), 233);
 	}
-
-	@Test
-	public void testPrintWithLargeRMatGraph() throws Exception {
-		// skip 'char' since it is not printed as a number
-		Assume.assumeFalse(idType.equals("char") || idType.equals("nativeChar"));
-
-		// skip 'byte' which cannot store vertex IDs for scale > 8
-		Assume.assumeFalse(idType.equals("byte") || idType.equals("nativeByte"));
-
-		expectedCount(parameters(12, "print"), 3349);
-	}
 }

http://git-wip-us.apache.org/repos/asf/flink/blob/94559bae/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/drivers/TriangleListingITCase.java
----------------------------------------------------------------------
diff --git a/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/drivers/TriangleListingITCase.java
b/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/drivers/TriangleListingITCase.java
index 687610e..4331702 100644
--- a/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/drivers/TriangleListingITCase.java
+++ b/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/drivers/TriangleListingITCase.java
@@ -31,8 +31,7 @@ import org.junit.runners.Parameterized;
  * Tests for {@link TriangleListing}.
  */
 @RunWith(Parameterized.class)
-public class TriangleListingITCase
-extends CopyableValueDriverBaseITCase {
+public class TriangleListingITCase extends CopyableValueDriverBaseITCase {
 
 	public TriangleListingITCase(String idType, TestExecutionMode mode) {
 		super(idType, mode);
@@ -62,106 +61,56 @@ extends CopyableValueDriverBaseITCase {
 	}
 
 	@Test
-	public void testHashWithSmallDirectedRMatGraph() throws Exception {
+	public void testHashWithDirectedRMatGraph() throws Exception {
 		String expected = "\n" +
-			new Checksum(22932, 0x00002cdfb573650dL) + "\n\n" +
+			new Checksum(61410, 0x000077d3e5e69fa3L) + "\n\n" +
 			"Triadic census:\n" +
-			"  003: 178,989\n" +
-			"  012: 47,736\n" +
-			"  102: 11,763\n" +
-			"  021d: 2,258\n" +
-			"  021u: 2,064\n" +
-			"  021c: 4,426\n" +
-			"  111d: 3,359\n" +
-			"  111u: 3,747\n" +
-			"  030t: 624\n" +
-			"  030c: 220\n" +
-			"  201: 1,966\n" +
-			"  120d: 352\n" +
-			"  120u: 394\n" +
-			"  120c: 704\n" +
-			"  210: 1,120\n" +
-			"  300: 408\n";
-
-		expectedOutput(parameters(7, "directed", "hash"), expected);
+			"  003: 1,679,209\n" +
+			"  012: 267,130\n" +
+			"  102: 57,972\n" +
+			"  021d: 8,496\n" +
+			"  021u: 8,847\n" +
+			"  021c: 17,501\n" +
+			"  111d: 13,223\n" +
+			"  111u: 12,865\n" +
+			"  030t: 1,674\n" +
+			"  030c: 572\n" +
+			"  201: 5,678\n" +
+			"  120d: 1,066\n" +
+			"  120u: 896\n" +
+			"  120c: 2,011\n" +
+			"  210: 2,867\n" +
+			"  300: 1,149\n";
+
+		expectedOutput(parameters(8, "directed", "hash"), expected);
 	}
 
 	@Test
-	public void testHashWithSmallUndirectedRMatGraph() throws Exception {
+	public void testHashWithUndirectedRMatGraph() throws Exception {
 		String expected = "\n" +
-			new Checksum(22932, 0x00002c7fb95ec78eL) + "\n\n" +
+			new Checksum(61410, 0x000077ea1798a4e0L) + "\n\n" +
 			"Triadic census:\n" +
-			"  03: 178,989\n" +
-			"  12: 59,499\n" +
-			"  21: 17,820\n" +
-			"  30: 3,822\n";
+			"  03: 1,679,209\n" +
+			"  12: 325,102\n" +
+			"  21: 66,610\n" +
+			"  30: 10,235\n";
 
-		expectedOutput(parameters(7, "undirected", "hash"), expected);
+		expectedOutput(parameters(8, "undirected", "hash"), expected);
 	}
 
 	@Test
-	public void testHashWithLargeDirectedRMatGraph() throws Exception {
-		// computation is too large for collection mode
-		Assume.assumeFalse(mode == TestExecutionMode.COLLECTION);
-
-		// skip 'byte' which cannot store vertex IDs for scale > 8
-		Assume.assumeFalse(idType.equals("byte") || idType.equals("nativeByte"));
-
-		String expected = "\n" +
-			new Checksum(2878908, 0x0015f77b8984c7caL) + "\n\n" +
-			"Triadic census:\n" +
-			"  003: 6,101,196,568\n" +
-			"  012: 132,051,207\n" +
-			"  102: 13,115,128\n" +
-			"  021d: 1,330,423\n" +
-			"  021u: 1,336,897\n" +
-			"  021c: 2,669,285\n" +
-			"  111d: 1,112,144\n" +
-			"  111u: 1,097,452\n" +
-			"  030t: 132,048\n" +
-			"  030c: 44,127\n" +
-			"  201: 290,552\n" +
-			"  120d: 47,734\n" +
-			"  120u: 47,780\n" +
-			"  120c: 95,855\n" +
-			"  210: 90,618\n" +
-			"  300: 21,656\n";
-
-		expectedOutput(parameters(12, "directed", "hash"), expected);
-	}
-
-	@Test
-	public void testHashWithLargeUndirectedRMatGraph() throws Exception {
-		// computation is too large for collection mode
-		Assume.assumeFalse(mode == TestExecutionMode.COLLECTION);
-
-		// skip 'byte' which cannot store vertex IDs for scale > 8
-		Assume.assumeFalse(idType.equals("byte") || idType.equals("nativeByte"));
-
-		String expected = "\n" +
-			new Checksum(2878908, 0x0015f51b1336df61L) + "\n\n" +
-			"Triadic census:\n" +
-			"  03: 6,101,196,568\n" +
-			"  12: 145,166,335\n" +
-			"  21: 7,836,753\n" +
-			"  30: 479,818\n";
-
-		expectedOutput(parameters(12, "undirected", "hash"), expected);
-	}
-
-	@Test
-	public void testPrintWithSmallDirectedRMatGraph() throws Exception {
+	public void testPrintWithDirectedRMatGraph() throws Exception {
 		// skip 'char' since it is not printed as a number
 		Assume.assumeFalse(idType.equals("char") || idType.equals("nativeChar"));
 
-		expectedOutputChecksum(parameters(7, "directed", "print"), new Checksum(22932, 0x00002ce58634cf58L));
+		expectedOutputChecksum(parameters(8, "directed", "print"), new Checksum(61410, 0x000077d967722c8aL));
 	}
 
 	@Test
-	public void testPrintWithSmallUndirectedRMatGraph() throws Exception {
+	public void testPrintWithUndirectedRMatGraph() throws Exception {
 		// skip 'char' since it is not printed as a number
 		Assume.assumeFalse(idType.equals("char") || idType.equals("nativeChar"));
 
-		expectedOutputChecksum(parameters(7, "undirected", "print"), new Checksum(22932, 0x00002d208304e7c4L));
+		expectedOutputChecksum(parameters(8, "undirected", "print"), new Checksum(61410, 0x0000780ffcb6838eL));
 	}
 }


Mime
View raw message