You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pig.apache.org by ro...@apache.org on 2016/01/29 23:04:24 UTC

svn commit: r1727651 - in /pig/trunk: CHANGES.txt src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POForEach.java test/e2e/pig/tests/nightly.conf

Author: rohini
Date: Fri Jan 29 22:04:24 2016
New Revision: 1727651

URL: http://svn.apache.org/viewvc?rev=1727651&view=rev
Log:
PIG-4791: PORelationToExprProject filters records instead of returning emptybag in nested foreach after union (rohini)

Modified:
    pig/trunk/CHANGES.txt
    pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POForEach.java
    pig/trunk/test/e2e/pig/tests/nightly.conf

Modified: pig/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/pig/trunk/CHANGES.txt?rev=1727651&r1=1727650&r2=1727651&view=diff
==============================================================================
--- pig/trunk/CHANGES.txt (original)
+++ pig/trunk/CHANGES.txt Fri Jan 29 22:04:24 2016
@@ -85,6 +85,8 @@ PIG-4639: Add better parser for Apache H
 
 BUG FIXES
 
+PIG-4791: PORelationToExprProject filters records instead of returning emptybag in nested foreach after union (rohini)
+
 PIG-4779: testBZ2Concatenation[pig.bzip.use.hadoop.inputformat = true] failing due to successful read (knoguchi)
 
 PIG-4587: Applying isFirstReduceOfKey for Skewed left outer join skips records (rohini)

Modified: pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POForEach.java
URL: http://svn.apache.org/viewvc/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POForEach.java?rev=1727651&r1=1727650&r2=1727651&view=diff
==============================================================================
--- pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POForEach.java (original)
+++ pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POForEach.java Fri Jan 29 22:04:24 2016
@@ -682,14 +682,9 @@ public class POForEach extends PhysicalO
             }
         }
 
-        List<PhysicalOperator> ops = new ArrayList<PhysicalOperator>(opsToBeReset.size());
-        for (PhysicalOperator op : opsToBeReset) {
-            ops.add(op);
-        }
         POForEach clone = new POForEach(new OperatorKey(mKey.scope,
                 NodeIdGenerator.getGenerator().getNextNodeId(mKey.scope)),
                 requestedParallelism, plans, flattens);
-        clone.setOpsToBeReset(ops);
         clone.setResultType(getResultType());
         clone.addOriginalLocation(alias, getOriginalLocations());
         clone.endOfAllInputProcessing = endOfAllInputProcessing;

Modified: pig/trunk/test/e2e/pig/tests/nightly.conf
URL: http://svn.apache.org/viewvc/pig/trunk/test/e2e/pig/tests/nightly.conf?rev=1727651&r1=1727650&r2=1727651&view=diff
==============================================================================
--- pig/trunk/test/e2e/pig/tests/nightly.conf (original)
+++ pig/trunk/test/e2e/pig/tests/nightly.conf Fri Jan 29 22:04:24 2016
@@ -1580,6 +1580,21 @@ b = load ':INPATH:/singlefile/studentcol
 c = union a, b;
 d = distinct c;
 store c into ':OUTPATH:';\,
+            },
+            {
+            # Union + Groupby + FILTER
+            'num' => 17,
+            'pig' => q\a = load ':INPATH:/singlefile/studenttab10k' as (name, age, gpa:float);
+b = load ':INPATH:/singlefile/studentcolon10k' using PigStorage(':') as (name, age, gpa:float);
+c = group a by name;
+d = group b by name;
+e = union c, d;
+e = foreach e generate $0, $1 as groupbag;
+f = foreach e {
+     g = order $1 by age asc, gpa desc;  
+     h = filter g by (gpa == 0 ? true : false);
+     generate group, h; };
+store f into ':OUTPATH:';\,
             }
 		]
 		},