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 2015/09/07 15:19:21 UTC
flink git commit: [FLINK-2625] Pass configuration properly to
JobGraphGenerator
Repository: flink
Updated Branches:
refs/heads/master 491146281 -> 8a8493721
[FLINK-2625] Pass configuration properly to JobGraphGenerator
LocalExecutor and Client now pass Configuration to JobGraphGenerator.
This closes #1095
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/8a849372
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/8a849372
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/8a849372
Branch: refs/heads/master
Commit: 8a84937215ea575fa94a00d11c2517902d252756
Parents: 4911462
Author: Greg Hogan <co...@greghogan.com>
Authored: Sat Sep 5 09:17:43 2015 -0400
Committer: Stephan Ewen <se...@apache.org>
Committed: Mon Sep 7 10:34:17 2015 +0200
----------------------------------------------------------------------
.../src/main/java/org/apache/flink/client/LocalExecutor.java | 6 ++++--
.../src/main/java/org/apache/flink/client/program/Client.java | 2 +-
.../test/java/org/apache/flink/client/program/ClientTest.java | 2 +-
3 files changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/8a849372/flink-clients/src/main/java/org/apache/flink/client/LocalExecutor.java
----------------------------------------------------------------------
diff --git a/flink-clients/src/main/java/org/apache/flink/client/LocalExecutor.java b/flink-clients/src/main/java/org/apache/flink/client/LocalExecutor.java
index 83e2ee4..cf08e0a 100644
--- a/flink-clients/src/main/java/org/apache/flink/client/LocalExecutor.java
+++ b/flink-clients/src/main/java/org/apache/flink/client/LocalExecutor.java
@@ -169,10 +169,12 @@ public class LocalExecutor extends PlanExecutor {
}
try {
- Optimizer pc = new Optimizer(new DataStatistics(), this.flink.configuration());
+ Configuration configuration = this.flink.configuration();
+
+ Optimizer pc = new Optimizer(new DataStatistics(), configuration);
OptimizedPlan op = pc.compile(plan);
- JobGraphGenerator jgg = new JobGraphGenerator();
+ JobGraphGenerator jgg = new JobGraphGenerator(configuration);
JobGraph jobGraph = jgg.compileJobGraph(op);
boolean sysoutPrint = isPrintingStatusDuringExecution();
http://git-wip-us.apache.org/repos/asf/flink/blob/8a849372/flink-clients/src/main/java/org/apache/flink/client/program/Client.java
----------------------------------------------------------------------
diff --git a/flink-clients/src/main/java/org/apache/flink/client/program/Client.java b/flink-clients/src/main/java/org/apache/flink/client/program/Client.java
index 2e9ba18..e7464c8 100644
--- a/flink-clients/src/main/java/org/apache/flink/client/program/Client.java
+++ b/flink-clients/src/main/java/org/apache/flink/client/program/Client.java
@@ -252,7 +252,7 @@ public class Client {
if (optPlan instanceof StreamingPlan) {
job = ((StreamingPlan) optPlan).getJobGraph();
} else {
- JobGraphGenerator gen = new JobGraphGenerator();
+ JobGraphGenerator gen = new JobGraphGenerator(this.configuration);
job = gen.compileJobGraph((OptimizedPlan) optPlan);
}
http://git-wip-us.apache.org/repos/asf/flink/blob/8a849372/flink-clients/src/test/java/org/apache/flink/client/program/ClientTest.java
----------------------------------------------------------------------
diff --git a/flink-clients/src/test/java/org/apache/flink/client/program/ClientTest.java b/flink-clients/src/test/java/org/apache/flink/client/program/ClientTest.java
index a4b8acb..bc898b3 100644
--- a/flink-clients/src/test/java/org/apache/flink/client/program/ClientTest.java
+++ b/flink-clients/src/test/java/org/apache/flink/client/program/ClientTest.java
@@ -111,7 +111,7 @@ public class ClientTest {
whenNew(Optimizer.class).withArguments(any(DataStatistics.class), any(CostEstimator.class), any(Configuration.class)).thenReturn(this.compilerMock);
when(compilerMock.compile(planMock)).thenReturn(optimizedPlanMock);
- whenNew(JobGraphGenerator.class).withNoArguments().thenReturn(generatorMock);
+ whenNew(JobGraphGenerator.class).withAnyArguments().thenReturn(generatorMock);
when(generatorMock.compileJobGraph(optimizedPlanMock)).thenReturn(jobGraph);
try {