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 3D4E5200CAB for ; Wed, 10 May 2017 15:37:29 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 3BE1D160BCD; Wed, 10 May 2017 13:37:29 +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 6A2A7160BB4 for ; Wed, 10 May 2017 15:37:28 +0200 (CEST) Received: (qmail 8288 invoked by uid 500); 10 May 2017 13:37:27 -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 6706 invoked by uid 99); 10 May 2017 13:37:26 -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; Wed, 10 May 2017 13:37:26 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 1C9BBE964E; Wed, 10 May 2017 13:37:25 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jonathanhurley@apache.org To: commits@ambari.apache.org Date: Wed, 10 May 2017 13:37:37 -0000 Message-Id: In-Reply-To: <3c75c0b18c8d4583801af4b6ff76fca9@git.apache.org> References: <3c75c0b18c8d4583801af4b6ff76fca9@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [14/22] ambari git commit: AMBARI-20673.For sort/partition operator, if there is only 1 reducer, display just sort rather than 'sort/partition'(Venkata Sairam) archived-at: Wed, 10 May 2017 13:37:29 -0000 AMBARI-20673.For sort/partition operator, if there is only 1 reducer, display just sort rather than 'sort/partition'(Venkata Sairam) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/a92fe1b1 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/a92fe1b1 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/a92fe1b1 Branch: refs/heads/branch-feature-AMBARI-12556 Commit: a92fe1b1f2fa07e5c5f47dd5f484a45ae64a7bbd Parents: 3153b9b Author: Venkata Sairam Authored: Tue May 9 20:07:46 2017 +0530 Committer: Venkata Sairam Committed: Tue May 9 20:07:46 2017 +0530 ---------------------------------------------------------------------- .../src/main/resources/ui/app/utils/hive-explainer/renderer.js | 2 +- .../main/resources/ui/app/utils/hive-explainer/transformer.js | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/a92fe1b1/contrib/views/hive20/src/main/resources/ui/app/utils/hive-explainer/renderer.js ---------------------------------------------------------------------- diff --git a/contrib/views/hive20/src/main/resources/ui/app/utils/hive-explainer/renderer.js b/contrib/views/hive20/src/main/resources/ui/app/utils/hive-explainer/renderer.js index d0a3e0b..c09ad6b 100644 --- a/contrib/views/hive20/src/main/resources/ui/app/utils/hive-explainer/renderer.js +++ b/contrib/views/hive20/src/main/resources/ui/app/utils/hive-explainer/renderer.js @@ -134,7 +134,7 @@ export default function doRender(data, selector, onRequestDetail, draggable) { } function isSingleReducerAvailable(data){ - let reducerCount = data.vertices.filter(function(item){ + let reducerCount = data.verticesData.filter(function(item){ return item['_vertex'].indexOf("Reducer") === 0; }); if(reducerCount && reducerCount.length === 1) { http://git-wip-us.apache.org/repos/asf/ambari/blob/a92fe1b1/contrib/views/hive20/src/main/resources/ui/app/utils/hive-explainer/transformer.js ---------------------------------------------------------------------- diff --git a/contrib/views/hive20/src/main/resources/ui/app/utils/hive-explainer/transformer.js b/contrib/views/hive20/src/main/resources/ui/app/utils/hive-explainer/transformer.js index 9dbbb00..d786d0f 100644 --- a/contrib/views/hive20/src/main/resources/ui/app/utils/hive-explainer/transformer.js +++ b/contrib/views/hive20/src/main/resources/ui/app/utils/hive-explainer/transformer.js @@ -28,7 +28,7 @@ export default function doTransform(data) { getFetchVertex(fetch), ]; - let edges = []; + let edges = [], verticesData; if(tez) { edges = getEdges(tez, vertices); edges = getEdgesWithCorrectedUnion(edges); @@ -38,7 +38,7 @@ export default function doTransform(data) { vertices = doEnhance(vertices); vertices = getProcessedVertices(vertices, edges); - + verticesData = vertices; const {adjustedVertices, adjustedEdges} = getAdjustedVerticesAndEdges(vertices, edges); vertices = adjustedVertices; edges = adjustedEdges; @@ -60,6 +60,7 @@ export default function doTransform(data) { tree, nodes, connections, + verticesData }); }