Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 6E1D2200C79 for ; Fri, 19 May 2017 21:28:59 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 6AA2D160BD1; Fri, 19 May 2017 19:28:59 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id BAFA8160BB0 for ; Fri, 19 May 2017 21:28:58 +0200 (CEST) Received: (qmail 88577 invoked by uid 500); 19 May 2017 19:28:56 -0000 Mailing-List: contact commits-help@tez.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@tez.apache.org Delivered-To: mailing list commits@tez.apache.org Received: (qmail 88568 invoked by uid 99); 19 May 2017 19:28:56 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 19 May 2017 19:28:56 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 80B3ADFE61; Fri, 19 May 2017 19:28:56 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jeagles@apache.org To: commits@tez.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: tez git commit: TEZ-3662. Vertex Duration in 0.9 Tez UI regression from 0.7 (jeagles) Date: Fri, 19 May 2017 19:28:56 +0000 (UTC) archived-at: Fri, 19 May 2017 19:28:59 -0000 Repository: tez Updated Branches: refs/heads/master ca834d4f0 -> 11767338d TEZ-3662. Vertex Duration in 0.9 Tez UI regression from 0.7 (jeagles) Project: http://git-wip-us.apache.org/repos/asf/tez/repo Commit: http://git-wip-us.apache.org/repos/asf/tez/commit/11767338 Tree: http://git-wip-us.apache.org/repos/asf/tez/tree/11767338 Diff: http://git-wip-us.apache.org/repos/asf/tez/diff/11767338 Branch: refs/heads/master Commit: 11767338d00067239c49ea60923f2c5fb8c41992 Parents: ca834d4 Author: Jonathan Eagles Authored: Fri May 19 14:28:49 2017 -0500 Committer: Jonathan Eagles Committed: Fri May 19 14:28:49 2017 -0500 ---------------------------------------------------------------------- tez-ui/src/main/webapp/app/models/vertex.js | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tez/blob/11767338/tez-ui/src/main/webapp/app/models/vertex.js ---------------------------------------------------------------------- diff --git a/tez-ui/src/main/webapp/app/models/vertex.js b/tez-ui/src/main/webapp/app/models/vertex.js index a0ffd34..a5904ef 100644 --- a/tez-ui/src/main/webapp/app/models/vertex.js +++ b/tez-ui/src/main/webapp/app/models/vertex.js @@ -21,11 +21,14 @@ import DS from 'ember-data'; import AMTimelineModel from './am-timeline'; -function valueComputerFactory(path1, path2) { +function valueComputerFactory(path1, path2, path3) { return function () { var value = this.get(path1); - if(value === undefined || value === null){ - value = this.get(path2); + if(path2 && (value === undefined || value === null)){ + value = this.get(path2); + } + if(path3 && (value === undefined || value === null)){ + value = this.get(path3); } return value; }; @@ -69,8 +72,8 @@ export default AMTimelineModel.extend({ initTime: Ember.computed("am.initTime", "_initTime", valueComputerFactory("am.initTime", "_initTime") ), - startTime: Ember.computed("am.startTime", "_startTime", - valueComputerFactory("am.startTime", "_startTime") + startTime: Ember.computed("firstTaskStartTime", "am.startTime", "_startTime", + valueComputerFactory("firstTaskStartTime", "am.startTime", "_startTime") ), endTime: Ember.computed("am.endTime", "_endTime", valueComputerFactory("am.endTime", "_endTime")