Return-Path: X-Original-To: apmail-tez-commits-archive@minotaur.apache.org Delivered-To: apmail-tez-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 281A417681 for ; Thu, 16 Apr 2015 13:58:47 +0000 (UTC) Received: (qmail 28980 invoked by uid 500); 16 Apr 2015 13:58:47 -0000 Delivered-To: apmail-tez-commits-archive@tez.apache.org Received: (qmail 28944 invoked by uid 500); 16 Apr 2015 13:58:47 -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 28932 invoked by uid 99); 16 Apr 2015 13:58:47 -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; Thu, 16 Apr 2015 13:58:47 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id CD39DE1090; Thu, 16 Apr 2015 13:58:46 +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-2329. UI Query on final dag status performance improvement (jeagles) Date: Thu, 16 Apr 2015 13:58:46 +0000 (UTC) Repository: tez Updated Branches: refs/heads/branch-0.6 72d1e4f98 -> 51903629d TEZ-2329. UI Query on final dag status performance improvement (jeagles) (cherry picked from commit bfb34afba0edfb254b05037b3b2ab37e3d3e44cf) Project: http://git-wip-us.apache.org/repos/asf/tez/repo Commit: http://git-wip-us.apache.org/repos/asf/tez/commit/51903629 Tree: http://git-wip-us.apache.org/repos/asf/tez/tree/51903629 Diff: http://git-wip-us.apache.org/repos/asf/tez/diff/51903629 Branch: refs/heads/branch-0.6 Commit: 51903629d8b36c494091a99822a73c443073bb82 Parents: 72d1e4f Author: Jonathan Eagles Authored: Thu Apr 16 08:57:17 2015 -0500 Committer: Jonathan Eagles Committed: Thu Apr 16 08:58:23 2015 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../src/main/webapp/app/scripts/controllers/dags_controller.js | 6 +++++- tez-ui/src/main/webapp/app/scripts/helpers/misc.js | 4 ++++ 3 files changed, 10 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tez/blob/51903629/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 6d50279..3eb5b2e 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -6,6 +6,7 @@ Release 0.6.1: Unreleased INCOMPATIBLE CHANGES ALL CHANGES: + TEZ-2329. UI Query on final dag status performance improvement TEZ-2287. Deprecate VertexManagerPluginContext.getTaskContainer(). TEZ-1909. Remove need to copy over all events from attempt 1 to attempt 2 dir TEZ-2061. Tez UI: vertex id column and filter on tasks page should be changed to vertex name http://git-wip-us.apache.org/repos/asf/tez/blob/51903629/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 66a33f1..4515149 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 @@ -55,9 +55,13 @@ App.DagsController = Em.ObjectController.extend(App.PaginatedContentMixin, App.C user: this.user_filter }, secondary: { - status: this.status_filter } } + if (App.Helpers.misc.isFinalDagStatus(this.status_filter)) { + filters.primary['status'] = this.status_filter; + } else { + filters.secondary['status'] = this.status_filter; + } this.setFiltersAndLoadEntities(filters); }, http://git-wip-us.apache.org/repos/asf/tez/blob/51903629/tez-ui/src/main/webapp/app/scripts/helpers/misc.js ---------------------------------------------------------------------- diff --git a/tez-ui/src/main/webapp/app/scripts/helpers/misc.js b/tez-ui/src/main/webapp/app/scripts/helpers/misc.js index 608f60e..b712acc 100644 --- a/tez-ui/src/main/webapp/app/scripts/helpers/misc.js +++ b/tez-ui/src/main/webapp/app/scripts/helpers/misc.js @@ -90,6 +90,10 @@ App.Helpers.misc = { 'KILLED', 'FAILED', 'ERROR']) != -1; }, + isFinalDagStatus: function(status) { + return $.inArray(status, ['SUCCEEDED', 'KILLED', 'FAILED', 'ERROR']) != -1; + }, + isValidTaskStatus: function(status) { return $.inArray(status, ['RUNNING', 'SUCCEEDED', 'FAILED', 'KILLED']) != -1; },