You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pig.apache.org by rd...@apache.org on 2011/04/22 17:56:06 UTC

svn commit: r1095954 - in /pig/branches/branch-0.9: CHANGES.txt src/org/apache/pig/parser/DryRunGruntParser.java test/org/apache/pig/test/TestMacroExpansion.java

Author: rding
Date: Fri Apr 22 15:56:06 2011
New Revision: 1095954

URL: http://svn.apache.org/viewvc?rev=1095954&view=rev
Log:
PIG-2005: Discrepancy in the way dry run handles semicolon in macro definition

Modified:
    pig/branches/branch-0.9/CHANGES.txt
    pig/branches/branch-0.9/src/org/apache/pig/parser/DryRunGruntParser.java
    pig/branches/branch-0.9/test/org/apache/pig/test/TestMacroExpansion.java

Modified: pig/branches/branch-0.9/CHANGES.txt
URL: http://svn.apache.org/viewvc/pig/branches/branch-0.9/CHANGES.txt?rev=1095954&r1=1095953&r2=1095954&view=diff
==============================================================================
--- pig/branches/branch-0.9/CHANGES.txt (original)
+++ pig/branches/branch-0.9/CHANGES.txt Fri Apr 22 15:56:06 2011
@@ -162,6 +162,8 @@ PIG-1696: Performance: Use System.arrayc
 
 BUG FIXES
 
+PIG-2005: Discrepancy in the way dry run handles semicolon in macro definition (rding)
+
 PIG-1281: Detect org.apache.pig.data.DataByteArray cannot be cast to
  org.apache.pig.data.Tuple type of errors at Compile Type during
  creation of logical plan (thejas)

Modified: pig/branches/branch-0.9/src/org/apache/pig/parser/DryRunGruntParser.java
URL: http://svn.apache.org/viewvc/pig/branches/branch-0.9/src/org/apache/pig/parser/DryRunGruntParser.java?rev=1095954&r1=1095953&r2=1095954&view=diff
==============================================================================
--- pig/branches/branch-0.9/src/org/apache/pig/parser/DryRunGruntParser.java (original)
+++ pig/branches/branch-0.9/src/org/apache/pig/parser/DryRunGruntParser.java Fri Apr 22 15:56:06 2011
@@ -227,6 +227,11 @@ public class DryRunGruntParser extends P
 
     @Override
     protected void processPig(String cmd) throws IOException {
+        
+        if (cmd.charAt(cmd.length() - 1) != ';') {
+            cmd += ";";
+        }
+        
         CommonTokenStream tokenStream = QueryParserDriver.tokenize(cmd, source);
         Tree ast = null;
 

Modified: pig/branches/branch-0.9/test/org/apache/pig/test/TestMacroExpansion.java
URL: http://svn.apache.org/viewvc/pig/branches/branch-0.9/test/org/apache/pig/test/TestMacroExpansion.java?rev=1095954&r1=1095953&r2=1095954&view=diff
==============================================================================
--- pig/branches/branch-0.9/test/org/apache/pig/test/TestMacroExpansion.java (original)
+++ pig/branches/branch-0.9/test/org/apache/pig/test/TestMacroExpansion.java Fri Apr 22 15:56:06 2011
@@ -1082,6 +1082,25 @@ public class TestMacroExpansion {
         testMacro(macro, expected);
     }
     
+    @Test // PIG-2005
+    public void noSemiColonTest() throws Exception {
+        String macro = "define group_and_count (A) returns B {\n" +
+            "    $B = FILTER $A BY ($1 == 8) OR (NOT ($0+$2 > $1));\n" +
+            "}\n";
+        
+        String script = 
+            "alpha = load 'users' as (user, age, zip);\n" +
+            "gamma = group_and_count (alpha);\n" +
+            "store gamma into 'byuser';\n";
+        
+        String expected = 
+            "alpha = load 'users' as (user, age, zip);\n" +
+            "gamma = FILTER alpha BY (($1 == 8) OR ( NOT ($0 + $2 > $1)));\n" +
+            "store gamma INTO 'byuser';\n";
+        
+        verify(macro + script, expected);
+    }
+    
     @Test
     public void test1() throws Exception {
         String query = "A = load 'x' as ( u:int, v:long, w:bytearray); " +