You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pig.apache.org by da...@apache.org on 2011/08/05 19:20:11 UTC

svn commit: r1154322 - in /pig/trunk: CHANGES.txt src/org/apache/pig/parser/LogicalPlanBuilder.java test/org/apache/pig/test/TestLogicalPlanBuilder.java

Author: daijy
Date: Fri Aug  5 17:20:10 2011
New Revision: 1154322

URL: http://svn.apache.org/viewvc?rev=1154322&view=rev
Log:
PIG-2181: Improvement : for error message when describe misses alias

Modified:
    pig/trunk/CHANGES.txt
    pig/trunk/src/org/apache/pig/parser/LogicalPlanBuilder.java
    pig/trunk/test/org/apache/pig/test/TestLogicalPlanBuilder.java

Modified: pig/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/pig/trunk/CHANGES.txt?rev=1154322&r1=1154321&r2=1154322&view=diff
==============================================================================
--- pig/trunk/CHANGES.txt (original)
+++ pig/trunk/CHANGES.txt Fri Aug  5 17:20:10 2011
@@ -99,6 +99,8 @@ PIG-2011: Speed up TestTypedMap.java (dv
 
 BUG FIXES
 
+PIG-2181: Improvement : for error message when describe misses alias (vivekp via daijy)
+
 PIG-2124: Script never ending when joining from the same source (daijy)
 
 PIG-2170: NPE thrown during illustrate (thejas)

Modified: pig/trunk/src/org/apache/pig/parser/LogicalPlanBuilder.java
URL: http://svn.apache.org/viewvc/pig/trunk/src/org/apache/pig/parser/LogicalPlanBuilder.java?rev=1154322&r1=1154321&r2=1154322&view=diff
==============================================================================
--- pig/trunk/src/org/apache/pig/parser/LogicalPlanBuilder.java (original)
+++ pig/trunk/src/org/apache/pig/parser/LogicalPlanBuilder.java Fri Aug  5 17:20:10 2011
@@ -441,6 +441,7 @@ public class LogicalPlanBuilder {
             plan.connect( pred, op );
         }
         operators.put( op.getAlias(), op );
+        pigContext.setLastAlias(op.getAlias());	
         return op.getAlias();
     }
 

Modified: pig/trunk/test/org/apache/pig/test/TestLogicalPlanBuilder.java
URL: http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/test/TestLogicalPlanBuilder.java?rev=1154322&r1=1154321&r2=1154322&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/test/TestLogicalPlanBuilder.java (original)
+++ pig/trunk/test/org/apache/pig/test/TestLogicalPlanBuilder.java Fri Aug  5 17:20:10 2011
@@ -2083,6 +2083,19 @@ public class TestLogicalPlanBuilder {
         load = (LOLoad)plan.getPredecessors(op).get(0);
         Assert.assertTrue(((PigStorageWithSchema)(load).getLoadFunc()).getUDFContextSignature().equals("b"));
     }
+    
+    @Test
+    public void testLastAlias() throws Exception {
+        try {
+            String query = "B = load '2.txt' as (b0:int, b1:int);\n" +
+            		"C = ORDER B by b0;" ;
+            buildPlan( query );
+            
+        } catch (AssertionFailedError e) {
+            // Ignore the exception
+        }
+        Assert.assertEquals("C", pigServer.getPigContext().getLastAlias());
+    }
 
     private void printPlan(LogicalExpressionPlan lp) {
         System.err.println( lp.toString() );