tez-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject tez git commit: TEZ-2754. Tez UI: StartTime & EndTime is not displayed with right format in Graphical View (sree)
Date Thu, 03 Sep 2015 08:17:47 GMT
Repository: tez
Updated Branches:
  refs/heads/branch-0.7 5dc0770fe -> 138b73000


TEZ-2754. Tez UI: StartTime & EndTime is not displayed with right format in Graphical
View (sree)

(cherry picked from commit a0d59c379aed7fc4f2565eb75af755088921a5a1)


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

Branch: refs/heads/branch-0.7
Commit: 138b73000dc1a78ca0d7570460ef0be7e20e505b
Parents: 5dc0770
Author: Sreenath Somarajapuram <sree@apache.org>
Authored: Thu Sep 3 12:25:15 2015 +0530
Committer: Sreenath Somarajapuram <sree@apache.org>
Committed: Thu Sep 3 12:52:02 2015 +0530

----------------------------------------------------------------------
 CHANGES.txt                                              |  1 +
 .../webapp/app/scripts/components/dag-view/graph-view.js | 11 +++++++----
 2 files changed, 8 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tez/blob/138b7300/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 63860eb..ecaee41 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -6,6 +6,7 @@ Release 0.7.1: Unreleased
 INCOMPATIBLE CHANGES
 
 ALL CHANGES:
+  TEZ-2754. Tez UI: StartTime & EndTime is not displayed with right format in Graphical
View
   TEZ-2731. Fix Tez GenericCounter performance bottleneck
   TEZ-2752. logUnsuccessful completion in Attempt should write original finish
   time to ATS

http://git-wip-us.apache.org/repos/asf/tez/blob/138b7300/tez-ui/src/main/webapp/app/scripts/components/dag-view/graph-view.js
----------------------------------------------------------------------
diff --git a/tez-ui/src/main/webapp/app/scripts/components/dag-view/graph-view.js b/tez-ui/src/main/webapp/app/scripts/components/dag-view/graph-view.js
index 3270ad9..1210bd4 100644
--- a/tez-ui/src/main/webapp/app/scripts/components/dag-view/graph-view.js
+++ b/tez-ui/src/main/webapp/app/scripts/components/dag-view/graph-view.js
@@ -403,11 +403,14 @@ App.DagViewComponent.graphView = (function (){
         _component.get('vertexProperties').forEach(function (property) {
           var value = {};
 
-          if(property.contentPath) {
-            value = d.get('data.' + property.contentPath);
-          }
-          else if(property.getCellContent && !property.tableCellViewClass) {
+          if(property.getCellContent && !property.tableCellViewClass) {
             value = property.getCellContent(d.get('data'));
+            if(value && value.displayText != undefined) {
+              value = value.displayText;
+            }
+          }
+          else if(property.contentPath) {
+            value = d.get('data.' + property.contentPath);
           }
 
           value = App.Helpers.number.formatNumThousands(value);


Mime
View raw message