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 E12E0200B29 for ; Thu, 30 Jun 2016 14:21:05 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id DFD35160A52; Thu, 30 Jun 2016 12:21:05 +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 3567F160A51 for ; Thu, 30 Jun 2016 14:21:05 +0200 (CEST) Received: (qmail 83720 invoked by uid 500); 30 Jun 2016 12:21:04 -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 83711 invoked by uid 99); 30 Jun 2016 12:21:04 -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, 30 Jun 2016 12:21:04 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 31155DFF03; Thu, 30 Jun 2016 12:21:04 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: dbhowmick@apache.org To: commits@ambari.apache.org Message-Id: <8248904b51dc47c4bec9498b43d1f82e@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: ambari git commit: AMABRI-17495. Pig - Pig Helper - Relational Operator - GROUP and COGROUP function when selected, param section display incorrect number of param.(Gaurav Nagar via dipayanb) Date: Thu, 30 Jun 2016 12:21:04 +0000 (UTC) archived-at: Thu, 30 Jun 2016 12:21:06 -0000 Repository: ambari Updated Branches: refs/heads/trunk ebaed6ad6 -> 9550b870b AMABRI-17495. Pig - Pig Helper - Relational Operator - GROUP and COGROUP function when selected, param section display incorrect number of param.(Gaurav Nagar via dipayanb) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/9550b870 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/9550b870 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/9550b870 Branch: refs/heads/trunk Commit: 9550b870b10b2d42a0ec5c347cdab75ef4d03590 Parents: ebaed6a Author: Dipayan Bhowmick Authored: Thu Jun 30 17:50:11 2016 +0530 Committer: Dipayan Bhowmick Committed: Thu Jun 30 17:50:45 2016 +0530 ---------------------------------------------------------------------- .../main/resources/ui/pig-web/app/assets/data/pigHelpers.json | 4 ++-- .../src/main/resources/ui/pig-web/app/components/helpers-data.js | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/9550b870/contrib/views/pig/src/main/resources/ui/pig-web/app/assets/data/pigHelpers.json ---------------------------------------------------------------------- diff --git a/contrib/views/pig/src/main/resources/ui/pig-web/app/assets/data/pigHelpers.json b/contrib/views/pig/src/main/resources/ui/pig-web/app/assets/data/pigHelpers.json index 90d11ac..6982bf0 100644 --- a/contrib/views/pig/src/main/resources/ui/pig-web/app/assets/data/pigHelpers.json +++ b/contrib/views/pig/src/main/resources/ui/pig-web/app/assets/data/pigHelpers.json @@ -18,14 +18,14 @@ { "title":"Relational Operators", "helpers":[ - "COGROUP %VAR% BY %VAR%", + "COGROUP %VAR1% BY %VAR2%", "CROSS %VAR1%, %VAR2%;", "DISTINCT %VAR%;", "FILTER %VAR% BY %COND%", "FLATTEN(%VAR%)", "FOREACH %DATA% GENERATE %NEW_DATA%", "FOREACH %DATA% {%NESTED_BLOCK%}", - "GROUP %VAR% BY %VAR%", + "GROUP %VAR1% BY %VAR2%", "GROUP %VAR% ALL", "JOIN %VAR% BY ", "LIMIT %VAR% %N%", http://git-wip-us.apache.org/repos/asf/ambari/blob/9550b870/contrib/views/pig/src/main/resources/ui/pig-web/app/components/helpers-data.js ---------------------------------------------------------------------- diff --git a/contrib/views/pig/src/main/resources/ui/pig-web/app/components/helpers-data.js b/contrib/views/pig/src/main/resources/ui/pig-web/app/components/helpers-data.js index b36fee0..aefe506 100644 --- a/contrib/views/pig/src/main/resources/ui/pig-web/app/components/helpers-data.js +++ b/contrib/views/pig/src/main/resources/ui/pig-web/app/components/helpers-data.js @@ -36,14 +36,14 @@ module.exports = [ { 'title':'Relational Operators', 'helpers':[ - 'COGROUP %VAR% BY %VAR%', + 'COGROUP %VAR1% BY %VAR2%', 'CROSS %VAR1%, %VAR2%;', 'DISTINCT %VAR%;', 'FILTER %VAR% BY %COND%', 'FLATTEN(%VAR%)', 'FOREACH %DATA% GENERATE %NEW_DATA%', 'FOREACH %DATA% {%NESTED_BLOCK%}', - 'GROUP %VAR% BY %VAR%', + 'GROUP %VAR1% BY %VAR2%', 'GROUP %VAR% ALL', 'JOIN %VAR% BY ', 'LIMIT %VAR% %N%',