svn commit: r1662796 - in /pig/trunk: CHANGES.txt src/org/apache/pig/impl/builtin/GetMemNumRows.java

[daijy]

Author: daijy
Date: Fri Feb 27 18:59:53 2015
New Revision: 1662796

URL: http://svn.apache.org/r1662796
Log:
PIG-4437: Fix tez unit test failure TestJoinSmoke, TestSkewedJoin

Modified:
    pig/trunk/CHANGES.txt
    pig/trunk/src/org/apache/pig/impl/builtin/GetMemNumRows.java

Modified: pig/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/pig/trunk/CHANGES.txt?rev=1662796&r1=1662795&r2=1662796&view=diff
==============================================================================
--- pig/trunk/CHANGES.txt (original)
+++ pig/trunk/CHANGES.txt Fri Feb 27 18:59:53 2015
@@ -50,6 +50,8 @@ PIG-4333: Split BigData tests into multi
  
 BUG FIXES
 
+PIG-4437: Fix tez unit test failure TestJoinSmoke, TestSkewedJoin (daijy)
+
 PIG-4432: Built-in VALUELIST and VALUESET UDFs do not preserve the schema when 
the map value type is
  a complex type (erwaman via daijy)
 

Modified: pig/trunk/src/org/apache/pig/impl/builtin/GetMemNumRows.java
URL: 
http://svn.apache.org/viewvc/pig/trunk/src/org/apache/pig/impl/builtin/GetMemNumRows.java?rev=1662796&r1=1662795&r2=1662796&view=diff
==============================================================================
--- pig/trunk/src/org/apache/pig/impl/builtin/GetMemNumRows.java (original)
+++ pig/trunk/src/org/apache/pig/impl/builtin/GetMemNumRows.java Fri Feb 27 
18:59:53 2015
@@ -21,6 +21,7 @@ import java.io.IOException;
 import java.lang.reflect.Type;
 
 import org.apache.pig.EvalFunc;
+import org.apache.pig.data.SizeUtil;
 import org.apache.pig.data.Tuple;
 import org.apache.pig.data.TupleFactory;
 
@@ -56,7 +57,7 @@ public class GetMemNumRows extends EvalF
         int tSize = in.size();
        if(tSize >=2 && 
            PoissonSampleLoader.NUMROWS_TUPLE_MARKER.equals(in.get(tSize-2)) ){
-           memSize = 0;
+           memSize -= 
SizeUtil.getPigObjMemSize(PoissonSampleLoader.NUMROWS_TUPLE_MARKER);
            numRows = (Long)in.get(tSize-1);
        }