svn commit: r1512531 - in /pig/trunk: CHANGES.txt src/org/apache/pig/parser/QueryParser.g src/org/apache/pig/parser/QueryParserDriver.java test/org/apache/pig/parser/TestQueryParser.java

[ch...@apache.org]

Author: cheolsoo
Date: Fri Aug  9 23:24:03 2013
New Revision: 1512531

URL: http://svn.apache.org/r1512531
Log:
Revert PIG-3414 (TestSchema is broken)

Modified:
    pig/trunk/CHANGES.txt
    pig/trunk/src/org/apache/pig/parser/QueryParser.g
    pig/trunk/src/org/apache/pig/parser/QueryParserDriver.java
    pig/trunk/test/org/apache/pig/parser/TestQueryParser.java

Modified: pig/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/pig/trunk/CHANGES.txt?rev=1512531&r1=1512530&r2=1512531&view=diff
==============================================================================
--- pig/trunk/CHANGES.txt (original)
+++ pig/trunk/CHANGES.txt Fri Aug  9 23:24:03 2013
@@ -210,8 +210,6 @@ PIG-3013: BinInterSedes improve chararra
 
 BUG FIXES
 
-PIG-3414: QueryParserDriver.parseSchema(String) silently returns a wrong result when a comma is missing in the schema definition (cheolsoo)
-
 PIG-3243: Documentation error (sarutak via cheolsoo)
 
 PIG-3210: Pig fails to start when it cannot write log to log files (mengsungwu via cheolsoo)

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=1512531&r1=1512530&r2=1512531&view=diff
==============================================================================
--- pig/trunk/src/org/apache/pig/parser/QueryParser.g (original)
+++ pig/trunk/src/org/apache/pig/parser/QueryParser.g Fri Aug  9 23:24:03 2013
@@ -208,9 +208,6 @@ catch(RecognitionException re) {
 query : statement* EOF -> ^( QUERY statement* )
 ;
 
-schema: field_def_list EOF
-;
-
 // STATEMENTS
 
 statement : SEMI_COLON!

Modified: pig/trunk/src/org/apache/pig/parser/QueryParserDriver.java
URL: http://svn.apache.org/viewvc/pig/trunk/src/org/apache/pig/parser/QueryParserDriver.java?rev=1512531&r1=1512530&r2=1512531&view=diff
==============================================================================
--- pig/trunk/src/org/apache/pig/parser/QueryParserDriver.java (original)
+++ pig/trunk/src/org/apache/pig/parser/QueryParserDriver.java Fri Aug  9 23:24:03 2013
@@ -50,8 +50,8 @@ import org.apache.pig.impl.io.ResourceNo
 import org.apache.pig.newplan.Operator;
 import org.apache.pig.newplan.logical.relational.LogicalPlan;
 import org.apache.pig.newplan.logical.relational.LogicalSchema;
+import org.apache.pig.parser.QueryParser.field_def_list_return;
 import org.apache.pig.parser.QueryParser.literal_return;
-import org.apache.pig.parser.QueryParser.schema_return;
 import org.apache.pig.tools.pigstats.ScriptState;
 
 public class QueryParserDriver {
@@ -85,9 +85,9 @@ public class QueryParserDriver {
     private static Tree parseSchema(CommonTokenStream tokens) throws ParserException {
         QueryParser parser = QueryParserUtils.createParser(tokens);
 
-        schema_return result = null;
+        field_def_list_return result = null;
         try {
-            result = parser.schema();
+            result = parser.field_def_list();
         } catch (RecognitionException e) {
             String msg = parser.getErrorHeader(e) + " "
                     + parser.getErrorMessage(e, parser.getTokenNames());

Modified: pig/trunk/test/org/apache/pig/parser/TestQueryParser.java
URL: http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/parser/TestQueryParser.java?rev=1512531&r1=1512530&r2=1512531&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/parser/TestQueryParser.java (original)
+++ pig/trunk/test/org/apache/pig/parser/TestQueryParser.java Fri Aug  9 23:24:03 2013
@@ -30,8 +30,6 @@ import org.antlr.runtime.tree.Tree;
 import org.apache.pig.ExecType;
 import org.apache.pig.PigRunner;
 import org.apache.pig.PigServer;
-import org.apache.pig.data.DataType;
-import org.apache.pig.newplan.logical.relational.LogicalSchema;
 import org.apache.pig.test.Util;
 import org.apache.pig.tools.pigstats.PigStats;
 import org.junit.Assert;
@@ -309,23 +307,6 @@ public class TestQueryParser {
     }
 
     @Test
-    public void testParseSchema() throws Exception {
-        String schemaDef = "  a:int, b:long  "; // Extra white spaces shouldn't make parsing fail
-        QueryParserDriver qpd = new QueryParserDriver(null, null, null);
-        LogicalSchema schema = qpd.parseSchema(schemaDef);
-        Assert.assertEquals(2, schema.getFields().size());
-        Assert.assertEquals(DataType.INTEGER, schema.getFields().get(0).type);
-        Assert.assertEquals(DataType.LONG, schema.getFields().get(1).type);
-    }
-
-    @Test(expected=ParserException.class)
-    public void testParseSchemaNegative() throws Exception {
-        String schemaDef = "a:int b:long"; // A comma is missing between fields
-        QueryParserDriver qpd = new QueryParserDriver(null, null, null);
-        qpd.parseSchema(schemaDef);
-    }
-
-    @Test
     public void testAST() throws IOException, RecognitionException  {
         CharStream input = new QueryParserFileStream( "test/org/apache/pig/parser/TestAST.pig" );
         QueryLexer lexer = new QueryLexer(input);