[FLINK-1165] [java-api] Rename "createCollectionEnvironment" to not break existing APIs.
Project: http://git-wip-us.apache.org/repos/asf/flink/repo Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/aeec128b Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/aeec128b Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/aeec128b Branch: refs/heads/master Commit: aeec128b773fca60cbf2ebafe812c5898da4a754 Parents: 36039b6 Author: Stephan Ewen <se...@apache.org> Authored: Tue Feb 3 12:45:04 2015 +0100 Committer: Stephan Ewen <se...@apache.org> Committed: Tue Feb 3 12:45:04 2015 +0100 ---------------------------------------------------------------------- .../flink/examples/java/misc/CollectionExecutionExample.java | 2 +- .../java/org/apache/flink/api/java/ExecutionEnvironment.java | 2 +- .../common/operators/CollectionExecutionAccumulatorsTest.java | 2 +- .../api/common/operators/CollectionExecutionIterationTest.java | 6 +++--- .../CollectionExecutionWithBroadcastVariableTest.java | 4 ++-- .../org/apache/flink/api/scala/ExecutionEnvironment.scala | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flink/blob/aeec128b/flink-examples/flink-java-examples/src/main/java/org/apache/flink/examples/java/misc/CollectionExecutionExample.java ---------------------------------------------------------------------- diff --git a/flink-examples/flink-java-examples/src/main/java/org/apache/flink/examples/java/misc/CollectionExecutionExample.java b/flink-examples/flink-java-examples/src/main/java/org/apache/flink/examples/java/misc/CollectionExecutionExample.java index 85aaff5..4657af6 100644 --- a/flink-examples/flink-java-examples/src/main/java/org/apache/flink/examples/java/misc/CollectionExecutionExample.java +++ b/flink-examples/flink-java-examples/src/main/java/org/apache/flink/examples/java/misc/CollectionExecutionExample.java @@ -72,7 +72,7 @@ public class CollectionExecutionExample { } public static void main(String[] args) throws Exception { // initialize a new Collection-based execution environment - final ExecutionEnvironment env = ExecutionEnvironment.createCollectionEnvironment(); + final ExecutionEnvironment env = ExecutionEnvironment.createCollectionsEnvironment(); // create objects for users and emails User[] usersArray = { new User(1, "Peter"), new User(2, "John"), new User(3, "Bill") }; http://git-wip-us.apache.org/repos/asf/flink/blob/aeec128b/flink-java/src/main/java/org/apache/flink/api/java/ExecutionEnvironment.java ---------------------------------------------------------------------- diff --git a/flink-java/src/main/java/org/apache/flink/api/java/ExecutionEnvironment.java b/flink-java/src/main/java/org/apache/flink/api/java/ExecutionEnvironment.java index d0f3c41..05218e5 100644 --- a/flink-java/src/main/java/org/apache/flink/api/java/ExecutionEnvironment.java +++ b/flink-java/src/main/java/org/apache/flink/api/java/ExecutionEnvironment.java @@ -865,7 +865,7 @@ public abstract class ExecutionEnvironment { * memory. Degree of parallelism will always be 1. This is useful during implementation and for debugging. * @return A Collection Environment */ - public static CollectionEnvironment createCollectionEnvironment(){ + public static CollectionEnvironment createCollectionsEnvironment(){ CollectionEnvironment ce = new CollectionEnvironment(); ce.setDegreeOfParallelism(1); return ce; http://git-wip-us.apache.org/repos/asf/flink/blob/aeec128b/flink-java/src/test/java/org/apache/flink/api/common/operators/CollectionExecutionAccumulatorsTest.java ---------------------------------------------------------------------- diff --git a/flink-java/src/test/java/org/apache/flink/api/common/operators/CollectionExecutionAccumulatorsTest.java b/flink-java/src/test/java/org/apache/flink/api/common/operators/CollectionExecutionAccumulatorsTest.java index 00b79cb..a933180 100644 --- a/flink-java/src/test/java/org/apache/flink/api/common/operators/CollectionExecutionAccumulatorsTest.java +++ b/flink-java/src/test/java/org/apache/flink/api/common/operators/CollectionExecutionAccumulatorsTest.java @@ -37,7 +37,7 @@ public class CollectionExecutionAccumulatorsTest { try { final int NUM_ELEMENTS = 100; - ExecutionEnvironment env = ExecutionEnvironment.createCollectionEnvironment(); + ExecutionEnvironment env = ExecutionEnvironment.createCollectionsEnvironment(); env.generateSequence(1, NUM_ELEMENTS) .map(new CountingMapper()) http://git-wip-us.apache.org/repos/asf/flink/blob/aeec128b/flink-java/src/test/java/org/apache/flink/api/common/operators/CollectionExecutionIterationTest.java ---------------------------------------------------------------------- diff --git a/flink-java/src/test/java/org/apache/flink/api/common/operators/CollectionExecutionIterationTest.java b/flink-java/src/test/java/org/apache/flink/api/common/operators/CollectionExecutionIterationTest.java index 7c87755..6ca0eb1 100644 --- a/flink-java/src/test/java/org/apache/flink/api/common/operators/CollectionExecutionIterationTest.java +++ b/flink-java/src/test/java/org/apache/flink/api/common/operators/CollectionExecutionIterationTest.java @@ -44,7 +44,7 @@ public class CollectionExecutionIterationTest implements java.io.Serializable { @Test public void testBulkIteration() { try { - ExecutionEnvironment env = ExecutionEnvironment.createCollectionEnvironment(); + ExecutionEnvironment env = ExecutionEnvironment.createCollectionsEnvironment(); IterativeDataSet<Integer> iteration = env.fromElements(1).iterate(10); @@ -67,7 +67,7 @@ public class CollectionExecutionIterationTest implements java.io.Serializable { @Test public void testBulkIterationWithTerminationCriterion() { try { - ExecutionEnvironment env = ExecutionEnvironment.createCollectionEnvironment(); + ExecutionEnvironment env = ExecutionEnvironment.createCollectionsEnvironment(); IterativeDataSet<Integer> iteration = env.fromElements(1).iterate(100); @@ -98,7 +98,7 @@ public class CollectionExecutionIterationTest implements java.io.Serializable { @Test public void testDeltaIteration() { try { - ExecutionEnvironment env = ExecutionEnvironment.createCollectionEnvironment(); + ExecutionEnvironment env = ExecutionEnvironment.createCollectionsEnvironment(); @SuppressWarnings("unchecked") DataSet<Tuple2<Integer, Integer>> solInput = env.fromElements( http://git-wip-us.apache.org/repos/asf/flink/blob/aeec128b/flink-java/src/test/java/org/apache/flink/api/common/operators/CollectionExecutionWithBroadcastVariableTest.java ---------------------------------------------------------------------- diff --git a/flink-java/src/test/java/org/apache/flink/api/common/operators/CollectionExecutionWithBroadcastVariableTest.java b/flink-java/src/test/java/org/apache/flink/api/common/operators/CollectionExecutionWithBroadcastVariableTest.java index c090065..2cdd68f 100644 --- a/flink-java/src/test/java/org/apache/flink/api/common/operators/CollectionExecutionWithBroadcastVariableTest.java +++ b/flink-java/src/test/java/org/apache/flink/api/common/operators/CollectionExecutionWithBroadcastVariableTest.java @@ -42,7 +42,7 @@ public class CollectionExecutionWithBroadcastVariableTest { @Test public void testUnaryOp() { try { - ExecutionEnvironment env = ExecutionEnvironment.createCollectionEnvironment(); + ExecutionEnvironment env = ExecutionEnvironment.createCollectionsEnvironment(); DataSet<String> bcData = env.fromElements(SUFFIX); @@ -68,7 +68,7 @@ public class CollectionExecutionWithBroadcastVariableTest { @Test public void testBinaryOp() { try { - ExecutionEnvironment env = ExecutionEnvironment.createCollectionEnvironment(); + ExecutionEnvironment env = ExecutionEnvironment.createCollectionsEnvironment(); DataSet<String> bcData = env.fromElements(SUFFIX); DataSet<String> inData = env.fromElements(TEST_DATA); http://git-wip-us.apache.org/repos/asf/flink/blob/aeec128b/flink-scala/src/main/scala/org/apache/flink/api/scala/ExecutionEnvironment.scala ---------------------------------------------------------------------- diff --git a/flink-scala/src/main/scala/org/apache/flink/api/scala/ExecutionEnvironment.scala b/flink-scala/src/main/scala/org/apache/flink/api/scala/ExecutionEnvironment.scala index 4185edf..63e5ba1 100644 --- a/flink-scala/src/main/scala/org/apache/flink/api/scala/ExecutionEnvironment.scala +++ b/flink-scala/src/main/scala/org/apache/flink/api/scala/ExecutionEnvironment.scala @@ -493,7 +493,7 @@ object ExecutionEnvironment { * memory. This is useful during implementation and for debugging. * @return */ - def createCollectionEnvironment: ExecutionEnvironment = { + def createCollectionsEnvironment: ExecutionEnvironment = { new ExecutionEnvironment(new CollectionEnvironment) }
