Return-Path: Delivered-To: apmail-hadoop-pig-commits-archive@www.apache.org Received: (qmail 60395 invoked from network); 4 Jun 2010 17:56:43 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 4 Jun 2010 17:56:43 -0000 Received: (qmail 47248 invoked by uid 500); 4 Jun 2010 17:56:43 -0000 Delivered-To: apmail-hadoop-pig-commits-archive@hadoop.apache.org Received: (qmail 47229 invoked by uid 500); 4 Jun 2010 17:56:43 -0000 Mailing-List: contact pig-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: pig-dev@hadoop.apache.org Delivered-To: mailing list pig-commits@hadoop.apache.org Received: (qmail 47222 invoked by uid 500); 4 Jun 2010 17:56:43 -0000 Delivered-To: apmail-incubator-pig-commits@incubator.apache.org Received: (qmail 47219 invoked by uid 99); 4 Jun 2010 17:56:43 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 04 Jun 2010 17:56:43 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 04 Jun 2010 17:56:40 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id D70CF2388980; Fri, 4 Jun 2010 17:56:18 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r951511 - in /hadoop/pig/trunk: CHANGES.txt src/org/apache/pig/tools/grunt/GruntParser.java test/org/apache/pig/test/TestGrunt.java Date: Fri, 04 Jun 2010 17:56:18 -0000 To: pig-commits@incubator.apache.org From: hashutosh@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100604175618.D70CF2388980@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: hashutosh Date: Fri Jun 4 17:56:18 2010 New Revision: 951511 URL: http://svn.apache.org/viewvc?rev=951511&view=rev Log: PIG-283: Allow to set arbitrary jobconf key-value pairs inside pig program Modified: hadoop/pig/trunk/CHANGES.txt hadoop/pig/trunk/src/org/apache/pig/tools/grunt/GruntParser.java hadoop/pig/trunk/test/org/apache/pig/test/TestGrunt.java Modified: hadoop/pig/trunk/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/CHANGES.txt?rev=951511&r1=951510&r2=951511&view=diff ============================================================================== --- hadoop/pig/trunk/CHANGES.txt (original) +++ hadoop/pig/trunk/CHANGES.txt Fri Jun 4 17:56:18 2010 @@ -24,6 +24,8 @@ INCOMPATIBLE CHANGES IMPROVEMENTS +PIG-283: Allow to set arbitrary jobconf key-value pairs inside pig program (hashutosh) + PIG-1373: We need to add jdiff output to docs on the website (daijy) PIG-1422: Duplicate code in LOPrinter.java (zjffdu) Modified: hadoop/pig/trunk/src/org/apache/pig/tools/grunt/GruntParser.java URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/src/org/apache/pig/tools/grunt/GruntParser.java?rev=951511&r1=951510&r2=951511&view=diff ============================================================================== --- hadoop/pig/trunk/src/org/apache/pig/tools/grunt/GruntParser.java (original) +++ hadoop/pig/trunk/src/org/apache/pig/tools/grunt/GruntParser.java Fri Jun 4 17:56:18 2010 @@ -500,10 +500,7 @@ public class GruntParser extends PigScri } else { - // other key-value pairs can go there - // for now just throw exception since we don't support - // anything else - throw new ParseException("Unrecognized set key: " + key); + mPigServer.getPigContext().getProperties().setProperty(key, value); } } Modified: hadoop/pig/trunk/test/org/apache/pig/test/TestGrunt.java URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/test/org/apache/pig/test/TestGrunt.java?rev=951511&r1=951510&r2=951511&view=diff ============================================================================== --- hadoop/pig/trunk/test/org/apache/pig/test/TestGrunt.java (original) +++ hadoop/pig/trunk/test/org/apache/pig/test/TestGrunt.java Fri Jun 4 17:56:18 2010 @@ -1068,5 +1068,14 @@ public class TestGrunt extends TestCase } } - + @Test + public void testSet() throws Throwable { + + String strCmd = "set my.arbitrary.key my.arbitrary.value\n"; + PigContext pc = new PigServer(ExecType.MAPREDUCE, cluster.getProperties()).getPigContext(); + InputStreamReader reader = new InputStreamReader(new ByteArrayInputStream(strCmd.getBytes())); + new Grunt(new BufferedReader(reader), pc).exec(); + + assertEquals("my.arbitrary.value", pc.getExecutionEngine().getConfiguration().getProperty("my.arbitrary.key")); + } }