pig-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From roh...@apache.org
Subject svn commit: r1710671 - in /pig/trunk/src/org/apache/pig: backend/hadoop/executionengine/tez/plan/operator/POSimpleTezLoad.java backend/hadoop/executionengine/tez/plan/optimizer/LoaderProcessor.java impl/util/UDFContextSeparator.java
Date Mon, 26 Oct 2015 18:33:05 GMT
Author: rohini
Date: Mon Oct 26 18:33:05 2015
New Revision: 1710671

URL: http://svn.apache.org/viewvc?rev=1710671&view=rev
Log:
Fix unit test failures for PIG-4697

Modified:
    pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/tez/plan/operator/POSimpleTezLoad.java
    pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/tez/plan/optimizer/LoaderProcessor.java
    pig/trunk/src/org/apache/pig/impl/util/UDFContextSeparator.java

Modified: pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/tez/plan/operator/POSimpleTezLoad.java
URL: http://svn.apache.org/viewvc/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/tez/plan/operator/POSimpleTezLoad.java?rev=1710671&r1=1710670&r2=1710671&view=diff
==============================================================================
--- pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/tez/plan/operator/POSimpleTezLoad.java
(original)
+++ pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/tez/plan/operator/POSimpleTezLoad.java
Mon Oct 26 18:33:05 2015
@@ -23,6 +23,7 @@ import java.util.Map;
 import java.util.Set;
 
 import org.apache.hadoop.conf.Configuration;
+import org.apache.pig.LoadFunc;
 import org.apache.pig.backend.executionengine.ExecException;
 import org.apache.pig.backend.hadoop.executionengine.mapReduceLayer.JobControlCompiler;
 import org.apache.pig.backend.hadoop.executionengine.mapReduceLayer.PigMapReduce;
@@ -33,7 +34,6 @@ import org.apache.pig.backend.hadoop.exe
 import org.apache.pig.backend.hadoop.executionengine.tez.runtime.TezInput;
 import org.apache.pig.data.Tuple;
 import org.apache.pig.impl.PigImplConstants;
-import org.apache.pig.impl.io.FileSpec;
 import org.apache.pig.impl.plan.OperatorKey;
 import org.apache.tez.mapreduce.input.MRInput;
 import org.apache.tez.mapreduce.lib.MRReader;
@@ -52,8 +52,8 @@ public class POSimpleTezLoad extends POL
     private transient Configuration conf;
     private transient boolean finished = false;
 
-    public POSimpleTezLoad(OperatorKey k, FileSpec lfile) {
-        super(k, lfile);
+    public POSimpleTezLoad(OperatorKey k, LoadFunc loader) {
+        super(k, loader);
     }
 
     @Override

Modified: pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/tez/plan/optimizer/LoaderProcessor.java
URL: http://svn.apache.org/viewvc/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/tez/plan/optimizer/LoaderProcessor.java?rev=1710671&r1=1710670&r2=1710671&view=diff
==============================================================================
--- pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/tez/plan/optimizer/LoaderProcessor.java
(original)
+++ pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/tez/plan/optimizer/LoaderProcessor.java
Mon Oct 26 18:33:05 2015
@@ -133,7 +133,8 @@ public class LoaderProcessor extends Tez
                 tezOp.plan.remove(ld);
                 // Now add the input handling operator for the Tez backend
                 // TODO: Move this upstream to the PhysicalPlan generation
-                POSimpleTezLoad tezLoad = new POSimpleTezLoad(ld.getOperatorKey(), ld.getLFile());
+                POSimpleTezLoad tezLoad = new POSimpleTezLoad(ld.getOperatorKey(), ld.getLoadFunc());
+                tezLoad.setLFile(ld.getLFile());
                 tezLoad.setSignature(ld.getSignature());
                 tezLoad.setInputKey(ld.getOperatorKey().toString());
                 tezLoad.copyAliasFrom(ld);

Modified: pig/trunk/src/org/apache/pig/impl/util/UDFContextSeparator.java
URL: http://svn.apache.org/viewvc/pig/trunk/src/org/apache/pig/impl/util/UDFContextSeparator.java?rev=1710671&r1=1710670&r2=1710671&view=diff
==============================================================================
--- pig/trunk/src/org/apache/pig/impl/util/UDFContextSeparator.java (original)
+++ pig/trunk/src/org/apache/pig/impl/util/UDFContextSeparator.java Mon Oct 26 18:33:05 2015
@@ -64,7 +64,7 @@ public class UDFContextSeparator extends
         udfContext = UDFContext.getUDFContext();
         allKeys = udfContext.getUdfConfs().keySet();
         knownKeys = new HashSet<UDFContext.UDFContextKey>();
-        algebraicUDFKeys = udfContext.getUdfConfs().keySet();
+        algebraicUDFKeys = new HashSet<UDFContext.UDFContextKey>();
         udfContextsPerPlan = new HashMap<String, Map<Enum<UDFType>, List<UDFContext.UDFContextKey>>>();
     }
 



Mime
View raw message