You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pig.apache.org by ha...@apache.org on 2010/06/11 19:36:37 UTC
svn commit: r953783 - in /hadoop/pig/branches/branch-0.7: ./
src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/plans/
src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/
Author: hashutosh
Date: Fri Jun 11 17:36:37 2010
New Revision: 953783
URL: http://svn.apache.org/viewvc?rev=953783&view=rev
Log:
PIG-1446: OOME in a query having a bincond in the inner plan of a Foreach.
Modified:
hadoop/pig/branches/branch-0.7/CHANGES.txt
hadoop/pig/branches/branch-0.7/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/plans/PhysicalPlan.java
hadoop/pig/branches/branch-0.7/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POForEach.java
Modified: hadoop/pig/branches/branch-0.7/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/pig/branches/branch-0.7/CHANGES.txt?rev=953783&r1=953782&r2=953783&view=diff
==============================================================================
--- hadoop/pig/branches/branch-0.7/CHANGES.txt (original)
+++ hadoop/pig/branches/branch-0.7/CHANGES.txt Fri Jun 11 17:36:37 2010
@@ -194,6 +194,8 @@ OPTIMIZATIONS
BUG FIXES
+PIG-1446: https://issues.apache.org/jira/browse/PIG-1446 (hashutosh)
+
PIG-1433: pig should create success file if
mapreduce.fileoutputcommitter.marksuccessfuljobs is true (pradeepkth)
Modified: hadoop/pig/branches/branch-0.7/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/plans/PhysicalPlan.java
URL: http://svn.apache.org/viewvc/hadoop/pig/branches/branch-0.7/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/plans/PhysicalPlan.java?rev=953783&r1=953782&r2=953783&view=diff
==============================================================================
--- hadoop/pig/branches/branch-0.7/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/plans/PhysicalPlan.java (original)
+++ hadoop/pig/branches/branch-0.7/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/plans/PhysicalPlan.java Fri Jun 11 17:36:37 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/branches/branch-0.7/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POForEach.java
URL: http://svn.apache.org/viewvc/hadoop/pig/branches/branch-0.7/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POForEach.java?rev=953783&r1=953782&r2=953783&view=diff
==============================================================================
--- hadoop/pig/branches/branch-0.7/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POForEach.java (original)
+++ hadoop/pig/branches/branch-0.7/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POForEach.java Fri Jun 11 17:36:37 2010
@@ -218,7 +218,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) {