You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tez.apache.org by sr...@apache.org on 2016/01/20 18:05:29 UTC

[03/50] [abbrv] tez git commit: TEZ-3011. Link Vertex Name in Dag Tasks/Task Attempts to Vertex (jeagles)

TEZ-3011. Link Vertex Name in Dag Tasks/Task Attempts to Vertex (jeagles)


Project: http://git-wip-us.apache.org/repos/asf/tez/repo
Commit: http://git-wip-us.apache.org/repos/asf/tez/commit/c34c54f7
Tree: http://git-wip-us.apache.org/repos/asf/tez/tree/c34c54f7
Diff: http://git-wip-us.apache.org/repos/asf/tez/diff/c34c54f7

Branch: refs/heads/TEZ-2980
Commit: c34c54f70214560ed20cbb885da90230346b9e47
Parents: 6486435
Author: Jonathan Eagles <je...@yahoo-inc.com>
Authored: Fri Dec 18 01:44:26 2015 -0600
Committer: Jonathan Eagles <je...@yahoo-inc.com>
Committed: Fri Dec 18 01:45:36 2015 -0600

----------------------------------------------------------------------
 CHANGES.txt                                                 | 2 ++
 .../app/scripts/controllers/dag-task-attempts-controller.js | 9 +++++++--
 tez-ui/src/main/webapp/app/scripts/controllers/dag_tasks.js | 9 +++++++--
 3 files changed, 16 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tez/blob/c34c54f7/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 17142ce..0ad2203 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -10,6 +10,7 @@ INCOMPATIBLE CHANGES
   TEZ-604. Revert temporary changes made in TEZ-603 to kill the provided tez session, if running a MapReduce job.
 
 ALL CHANGES:
+  TEZ-3011. Link Vertex Name in Dag Tasks/Task Attempts to Vertex
   TEZ-3006. Remove unused import in TestHistoryParser.
   TEZ-2910. Set caller context for tracing ( integrate with HDFS-9184 ).
   TEZ-2976. Recovery fails when InputDescriptor is changed during input initialization.
@@ -296,6 +297,7 @@ INCOMPATIBLE CHANGES
   TEZ-2949. Allow duplicate dag names within session for Tez.
 
 ALL CHANGES
+  TEZ-3011. Link Vertex Name in Dag Tasks/Task Attempts to Vertex
   TEZ-2538. ADDITIONAL_SPILL_COUNT wrongly populated for DefaultSorter with multiple partitions.
   TEZ-3006. Remove unused import in TestHistoryParser.
   TEZ-2979. FlakyTest: org.apache.tez.history.TestHistoryParser.

http://git-wip-us.apache.org/repos/asf/tez/blob/c34c54f7/tez-ui/src/main/webapp/app/scripts/controllers/dag-task-attempts-controller.js
----------------------------------------------------------------------
diff --git a/tez-ui/src/main/webapp/app/scripts/controllers/dag-task-attempts-controller.js b/tez-ui/src/main/webapp/app/scripts/controllers/dag-task-attempts-controller.js
index db5b1fd..7a7af91 100644
--- a/tez-ui/src/main/webapp/app/scripts/controllers/dag-task-attempts-controller.js
+++ b/tez-ui/src/main/webapp/app/scripts/controllers/dag-task-attempts-controller.js
@@ -161,10 +161,15 @@ App.DagTaskAttemptsController = App.TablePageController.extend({
       {
         id: 'vertexName',
         headerCellName: 'Vertex Name',
+        templateName: 'components/basic-table/linked-cell',
         contentPath: 'vertexID',
         getCellContent: function(row) {
-          var vertexId = row.get('vertexID');
-          return vertexIdToNameMap[vertexId] || vertexId;
+          var vertexId = row.get('vertexID') || '';
+          return {
+            linkTo: 'vertex',
+            displayText: vertexIdToNameMap[vertexId] || vertexId,
+            entityId: vertexId
+          };
         },
         getSearchValue: function (row) {
           var vertexId = row.get('vertexID');

http://git-wip-us.apache.org/repos/asf/tez/blob/c34c54f7/tez-ui/src/main/webapp/app/scripts/controllers/dag_tasks.js
----------------------------------------------------------------------
diff --git a/tez-ui/src/main/webapp/app/scripts/controllers/dag_tasks.js b/tez-ui/src/main/webapp/app/scripts/controllers/dag_tasks.js
index 8ab20e3..2413a24 100644
--- a/tez-ui/src/main/webapp/app/scripts/controllers/dag_tasks.js
+++ b/tez-ui/src/main/webapp/app/scripts/controllers/dag_tasks.js
@@ -126,10 +126,15 @@ App.DagTasksController = App.TablePageController.extend({
       {
         id: 'vertexName',
         headerCellName: 'Vertex Name',
+        templateName: 'components/basic-table/linked-cell',
         contentPath: 'vertexID',
         getCellContent: function(row) {
-          var vertexId = row.get('vertexID');
-          return vertexIdToNameMap[vertexId] || vertexId;
+          var vertexId = row.get('vertexID') || '';
+          return {
+            linkTo: 'vertex',
+            displayText: vertexIdToNameMap[vertexId] || vertexId,
+            entityId: vertexId
+          };
         },
         getSearchValue: function(row) {
           var vertexId = row.get('vertexID');