svn commit: r828213 - in /hadoop/pig/trunk: src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POFRJoin.java test/org/apache/pig/test/TestMRCompiler.java test/org/apache/pig/test/TestMultiQuery.java

[da...@apache.org]

Author: daijy
Date: Wed Oct 21 20:58:16 2009
New Revision: 828213

URL: http://svn.apache.org/viewvc?rev=828213&view=rev
Log:
Fix PIG-976, PIG-1012 unit test failures

Modified:
    hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POFRJoin.java
    hadoop/pig/trunk/test/org/apache/pig/test/TestMRCompiler.java
    hadoop/pig/trunk/test/org/apache/pig/test/TestMultiQuery.java

Modified: hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POFRJoin.java
URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POFRJoin.java?rev=828213&r1=828212&r2=828213&view=diff
==============================================================================
--- hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POFRJoin.java (original)
+++ hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POFRJoin.java Wed Oct 21 20:58:16 2009
@@ -65,7 +65,7 @@
      * 
      */
     private static final long serialVersionUID = 1L;
-    transient private Log log = LogFactory.getLog(getClass());
+    static private Log log = LogFactory.getLog(POFRJoin.class);
     //The number in the input list which denotes the fragmented input
     private int fragment;
     //There can be n inputs each being a List<PhysicalPlan>

Modified: hadoop/pig/trunk/test/org/apache/pig/test/TestMRCompiler.java
URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/test/org/apache/pig/test/TestMRCompiler.java?rev=828213&r1=828212&r2=828213&view=diff
==============================================================================
--- hadoop/pig/trunk/test/org/apache/pig/test/TestMRCompiler.java (original)
+++ hadoop/pig/trunk/test/org/apache/pig/test/TestMRCompiler.java Wed Oct 21 20:58:16 2009
@@ -98,7 +98,7 @@
     // WILL OVERWRITE THE GOLDEN FILES - So use this
     // with caution and only for the testcases you need
     // and are sure of
-    private boolean generate = true;
+    private boolean generate = false;
 
     @Before
     public void setUp() throws ExecException {

Modified: hadoop/pig/trunk/test/org/apache/pig/test/TestMultiQuery.java
URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/test/org/apache/pig/test/TestMultiQuery.java?rev=828213&r1=828212&r2=828213&view=diff
==============================================================================
--- hadoop/pig/trunk/test/org/apache/pig/test/TestMultiQuery.java (original)
+++ hadoop/pig/trunk/test/org/apache/pig/test/TestMultiQuery.java Wed Oct 21 20:58:16 2009
@@ -239,7 +239,7 @@
                                 "using PigStorage(':') as (uname:chararray, passwd:chararray, uid:int, gid:int);");
             myPig.registerQuery("b = group a by uid;");
             myPig.registerQuery("c = group a by (uname, gid);");
-            myPig.registerQuery("d = foreach b generate SUM(a.gid), group, group;");
+            myPig.registerQuery("d = foreach b generate SUM(a.gid), group, group as foo;");
             myPig.registerQuery("d1 = foreach d generate $1 + $2;");
             myPig.registerQuery("e = foreach c generate group, COUNT(a);");
             myPig.registerQuery("store d1 into '/tmp/output1';");