pig-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From da...@apache.org
Subject svn commit: r1603248 - in /pig/trunk: CHANGES.txt src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POCounter.java src/org/apache/pig/backend/hadoop/executionengine/tez/operators/POCounterTez.java
Date Tue, 17 Jun 2014 18:24:08 GMT
Author: daijy
Date: Tue Jun 17 18:24:08 2014
New Revision: 1603248

URL: http://svn.apache.org/r1603248
Log:
PIG-4014: Fix Rank e2e test failures on tez

Modified:
    pig/trunk/CHANGES.txt
    pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POCounter.java
    pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/tez/operators/POCounterTez.java

Modified: pig/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/pig/trunk/CHANGES.txt?rev=1603248&r1=1603247&r2=1603248&view=diff
==============================================================================
--- pig/trunk/CHANGES.txt (original)
+++ pig/trunk/CHANGES.txt Tue Jun 17 18:24:08 2014
@@ -34,6 +34,8 @@ OPTIMIZATIONS
  
 BUG FIXES
 
+PIG-4014: Fix Rank e2e test failures on tez (daijy)
+
 PIG-4013: Order by multiple column fail on Tez (daijy)
 
 PIG-3983: TestGrunt.testKeepGoigFailed fail on tez mode (daijy)

Modified: pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POCounter.java
URL: http://svn.apache.org/viewvc/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POCounter.java?rev=1603248&r1=1603247&r2=1603248&view=diff
==============================================================================
--- pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POCounter.java
(original)
+++ pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POCounter.java
Tue Jun 17 18:24:08 2014
@@ -51,7 +51,7 @@ import org.apache.pig.pen.util.ExampleTu
 public class POCounter extends PhysicalOperator {
 
     private static final long serialVersionUID = 1L;
-    private static final Long ONE = 1L;
+    public static final Long ONE = 1L;
 
     private List<PhysicalPlan> counterPlans;
     private List<Boolean> mAscCols;

Modified: pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/tez/operators/POCounterTez.java
URL: http://svn.apache.org/viewvc/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/tez/operators/POCounterTez.java?rev=1603248&r1=1603247&r2=1603248&view=diff
==============================================================================
--- pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/tez/operators/POCounterTez.java
(original)
+++ pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/tez/operators/POCounterTez.java
Tue Jun 17 18:24:08 2014
@@ -33,6 +33,7 @@ import org.apache.pig.backend.hadoop.exe
 import org.apache.pig.backend.hadoop.executionengine.tez.POValueOutputTez;
 import org.apache.pig.backend.hadoop.executionengine.tez.TezOutput;
 import org.apache.pig.backend.hadoop.executionengine.tez.TezTaskConfigurable;
+import org.apache.pig.data.Tuple;
 import org.apache.pig.impl.plan.VisitorException;
 import org.apache.tez.runtime.api.LogicalOutput;
 import org.apache.tez.runtime.api.TezProcessorContext;
@@ -123,6 +124,9 @@ public class POCounterTez extends POCoun
 
                 tuplesWriter.write(POValueOutputTez.EMPTY_KEY,
                         addCounterValue(inp).result);
+                if (isRowNumber()) {
+                    incrementReduceCounter(POCounter.ONE);
+                }
             }
 
             statsWriter.write(new IntWritable(this.getTaskId()), new LongWritable(totalTaskRecords));
@@ -134,18 +138,6 @@ public class POCounterTez extends POCoun
     }
 
     @Override
-    protected Long incrementLocalCounter() {
-        totalTaskRecords++;
-        return super.incrementLocalCounter();
-    }
-
-    @Override
-    protected void addToLocalCounter(Long sizeBag) {
-        super.addToLocalCounter(sizeBag);
-        totalTaskRecords += sizeBag;
-    }
-
-    @Override
     protected void incrementReduceCounter(Long increment) {
         totalTaskRecords += increment;
     }



Mime
View raw message