svn commit: r890553 - in /hadoop/pig/trunk: CHANGES.txt src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POFRJoin.java

[olga]

Author: olga
Date: Mon Dec 14 23:33:10 2009
New Revision: 890553

URL: http://svn.apache.org/viewvc?rev=890553&view=rev
Log:
PIG-1106: FR join should not spill (ankit.modi via olgan)

Modified:
    hadoop/pig/trunk/CHANGES.txt
    
hadoop/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POFRJoin.java

Modified: hadoop/pig/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/pig/trunk/CHANGES.txt?rev=890553&r1=890552&r2=890553&view=diff
==============================================================================
--- hadoop/pig/trunk/CHANGES.txt (original)
+++ hadoop/pig/trunk/CHANGES.txt Mon Dec 14 23:33:10 2009
@@ -24,6 +24,8 @@
 
 IMPROVEMENTS
 
+PIG-1106: FR join should not spill (ankit.modi via olgan)
+
 PIG-1147: Zebra Docs for Pig 0.6.0 (chandec via olgan)
 
 PIG-1129: Pig UDF doc: fieldsToRead function (chandec via olgan)

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=890553&r1=890552&r2=890553&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
 Mon Dec 14 23:33:10 2009
@@ -37,9 +37,9 @@
 import 
org.apache.pig.backend.hadoop.executionengine.physicalLayer.expressionOperators.ConstantExpression;
 import 
org.apache.pig.backend.hadoop.executionengine.physicalLayer.plans.PhyPlanVisitor;
 import 
org.apache.pig.backend.hadoop.executionengine.physicalLayer.plans.PhysicalPlan;
-import org.apache.pig.data.BagFactory;
 import org.apache.pig.data.DataBag;
 import org.apache.pig.data.DataType;
+import org.apache.pig.data.NonSpillableDataBag;
 import org.apache.pig.data.Tuple;
 import org.apache.pig.data.TupleFactory;
 import org.apache.pig.impl.PigContext;
@@ -94,7 +94,6 @@
     private Tuple dumTup = TupleFactory.getInstance().newTuple(1);
     // An instance of tuple factory
     private transient TupleFactory mTupleFactory;
-    private transient BagFactory mBagFactory;
     private boolean setUp;
     // A Boolean variable which denotes if this is a LeftOuter Join or an Inner
     // Join
@@ -120,10 +119,9 @@
         createJoinPlans(k);
         processingPlan = false;
         mTupleFactory = TupleFactory.getInstance();
-        mBagFactory = BagFactory.getInstance();
         List<Tuple> tupList = new ArrayList<Tuple>();
         tupList.add(nullTuple);
-        nullBag = mBagFactory.newDefaultBag(tupList);
+        nullBag = new NonSpillableDataBag(tupList);
         this.isLeftOuterJoin = isLeftOuter;
     }
 
@@ -272,7 +270,7 @@
                     noMatch = true;
                     break;
                 }
-                ce.setValue(mBagFactory.newDefaultBag(replicate.get(key)));
+                ce.setValue(new NonSpillableDataBag(replicate.get(key)));
             }
 
             // If this is not LeftOuter Join and there was no match we
@@ -352,7 +350,6 @@
             ClassNotFoundException, ExecException {
         is.defaultReadObject();
         mTupleFactory = TupleFactory.getInstance();
-        mBagFactory = BagFactory.getInstance();
         // setUpHashTable();
     }