You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pig.apache.org by rd...@apache.org on 2010/12/09 19:06:38 UTC

svn commit: r1044054 - in /pig/trunk: CHANGES.txt src/org/apache/pig/data/InternalCachedBag.java

Author: rding
Date: Thu Dec  9 18:06:38 2010
New Revision: 1044054

URL: http://svn.apache.org/viewvc?rev=1044054&view=rev
Log:
PIG-1760: Need to report progress in all databags

Modified:
    pig/trunk/CHANGES.txt
    pig/trunk/src/org/apache/pig/data/InternalCachedBag.java

Modified: pig/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/pig/trunk/CHANGES.txt?rev=1044054&r1=1044053&r2=1044054&view=diff
==============================================================================
--- pig/trunk/CHANGES.txt (original)
+++ pig/trunk/CHANGES.txt Thu Dec  9 18:06:38 2010
@@ -230,6 +230,8 @@ PIG-1309: Map-side Cogroup (ashutoshc)
 
 BUG FIXES
 
+PIG-1760: Need to report progress in all databags (rding)
+
 PIG-1709: Skewed join use fewer reducer for extreme large key (daijy)
 
 PIG-1751: New logical plan: PushDownForEachFlatten fail in UDF with unknown

Modified: pig/trunk/src/org/apache/pig/data/InternalCachedBag.java
URL: http://svn.apache.org/viewvc/pig/trunk/src/org/apache/pig/data/InternalCachedBag.java?rev=1044054&r1=1044053&r2=1044054&view=diff
==============================================================================
--- pig/trunk/src/org/apache/pig/data/InternalCachedBag.java (original)
+++ pig/trunk/src/org/apache/pig/data/InternalCachedBag.java Thu Dec  9 18:06:38 2010
@@ -200,6 +200,8 @@ public class InternalCachedBag extends D
         DataInputStream in;
         Tuple next;
         
+        long numTuplesRead = 0;
+        
         public CachedBagIterator() {
             iter = mContents.iterator();
             if(mSpillFiles != null && mSpillFiles.size() > 0) {
@@ -258,6 +260,10 @@ public class InternalCachedBag extends D
             Tuple t = next;
             next = null;
 
+            numTuplesRead++;
+            // This will report progress every 16383 records.
+            if ((numTuplesRead & 0x3fff) == 0) reportProgress();
+            
             return t;
         }