tez-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rbalamo...@apache.org
Subject tez git commit: TEZ-2098. Tez UI: Dag details should be the default page for dag, fix invalid time entries for failed Vertices (pramachandran via rbalamohan)
Date Fri, 13 Feb 2015 10:12:54 GMT
Repository: tez
Updated Branches:
  refs/heads/branch-0.6 d6126aaca -> d26b8b2f2


TEZ-2098. Tez UI: Dag details should be the default page for dag, fix invalid time entries
for failed Vertices (pramachandran via rbalamohan)

(cherry picked from commit b26fdfe7f63553f3c0abc14e30547aebb049f16b)


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

Branch: refs/heads/branch-0.6
Commit: d26b8b2f2ffe99baa87ae49146989a959e7791f7
Parents: d6126aa
Author: Rajesh Balamohan <rbalamohan@hortonworks.com>
Authored: Fri Feb 13 15:39:40 2015 +0530
Committer: Rajesh Balamohan <rbalamohan@hortonworks.com>
Committed: Fri Feb 13 15:42:09 2015 +0530

----------------------------------------------------------------------
 CHANGES.txt                                                    | 1 +
 .../src/main/webapp/app/scripts/controllers/dags_controller.js | 2 +-
 tez-ui/src/main/webapp/app/scripts/helpers/date.js             | 6 +++---
 3 files changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tez/blob/d26b8b2f/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index dbd314d..cc4bc6a 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -6,6 +6,7 @@ Release 0.6.1: Unreleased
 INCOMPATIBLE CHANGES
 
 ALL CHANGES:
+  TEZ-2098. Tez UI: Dag details should be the default page for dag, fix invalid time entries
for failed Vertices.
   TEZ-2024. TaskFinishedEvent may not be logged in recovery.
   TEZ-2031. Tez UI: horizontal scrollbars do not appear in tables, causing them to look truncated.

   TEZ-2073. SimpleHistoryLoggingService cannot be read by log aggregation (umask)

http://git-wip-us.apache.org/repos/asf/tez/blob/d26b8b2f/tez-ui/src/main/webapp/app/scripts/controllers/dags_controller.js
----------------------------------------------------------------------
diff --git a/tez-ui/src/main/webapp/app/scripts/controllers/dags_controller.js b/tez-ui/src/main/webapp/app/scripts/controllers/dags_controller.js
index 9d1a243..fbe49ef 100644
--- a/tez-ui/src/main/webapp/app/scripts/controllers/dags_controller.js
+++ b/tez-ui/src/main/webapp/app/scripts/controllers/dags_controller.js
@@ -137,7 +137,7 @@ App.DagsController = Em.ObjectController.extend(App.PaginatedContentMixin,
App.C
         filterID: 'dagName_filter',
         tableCellViewClass: Em.Table.TableCell.extend({
           template: Em.Handlebars.compile(
-            "{{#link-to 'dag.view' view.cellContent.id class='ember-table-content'}}{{view.cellContent.name}}{{/link-to}}")
+            "{{#link-to 'dag.index' view.cellContent.id class='ember-table-content'}}{{view.cellContent.name}}{{/link-to}}")
         }),
         getCellContent: function(row) {
           return {

http://git-wip-us.apache.org/repos/asf/tez/blob/d26b8b2f/tez-ui/src/main/webapp/app/scripts/helpers/date.js
----------------------------------------------------------------------
diff --git a/tez-ui/src/main/webapp/app/scripts/helpers/date.js b/tez-ui/src/main/webapp/app/scripts/helpers/date.js
index 750b4f4..10df10b 100644
--- a/tez-ui/src/main/webapp/app/scripts/helpers/date.js
+++ b/tez-ui/src/main/webapp/app/scripts/helpers/date.js
@@ -52,8 +52,8 @@ App.Helpers.date = {
    * @method dateFormat
    */
   dateFormat: function (timestamp, showSeconds, showMilliseconds) {
-    if (!App.Helpers.number.isValidInt(timestamp)) {
-      return timestamp;
+    if (!App.Helpers.number.isValidInt(timestamp) || timestamp == 0) {
+      return "";
     }
     if(showSeconds == undefined) showSeconds = true;
     var format = 'DD MMM YYYY HH:mm';
@@ -165,7 +165,7 @@ App.Helpers.date = {
    */
   timingFormat: function (time, /* optional */ zeroValid) {
     var intTime = parseInt(time);
-    if (zeroValid && intTime == 0) {
+    if (zeroValid && intTime <= 0) {
       return 0 + ' secs';
     }
     if (!intTime) {


Mime
View raw message