You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by mx...@apache.org on 2016/11/24 17:28:56 UTC

flink git commit: [FLINK-2608] remove expensive integration tests previously introduced

Repository: flink
Updated Branches:
  refs/heads/master f5f4f7a27 -> 5d2da128b


[FLINK-2608] remove expensive integration tests previously introduced

This is a followup to 0d3ff88b369fbb1b0a8fb0e8263c9ce0a9da1583

This closes #2856.


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

Branch: refs/heads/master
Commit: 5d2da128b690974994c630142ef33d84ed99ad28
Parents: f5f4f7a
Author: Aleksandr Chermenin <al...@epam.com>
Authored: Wed Nov 23 15:15:55 2016 +0300
Committer: Maximilian Michels <mx...@apache.org>
Committed: Thu Nov 24 18:29:16 2016 +0100

----------------------------------------------------------------------
 .../javaApiOperators/GroupReduceITCase.java     | 38 --------
 .../util/CollectionDataSets.java                | 96 --------------------
 2 files changed, 134 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flink/blob/5d2da128/flink-tests/src/test/java/org/apache/flink/test/javaApiOperators/GroupReduceITCase.java
----------------------------------------------------------------------
diff --git a/flink-tests/src/test/java/org/apache/flink/test/javaApiOperators/GroupReduceITCase.java b/flink-tests/src/test/java/org/apache/flink/test/javaApiOperators/GroupReduceITCase.java
index 80c0a21..6f93722 100644
--- a/flink-tests/src/test/java/org/apache/flink/test/javaApiOperators/GroupReduceITCase.java
+++ b/flink-tests/src/test/java/org/apache/flink/test/javaApiOperators/GroupReduceITCase.java
@@ -998,44 +998,6 @@ public class GroupReduceITCase extends MultipleProgramsTestBase {
 		compareResultAsText(result, expected);
 	}
 
