Repository: tez Updated Branches: refs/heads/branch-0.7 88cbd2edb -> 2f58d39b3
TEZ-3011. Link Vertex Name in Dag Tasks/Task Attempts to Vertex (jeagles) (cherry picked from commit c34c54f70214560ed20cbb885da90230346b9e47) Project: http://git-wip-us.apache.org/repos/asf/tez/repo Commit: http://git-wip-us.apache.org/repos/asf/tez/commit/2f58d39b Tree: http://git-wip-us.apache.org/repos/asf/tez/tree/2f58d39b Diff: http://git-wip-us.apache.org/repos/asf/tez/diff/2f58d39b Branch: refs/heads/branch-0.7 Commit: 2f58d39b3b24d5717112a9b82d1be4df2af0cbd3 Parents: 88cbd2e Author: Jonathan Eagles <[email protected]> Authored: Fri Dec 18 01:44:26 2015 -0600 Committer: Jonathan Eagles <[email protected]> Committed: Fri Dec 18 01:48:44 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/2f58d39b/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 7eefa07..1a8471b 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -7,6 +7,8 @@ INCOMPATIBLE CHANGES ALL CHANGES TEZ-2538. ADDITIONAL_SPILL_COUNT wrongly populated for DefaultSorter with multiple partitions. +ALL CHANGES: + TEZ-3011. Link Vertex Name in Dag Tasks/Task Attempts to Vertex TEZ-3006. Remove unused import in TestHistoryParser. TEZ-2918. Make progress notifications in IOs TEZ-2979. FlakyTest: org.apache.tez.history.TestHistoryParser. http://git-wip-us.apache.org/repos/asf/tez/blob/2f58d39b/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/2f58d39b/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');
