You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pig.apache.org by xu...@apache.org on 2011/04/26 07:04:13 UTC
svn commit: r1096663 - in /pig/trunk: CHANGES.txt
src/org/apache/pig/parser/QueryParser.g
test/org/apache/pig/parser/TestLogicalPlanGenerator.java
Author: xuefu
Date: Tue Apr 26 05:04:13 2011
New Revision: 1096663
URL: http://svn.apache.org/viewvc?rev=1096663&view=rev
Log:
PIG-2003: Using keyward as alias doesn't either emit an error or produce a logical plan
Modified:
pig/trunk/CHANGES.txt
pig/trunk/src/org/apache/pig/parser/QueryParser.g
pig/trunk/test/org/apache/pig/parser/TestLogicalPlanGenerator.java
Modified: pig/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/pig/trunk/CHANGES.txt?rev=1096663&r1=1096662&r2=1096663&view=diff
==============================================================================
--- pig/trunk/CHANGES.txt (original)
+++ pig/trunk/CHANGES.txt Tue Apr 26 05:04:13 2011
@@ -44,6 +44,8 @@ PIG-1876: Typed map for Pig (daijy)
IMPROVEMENTS
+PIG-2003: Using keyward as alias doesn't either emit an error or produce a logical plan (xuefu)
+
PIG-1981: LoadPushDown.pushProjection should pass alias in addition to position (daijy)
PIG-2006: Regression: NPE when Pig processes an empty script file, fix test case (xuefu)
Modified: pig/trunk/src/org/apache/pig/parser/QueryParser.g
URL: http://svn.apache.org/viewvc/pig/trunk/src/org/apache/pig/parser/QueryParser.g?rev=1096663&r1=1096662&r2=1096663&view=diff
==============================================================================
--- pig/trunk/src/org/apache/pig/parser/QueryParser.g (original)
+++ pig/trunk/src/org/apache/pig/parser/QueryParser.g Tue Apr 26 05:04:13 2011
@@ -136,8 +136,10 @@ catch(RecognitionException re) {
}
}
-query : statement*
- -> ^( QUERY statement* )
+query : statement+
+ -> ^( QUERY statement+ )
+ |
+ -> ^( QUERY )
;
statement : SEMI_COLON!
Modified: pig/trunk/test/org/apache/pig/parser/TestLogicalPlanGenerator.java
URL: http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/parser/TestLogicalPlanGenerator.java?rev=1096663&r1=1096662&r2=1096663&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/parser/TestLogicalPlanGenerator.java (original)
+++ pig/trunk/test/org/apache/pig/parser/TestLogicalPlanGenerator.java Tue Apr 26 05:04:13 2011
@@ -24,6 +24,7 @@ import java.io.IOException;
import junit.framework.Assert;
+import org.antlr.runtime.NoViableAltException;
import org.apache.pig.test.Util;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -290,4 +291,17 @@ public class TestLogicalPlanGenerator {
}
Assert.fail( "Query is supposed to be failing." );
}
+
+ @Test
+ public void testNegative2() {
+ String query = "ship = load 'x';";
+ try {
+ ParserTestingUtils.generateLogicalPlan( query );
+ } catch(Exception ex) {
+ Assert.assertTrue( ex instanceof NoViableAltException );
+ return;
+ }
+ Assert.fail( "Query is supposed to be failing." );
+ }
+
}