You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pig.apache.org by ga...@apache.org on 2012/11/13 17:37:07 UTC
svn commit: r1408827 - in /pig/trunk: CHANGES.txt
src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/JobControlCompiler.java
src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/PORank.java
Author: gates
Date: Tue Nov 13 16:37:06 2012
New Revision: 1408827
URL: http://svn.apache.org/viewvc?rev=1408827&view=rev
Log:
PIG-2989 Illustrate for Rank Operator
Modified:
pig/trunk/CHANGES.txt
pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/JobControlCompiler.java
pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/PORank.java
Modified: pig/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/pig/trunk/CHANGES.txt?rev=1408827&r1=1408826&r2=1408827&view=diff
==============================================================================
--- pig/trunk/CHANGES.txt (original)
+++ pig/trunk/CHANGES.txt Tue Nov 13 16:37:06 2012
@@ -56,6 +56,8 @@ PIG-3013: BinInterSedes improve chararra
BUG FIXES
+PIG-2989: Illustrate for Rank Operator (xalan via gates)
+
PIG-2885: TestJobSumission and TestHBaseStorage don't work with HBase 0.94 and ZK 3.4.3 (cheolsoo via sms)
PIG-2928: Fix e2e test failures in trunk: FilterBoolean_23/24 (cheolsoo via dvryaboy)
Modified: pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/JobControlCompiler.java
URL: http://svn.apache.org/viewvc/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/JobControlCompiler.java?rev=1408827&r1=1408826&r2=1408827&view=diff
==============================================================================
--- pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/JobControlCompiler.java (original)
+++ pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/JobControlCompiler.java Tue Nov 13 16:37:06 2012
@@ -326,7 +326,7 @@ public class JobControlCompiler{
if (!completeFailedJobs.contains(job))
{
MapReduceOper mro = jobMroMap.get(job);
- if (mro.isCounterOperation() /*&& completeFailedJobs.size() > 0*/)
+ if (!pigContext.inIllustrator && mro.isCounterOperation())
saveCounters(job,mro.getOperationID());
plan.remove(mro);
}
Modified: pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/PORank.java
URL: http://svn.apache.org/viewvc/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/PORank.java?rev=1408827&r1=1408826&r2=1408827&view=diff
==============================================================================
--- pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/PORank.java (original)
+++ pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/PORank.java Tue Nov 13 16:37:06 2012
@@ -156,6 +156,10 @@ public class PORank extends PhysicalOper
Long rank = PigMapReduce.sJobConfInternal.get().getLong( nameCounter , -1L );
+ if(illustrator != null) {
+ rank = 0L;
+ }
+
if(rank == -1) {
log.error("Error on reading counter "+ nameCounter);
throw new RuntimeException("Unable to read counter "+ nameCounter);