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/17 20:19:40 UTC
[08/51] [abbrv] flink git commit: [FLINK-2547] [web dashboard]
Updated web dashboard after request/response changes
[FLINK-2547] [web dashboard] Updated web dashboard after request/response changes
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/562573df
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/562573df
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/562573df
Branch: refs/heads/master
Commit: 562573df790f4c07f456e2999f884d865a4c4f7c
Parents: ff28981
Author: Piotr Godek <pi...@gmail.com>
Authored: Wed Aug 19 14:46:41 2015 +0200
Committer: Stephan Ewen <se...@apache.org>
Committed: Thu Sep 17 14:21:49 2015 +0200
----------------------------------------------------------------------
.../app/partials/jobs/job.plan.node.jade | 24 ++++-----
.../web-dashboard/app/scripts/index.coffee | 2 +-
.../app/scripts/modules/jobs/jobs.dir.coffee | 2 +-
.../app/scripts/modules/jobs/jobs.svc.coffee | 6 +--
flink-runtime-web/web-dashboard/web/js/index.js | 57 +++++++-------------
.../web/partials/jobs/job.plan.node.html | 25 ++++-----
6 files changed, 44 insertions(+), 72 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/562573df/flink-runtime-web/web-dashboard/app/partials/jobs/job.plan.node.jade
----------------------------------------------------------------------
diff --git a/flink-runtime-web/web-dashboard/app/partials/jobs/job.plan.node.jade b/flink-runtime-web/web-dashboard/app/partials/jobs/job.plan.node.jade
index 82e61db..0ddd457 100644
--- a/flink-runtime-web/web-dashboard/app/partials/jobs/job.plan.node.jade
+++ b/flink-runtime-web/web-dashboard/app/partials/jobs/job.plan.node.jade
@@ -39,10 +39,6 @@
th Status
tbody
- tr(colspan="2")
- td
- center
- i WARNING! This is a sample
tr(ng-repeat="vertex in node.vertex.groupvertex.groupmembers")
td {{vertex.vertexname}}
td
@@ -52,25 +48,25 @@
.row(ng-if="node")
.col-sm-6.col-md-4
- table.table.table-properties(ng-if="node.global_properties")
+ table.table.table-properties(ng-if="node.optimizer_properties.global_properties")
thead
tr
th(colspan="2")
| Global Data Properties
tbody
- tr(ng-repeat="property in node.global_properties")
+ tr(ng-repeat="property in node.optimizer_properties.global_properties")
td {{property.name}}
td(table-property value="property.value")
- table.table.table-properties(ng-if="node.local_properties")
+ table.table.table-properties(ng-if="node.optimizer_properties.local_properties")
thead
tr
th(colspan="2")
| Local Data Properties
tbody
- tr(ng-repeat="property in node.local_properties")
+ tr(ng-repeat="property in node.optimizer_properties.local_properties")
td {{property.name}}
td(table-property value="property.value")
@@ -108,37 +104,37 @@
td(table-property value="node.parallelism")
- table.table.table-properties(ng-if="node.estimates")
+ table.table.table-properties(ng-if="node.optimizer_properties.estimates")
thead
tr
th(colspan="2")
| Size Estimates
tbody
- tr(ng-repeat="property in node.estimates")
+ tr(ng-repeat="property in node.optimizer_properties.estimates")
td {{property.name}}
td(table-property value="property.value")
.col-sm-6.col-md-4
.visible-xs.visible-sm
- table.table.table-properties(ng-if="node.estimates")
+ table.table.table-properties(ng-if="node.optimizer_properties.estimates")
thead
tr
th(colspan="2")
| Size Estimates
tbody
- tr(ng-repeat="property in node.estimates")
+ tr(ng-repeat="property in node.optimizer_properties.estimates")
td {{property.name}}
td(table-property value="property.value")
- table.table.table-properties(ng-if="node.costs")
+ table.table.table-properties(ng-if="node.optimizer_properties.costs")
thead
tr
th(colspan="2")
| Cost Estimates
tbody
- tr(ng-repeat="property in node.costs")
+ tr(ng-repeat="property in node.optimizer_properties.costs")
td {{property.name}}
td(table-property value="property.value")
http://git-wip-us.apache.org/repos/asf/flink/blob/562573df/flink-runtime-web/web-dashboard/app/scripts/index.coffee
----------------------------------------------------------------------
diff --git a/flink-runtime-web/web-dashboard/app/scripts/index.coffee b/flink-runtime-web/web-dashboard/app/scripts/index.coffee
index 00d828e..3cea143 100644
--- a/flink-runtime-web/web-dashboard/app/scripts/index.coffee
+++ b/flink-runtime-web/web-dashboard/app/scripts/index.coffee
@@ -86,7 +86,7 @@ angular.module('flinkApp', ['ui.router', 'angularMoment'])
controller: 'JobPlanController'
.state "single-job.plan.node",
- url: "/{nodeid:int}"
+ url: "/vertex/{nodeid}"
views:
node:
templateUrl: "partials/jobs/job.plan.node.html"
http://git-wip-us.apache.org/repos/asf/flink/blob/562573df/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 ee309ad..f67ec32 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
@@ -239,7 +239,7 @@ angular.module('flinkApp')
# creates the label of a node, in info is stored, whether it is a special node (like a mirror in an iteration)
createLabelNode = (el, info, maxW, maxH) ->
- labelValue = "<a href='#/jobs/" + jobid + "/" + el.id + "' class='node-label " + getNodeType(el, info) + "'>"
+ labelValue = "<a href='#/jobs/" + jobid + "/vertex/" + el.id + "' class='node-label " + getNodeType(el, info) + "'>"
# Nodename
if info is "mirror"
http://git-wip-us.apache.org/repos/asf/flink/blob/562573df/flink-runtime-web/web-dashboard/app/scripts/modules/jobs/jobs.svc.coffee
----------------------------------------------------------------------
diff --git a/flink-runtime-web/web-dashboard/app/scripts/modules/jobs/jobs.svc.coffee b/flink-runtime-web/web-dashboard/app/scripts/modules/jobs/jobs.svc.coffee
index 3c5c385..6640d60 100644
--- a/flink-runtime-web/web-dashboard/app/scripts/modules/jobs/jobs.svc.coffee
+++ b/flink-runtime-web/web-dashboard/app/scripts/modules/jobs/jobs.svc.coffee
@@ -135,8 +135,6 @@ angular.module('flinkApp')
@getNode = (nodeid) ->
seekNode = (nodeid, data) ->
- nodeid = parseInt(nodeid)
-
for node in data
return node if node.id is nodeid
sub = seekNode(nodeid, node.step_function) if node.step_function
@@ -157,8 +155,8 @@ angular.module('flinkApp')
$q.all([deferreds.plan.promise, deferreds.job.promise]).then (data) =>
foundNode = seekNode(nodeid, currentPlan.nodes)
- # TODO link to real vertex. for now there is no way to get the right one, so we are showing the first one - just for testing
- @getVertex(currentJob.jid, currentJob.oldV.groupvertices[0].groupvertexid).then (vertex) ->
+ # @getVertex(currentJob.jid, currentJob.oldV.groupvertices[0].groupvertexid).then (vertex) ->
+ @getVertex(currentJob.jid, nodeid).then (vertex) ->
foundNode.vertex = vertex
deferred.resolve(foundNode)