-	@Test
-	public void testJavaArraysAsListCollectionsWithinPojos() throws Exception {
-		/*
-		 * Test Java collections created via Arrays.asList() method within pojos ( == test kryo)
-		 */
-		final ExecutionEnvironment env = ExecutionEnvironment.getExecutionEnvironment();
-		env.setParallelism(1);
-
-		DataSet<CollectionDataSets.PojoWithCollection> ds = CollectionDataSets.getPojoWithArraysAsListCollection(env);
-		// f0.f0 is first integer
-		DataSet<String> reduceDs = ds.groupBy("key")
-				.reduceGroup(new GroupReducer7());
-		List<String> result = reduceDs.collect();
-
-		String expected = "callFor key 0 we got: pojo.a=apojo.a=bFor key 0 we got: pojo.a=a2pojo.a=b2\n";
-
-		compareResultAsText(result, expected);
-	}
-
-	@Test
-	public void testJavaUnmodifiableCollectionsWithinPojos() throws Exception {
-		/*
-		 * Test Java collections created via Collections.unmodifiable...() methods within pojos ( == test kryo)
-		 */
-		final ExecutionEnvironment env = ExecutionEnvironment.getExecutionEnvironment();
-		env.setParallelism(1);
-
-		DataSet<CollectionDataSets.PojoWithCollection> ds = CollectionDataSets.getPojoWithUnmodifiableCollection(env);
-		// f0.f0 is first integer
-		DataSet<String> reduceDs = ds.groupBy("key")
-				.reduceGroup(new GroupReducer7());
-		List<String> result = reduceDs.collect();
-
-		String expected = "callFor key 0 we got: pojo.a=apojo.a=bFor key 0 we got: pojo.a=a2pojo.a=b2\n";
-
-		compareResultAsText(result, expected);
-	}
-
 	public static class GroupReducer7 implements GroupReduceFunction<CollectionDataSets.PojoWithCollection, String> {
 		
 		@Override

http://git-wip-us.apache.org/repos/asf/flink/blob/5d2da128/flink-tests/src/test/java/org/apache/flink/test/javaApiOperators/util/CollectionDataSets.java
----------------------------------------------------------------------
diff --git a/flink-tests/src/test/java/org/apache/flink/test/javaApiOperators/util/CollectionDataSets.java b/flink-tests/src/test/java/org/apache/flink/test/javaApiOperators/util/CollectionDataSets.java
index 2bc232a..389a18f 100644
--- a/flink-tests/src/test/java/org/apache/flink/test/javaApiOperators/util/CollectionDataSets.java
+++ b/flink-tests/src/test/java/org/apache/flink/test/javaApiOperators/util/CollectionDataSets.java
@@ -723,101 +723,5 @@ public class CollectionDataSets {
 		return env.fromCollection(data);
 	}
 
-	public static DataSet<PojoWithCollection> getPojoWithArraysAsListCollection(ExecutionEnvironment env) {
-		List<PojoWithCollection> data = new ArrayList<>();
-
-		List<Pojo1> pojosList1 = Arrays.asList(
-			new Pojo1("a", "aa"),
-			new Pojo1("b", "bb")
-		);
-
-		List<Pojo1> pojosList2 = Arrays.asList(
-			new Pojo1("a2", "aa2"),
-			new Pojo1("b2", "bb2")
-		);
-
-		PojoWithCollection pwc1 = new PojoWithCollection();
-		pwc1.pojos = pojosList1;
-		pwc1.key = 0;
-		pwc1.bigInt = BigInteger.valueOf(Long.MAX_VALUE).multiply(BigInteger.TEN);
-		pwc1.scalaBigInt = BigInt.int2bigInt(10);
-		pwc1.bigDecimalKeepItNull = null;
-
-		// use calendar to make it stable across time zones
-		GregorianCalendar gcl1 = new GregorianCalendar(2033, 4, 18);
-		pwc1.sqlDate = new java.sql.Date(gcl1.getTimeInMillis());
-		Map<String, Integer> map = new HashMap<>();
-		map.put("someKey", 1); // map.put("anotherKey", 2); map.put("third", 3);
-		pwc1.mixed = Arrays.asList(
-			map,
-			new File(""),
-			"uhlala",
-			Arrays.asList(1, 2, 2, 3, 3, 3, 4, 4, 4, 4)  // to test Arrays.asList() with primitives
-		);
-
-		PojoWithCollection pwc2 = new PojoWithCollection();
-		pwc2.pojos = pojosList2;
-		pwc2.key = 0;
-		pwc2.bigInt = BigInteger.valueOf(Long.MAX_VALUE).multiply(BigInteger.TEN);
-		pwc2.scalaBigInt = BigInt.int2bigInt(31104000);
-		pwc2.bigDecimalKeepItNull = null;
-
-		GregorianCalendar gcl2 = new GregorianCalendar(1976, 4, 3);
-		pwc2.sqlDate = new java.sql.Date(gcl2.getTimeInMillis()); // 1976
-
-
-		data.add(pwc1);
-		data.add(pwc2);
-
-		return env.fromCollection(data);
-	}
-
-	public static DataSet<PojoWithCollection> getPojoWithUnmodifiableCollection(ExecutionEnvironment env) {
-		List<PojoWithCollection> data = new ArrayList<>();
-
-		List<Pojo1> pojosList1 = new ArrayList<>();
-		pojosList1.add(new Pojo1("a", "aa"));
-		pojosList1.add(new Pojo1("b", "bb"));
-
-		List<Pojo1> pojosList2 = new ArrayList<>();
-		pojosList2.add(new Pojo1("a2", "aa2"));
-		pojosList2.add(new Pojo1("b2", "bb2"));
-
-		PojoWithCollection pwc1 = new PojoWithCollection();
-		pwc1.pojos = Collections.unmodifiableList(pojosList1);
-		pwc1.key = 0;
-		pwc1.bigInt = BigInteger.valueOf(Long.MAX_VALUE).multiply(BigInteger.TEN);
-		pwc1.scalaBigInt = BigInt.int2bigInt(10);
-		pwc1.bigDecimalKeepItNull = null;
-
-		// use calendar to make it stable across time zones
-		GregorianCalendar gcl1 = new GregorianCalendar(2033, 4, 18);
-		pwc1.sqlDate = new java.sql.Date(gcl1.getTimeInMillis());
-		ArrayList<Object> mixedList = new ArrayList<>();
-		Map<String, Integer> map = new HashMap<>();
-		map.put("someKey", 1); // map.put("anotherKey", 2); map.put("third", 3);
-		mixedList.add(map);
-		mixedList.add(new File("/this/is/wrong"));
-		mixedList.add("uhlala");
-
-		pwc1.mixed = Collections.unmodifiableList(mixedList);
-
-		PojoWithCollection pwc2 = new PojoWithCollection();
-		pwc2.pojos = Collections.unmodifiableList(pojosList2);
-		pwc2.key = 0;
-		pwc2.bigInt = BigInteger.valueOf(Long.MAX_VALUE).multiply(BigInteger.TEN);
-		pwc2.scalaBigInt = BigInt.int2bigInt(31104000);
-		pwc2.bigDecimalKeepItNull = null;
-
-		GregorianCalendar gcl2 = new GregorianCalendar(1976, 4, 3);
-		pwc2.sqlDate = new java.sql.Date(gcl2.getTimeInMillis()); // 1976
-
-
-		data.add(pwc1);
-		data.add(pwc2);
-
-		return env.fromCollection(data);
-	}
-
 }