Author: hashutosh Date: Fri Jun 11 17:07:51 2010 New Revision: 953774 URL: http://svn.apache.org/viewvc?rev=953774&view=rev Log: PIG-1446: OOME in a query having a bincond in the inner plan of a Foreach.
Modified: hadoop/pig/trunk/CHANGES.txt hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/plans/PhysicalPlan.java hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POForEach.java Modified: hadoop/pig/trunk/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/CHANGES.txt?rev=953774&r1=953773&r2=953774&view=diff ============================================================================== --- hadoop/pig/trunk/CHANGES.txt (original) +++ hadoop/pig/trunk/CHANGES.txt Fri Jun 11 17:07:51 2010 @@ -79,6 +79,8 @@ PIG-1309: Map-side Cogroup (ashutoshc) BUG FIXES +PIG-1446: OOME in a query having a bincond in the inner plan of a Foreach.(hashutosh) + PIG-1433: pig should create success file if mapreduce.fileoutputcommitter.marksuccessfuljobs is true (pradeepkth) Modified: hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/plans/PhysicalPlan.java URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/plans/PhysicalPlan.java?rev=953774&r1=953773&r2=953774&view=diff ============================================================================== --- hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/plans/PhysicalPlan.java (original) +++ hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/plans/PhysicalPlan.java Fri Jun 11 17:07:51 2010 @@ -68,6 +68,10 @@ public class PhysicalPlan extends Operat } } + public void detachInput(){ + for(PhysicalOperator op : getRoots()) + op.detachInput(); + } /** * Write a visual representation of the Physical Plan * into the given output stream Modified: hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POForEach.java URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POForEach.java?rev=953774&r1=953773&r2=953774&view=diff ============================================================================== --- hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POForEach.java (original) +++ hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POForEach.java Fri Jun 11 17:07:51 2010 @@ -219,7 +219,9 @@ public class POForEach extends PhysicalO return res; } if(res.returnStatus==POStatus.STATUS_EOP) { - processingPlan = false; + processingPlan = false; + for(PhysicalPlan plan : inputPlans) + plan.detachInput(); break; } if(res.returnStatus==POStatus.STATUS_ERR) {