Return-Path: X-Original-To: apmail-ambari-commits-archive@www.apache.org Delivered-To: apmail-ambari-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 35D7710902 for ; Fri, 21 Mar 2014 13:16:28 +0000 (UTC) Received: (qmail 57885 invoked by uid 500); 21 Mar 2014 13:16:27 -0000 Delivered-To: apmail-ambari-commits-archive@ambari.apache.org Received: (qmail 57855 invoked by uid 500); 21 Mar 2014 13:16:24 -0000 Mailing-List: contact commits-help@ambari.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: ambari-dev@ambari.apache.org Delivered-To: mailing list commits@ambari.apache.org Received: (qmail 57848 invoked by uid 99); 21 Mar 2014 13:16:24 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 21 Mar 2014 13:16:24 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 89AD8987E00; Fri, 21 Mar 2014 13:16:23 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: alexantonenko@apache.org To: commits@ambari.apache.org Message-Id: <4ea9da89ff3e41b7be134451ea64505e@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: AMBARI-5174. Ambari UI shows Tez DAG vertex times cumulative (alexantonenko) Date: Fri, 21 Mar 2014 13:16:23 +0000 (UTC) Repository: ambari Updated Branches: refs/heads/trunk ccde6bc4c -> 7c02ccbf3 AMBARI-5174. Ambari UI shows Tez DAG vertex times cumulative (alexantonenko) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/7c02ccbf Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/7c02ccbf Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/7c02ccbf Branch: refs/heads/trunk Commit: 7c02ccbf30bafbe0d4d1421293457fd61a0963f2 Parents: ccde6bc Author: Alex Antonenko Authored: Fri Mar 21 15:12:32 2014 +0200 Committer: Alex Antonenko Committed: Fri Mar 21 15:12:32 2014 +0200 ---------------------------------------------------------------------- ambari-web/app/utils/date.js | 5 ++++- ambari-web/app/views/main/jobs/hive_job_details_view.js | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/7c02ccbf/ambari-web/app/utils/date.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/utils/date.js b/ambari-web/app/utils/date.js index b24f064..5434588 100644 --- a/ambari-web/app/utils/date.js +++ b/ambari-web/app/utils/date.js @@ -31,7 +31,7 @@ module.exports = { * @param timestamp * @return string date */ - dateFormat:function (timestamp, showSeconds) { + dateFormat:function (timestamp, showSeconds, showMilliseconds) { if (!validator.isValidInt(timestamp)) return timestamp; var date = new Date(timestamp); var months = this.dateMonths; @@ -39,6 +39,9 @@ module.exports = { var formattedDate = days[date.getDay()] + ', ' + months[date.getMonth()] + ' ' + this.dateFormatZeroFirst(date.getDate()) + ', ' + date.getFullYear() + ' ' + this.dateFormatZeroFirst(date.getHours()) + ':' + this.dateFormatZeroFirst(date.getMinutes()); if (showSeconds) { formattedDate += ':' + this.dateFormatZeroFirst(date.getSeconds()); + if (showMilliseconds) { + formattedDate += '.' + this.dateFormatZeroFirst(date.getMilliseconds()); + }; }; return formattedDate; }, http://git-wip-us.apache.org/repos/asf/ambari/blob/7c02ccbf/ambari-web/app/views/main/jobs/hive_job_details_view.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/views/main/jobs/hive_job_details_view.js b/ambari-web/app/views/main/jobs/hive_job_details_view.js index 5225b0a..19cd6f0 100644 --- a/ambari-web/app/views/main/jobs/hive_job_details_view.js +++ b/ambari-web/app/views/main/jobs/hive_job_details_view.js @@ -241,8 +241,8 @@ App.MainHiveJobDetailsView = Em.View.extend({ read : v.get('recordReadCount') == null ? null : Em.I18n.t('jobs.hive.tez.records.count').format(v.get('recordReadCount')), write : v.get('recordWriteCount') == null ? null : Em.I18n.t('jobs.hive.tez.records.count').format(v.get('recordWriteCount')) }, - started: v.get('startTime') ? dateUtils.dateFormat(v.get('startTime'), true) : '', - ended: v.get('endTime') ? dateUtils.dateFormat(v.get('endTime'), true) : '', + started: v.get('startTime') ? dateUtils.dateFormat(v.get('startTime'), true, true) : '', + ended: v.get('endTime') ? dateUtils.dateFormat(v.get('endTime'), true, true) : '', status: status }; }.property('selectedVertex.fileReadOps', 'selectedVertex.fileWriteOps', 'selectedVertex.hdfsReadOps', 'selectedVertex.hdfdWriteOps',