Repository: flink Updated Branches: refs/heads/master 3a4fc537d -> 727484986
[hotfix] Remove unnecessary ConfigOptions#key() calls Project: http://git-wip-us.apache.org/repos/asf/flink/repo Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/72748498 Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/72748498 Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/72748498 Branch: refs/heads/master Commit: 7274849861ac85dddb2d89f40f96b41d815836ec Parents: 448d7f0 Author: Ufuk Celebi <[email protected]> Authored: Fri Nov 4 14:25:13 2016 +0100 Committer: Ufuk Celebi <[email protected]> Committed: Mon Nov 7 11:12:13 2016 +0100 ---------------------------------------------------------------------- .../java/org/apache/flink/client/cli/DefaultCLI.java | 2 +- .../org/apache/flink/runtime/taskmanager/TaskTest.java | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flink/blob/72748498/flink-clients/src/main/java/org/apache/flink/client/cli/DefaultCLI.java ---------------------------------------------------------------------- diff --git a/flink-clients/src/main/java/org/apache/flink/client/cli/DefaultCLI.java b/flink-clients/src/main/java/org/apache/flink/client/cli/DefaultCLI.java index 41737d0..e94c2f9 100644 --- a/flink-clients/src/main/java/org/apache/flink/client/cli/DefaultCLI.java +++ b/flink-clients/src/main/java/org/apache/flink/client/cli/DefaultCLI.java @@ -67,7 +67,7 @@ public class DefaultCLI implements CustomCommandLine<StandaloneClusterClient> { if (commandLine.hasOption(CliFrontendParser.ZOOKEEPER_NAMESPACE_OPTION.getOpt())) { String zkNamespace = commandLine.getOptionValue(CliFrontendParser.ZOOKEEPER_NAMESPACE_OPTION.getOpt()); - config.setString(HighAvailabilityOptions.HA_CLUSTER_ID.key(), zkNamespace); + config.setString(HighAvailabilityOptions.HA_CLUSTER_ID, zkNamespace); } StandaloneClusterDescriptor descriptor = new StandaloneClusterDescriptor(config); http://git-wip-us.apache.org/repos/asf/flink/blob/72748498/flink-runtime/src/test/java/org/apache/flink/runtime/taskmanager/TaskTest.java ---------------------------------------------------------------------- diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/taskmanager/TaskTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/taskmanager/TaskTest.java index 761eaa2..382e5c1 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/taskmanager/TaskTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/taskmanager/TaskTest.java @@ -603,8 +603,8 @@ public class TaskTest extends TestLogger { @Test public void testInterruptableSharedLockInInvokeAndCancel() throws Exception { Configuration config = new Configuration(); - config.setLong(TaskManagerOptions.TASK_CANCELLATION_INTERVAL.key(), 5); - config.setLong(TaskManagerOptions.TASK_CANCELLATION_TIMEOUT.key(), 50); + config.setLong(TaskManagerOptions.TASK_CANCELLATION_INTERVAL, 5); + config.setLong(TaskManagerOptions.TASK_CANCELLATION_TIMEOUT, 50); Task task = createTask(InvokableInterruptableSharedLockInInvokeAndCancel.class, config); task.startTaskThread(); @@ -627,8 +627,8 @@ public class TaskTest extends TestLogger { @Test public void testFatalErrorAfterUninterruptibleInvoke() throws Exception { Configuration config = new Configuration(); - config.setLong(TaskManagerOptions.TASK_CANCELLATION_INTERVAL.key(), 5); - config.setLong(TaskManagerOptions.TASK_CANCELLATION_TIMEOUT.key(), 50); + config.setLong(TaskManagerOptions.TASK_CANCELLATION_INTERVAL, 5); + config.setLong(TaskManagerOptions.TASK_CANCELLATION_TIMEOUT, 50); Task task = createTask(InvokableUninterruptibleBlockingInvoke.class, config); @@ -664,8 +664,8 @@ public class TaskTest extends TestLogger { long timeout = interval + 19292; Configuration config = new Configuration(); - config.setLong(TaskManagerOptions.TASK_CANCELLATION_INTERVAL.key(), interval); - config.setLong(TaskManagerOptions.TASK_CANCELLATION_TIMEOUT.key(), timeout); + config.setLong(TaskManagerOptions.TASK_CANCELLATION_INTERVAL, interval); + config.setLong(TaskManagerOptions.TASK_CANCELLATION_TIMEOUT, timeout); ExecutionConfig executionConfig = new ExecutionConfig(); executionConfig.setTaskCancellationInterval(interval + 1337);
