You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by gr...@apache.org on 2016/11/30 21:49:22 UTC
[5/5] flink git commit: [FLINK-3680] [web frontend] Remove "(not
set)" text in the Job Plan UI
[FLINK-3680] [web frontend] Remove "(not set)" text in the Job Plan UI
This closes #2457
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/7b5d769a
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/7b5d769a
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/7b5d769a
Branch: refs/heads/release-1.1
Commit: 7b5d769aded2b653ac4e573bf0d9c63e250ef684
Parents: 7de7bfd
Author: Ivan Mushketyk <iv...@gmail.com>
Authored: Wed Nov 30 15:31:39 2016 -0500
Committer: Greg Hogan <co...@greghogan.com>
Committed: Wed Nov 30 15:31:39 2016 -0500
----------------------------------------------------------------------
.../web-dashboard/app/scripts/modules/jobs/jobs.dir.coffee | 2 +-
.../apache/flink/runtime/jobgraph/jsonplan/JsonPlanGenerator.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/7b5d769a/flink-runtime-web/web-dashboard/app/scripts/modules/jobs/jobs.dir.coffee
----------------------------------------------------------------------
diff --git a/flink-runtime-web/web-dashboard/app/scripts/modules/jobs/jobs.dir.coffee b/flink-runtime-web/web-dashboard/app/scripts/modules/jobs/jobs.dir.coffee
index f6314ee..05a7e15 100644
--- a/flink-runtime-web/web-dashboard/app/scripts/modules/jobs/jobs.dir.coffee
+++ b/flink-runtime-web/web-dashboard/app/scripts/modules/jobs/jobs.dir.coffee
@@ -281,7 +281,7 @@ angular.module('flinkApp')
# Otherwise add infos
labelValue += "<h5>" + info + " Node</h5>" if isSpecialIterationNode(info)
labelValue += "<h5>Parallelism: " + el.parallelism + "</h5>" unless el.parallelism is ""
- labelValue += "<h5>Operation: " + shortenString(el.operator_strategy) + "</h5>" unless el.operator is `undefined`
+ labelValue += "<h5>Operation: " + shortenString(el.operator_strategy) + "</h5>" unless el.operator is `undefined` or not el.operator_strategy
# labelValue += "</a>"
labelValue += "</div>"
http://git-wip-us.apache.org/repos/asf/flink/blob/7b5d769a/flink-runtime/src/main/java/org/apache/flink/runtime/jobgraph/jsonplan/JsonPlanGenerator.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/jobgraph/jsonplan/JsonPlanGenerator.java b/flink-runtime/src/main/java/org/apache/flink/runtime/jobgraph/jsonplan/JsonPlanGenerator.java
index bd5357e..261e729 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/jobgraph/jsonplan/JsonPlanGenerator.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/jobgraph/jsonplan/JsonPlanGenerator.java
@@ -32,7 +32,7 @@ import java.util.List;
public class JsonPlanGenerator {
- private static final String NOT_SET = "(not set)";
+ private static final String NOT_SET = "";
private static final String EMPTY = "{}";
public static String generatePlan(JobGraph jg) {