Author: daijy
Date: Fri Oct 17 21:22:23 2014
New Revision: 1632671
URL: http://svn.apache.org/r1632671
Log:
PIG-4238: Property 'pig.job.converted.fetch' should be unset when fetch finishes
Modified:
pig/branches/branch-0.14/CHANGES.txt
pig/branches/branch-0.14/src/org/apache/pig/backend/hadoop/executionengine/HExecutionEngine.java
pig/branches/branch-0.14/src/org/apache/pig/backend/hadoop/executionengine/fetch/FetchLauncher.java
Modified: pig/branches/branch-0.14/CHANGES.txt
URL: http://svn.apache.org/viewvc/pig/branches/branch-0.14/CHANGES.txt?rev=1632671&r1=1632670&r2=1632671&view=diff
==============================================================================
--- pig/branches/branch-0.14/CHANGES.txt (original)
+++ pig/branches/branch-0.14/CHANGES.txt Fri Oct 17 21:22:23 2014
@@ -84,6 +84,8 @@ OPTIMIZATIONS
BUG FIXES
+PIG-4238: Property 'pig.job.converted.fetch' should be unset when fetch finishes (lbendig)
+
PIG-4151: Pig Cannot Write Empty Maps to HBase (daijy)
PIG-4181: Cannot launch tez e2e test on Windows (daijy)
Modified: pig/branches/branch-0.14/src/org/apache/pig/backend/hadoop/executionengine/HExecutionEngine.java
URL: http://svn.apache.org/viewvc/pig/branches/branch-0.14/src/org/apache/pig/backend/hadoop/executionengine/HExecutionEngine.java?rev=1632671&r1=1632670&r2=1632671&view=diff
==============================================================================
--- pig/branches/branch-0.14/src/org/apache/pig/backend/hadoop/executionengine/HExecutionEngine.java (original)
+++ pig/branches/branch-0.14/src/org/apache/pig/backend/hadoop/executionengine/HExecutionEngine.java Fri Oct 17 21:22:23 2014
@@ -46,6 +46,7 @@ import org.apache.pig.backend.hadoop.exe
import org.apache.pig.backend.hadoop.executionengine.util.MapRedUtil;
import org.apache.pig.backend.hadoop.streaming.HadoopExecutableManager;
import org.apache.pig.impl.PigContext;
+import org.apache.pig.impl.PigImplConstants;
import org.apache.pig.impl.logicalLayer.FrontendException;
import org.apache.pig.impl.plan.OperatorKey;
import org.apache.pig.impl.plan.PlanException;
@@ -296,7 +297,7 @@ public abstract class HExecutionEngine i
PrintStream pps = ps;
PrintStream eps = ps;
-
+ boolean isFetchable = false;
try {
if (file != null) {
pps = new PrintStream(new File(file, "physical_plan-" + suffix));
@@ -307,13 +308,16 @@ public abstract class HExecutionEngine i
pp.explain(pps, format, verbose);
MapRedUtil.checkLeafIsStore(pp, pigContext);
- if (FetchOptimizer.isPlanFetchable(pc, pp)) {
+ isFetchable = FetchOptimizer.isPlanFetchable(pc, pp);
+ if (isFetchable) {
new FetchLauncher(pigContext).explain(pp, pc, eps, format);
return;
}
launcher.explain(pp, pigContext, eps, format, verbose);
} finally {
launcher.reset();
+ if (isFetchable)
+ pigContext.getProperties().remove(PigImplConstants.CONVERTED_TO_FETCH);
//Only close the stream if we opened it.
if (file != null) {
pps.close();
Modified: pig/branches/branch-0.14/src/org/apache/pig/backend/hadoop/executionengine/fetch/FetchLauncher.java
URL: http://svn.apache.org/viewvc/pig/branches/branch-0.14/src/org/apache/pig/backend/hadoop/executionengine/fetch/FetchLauncher.java?rev=1632671&r1=1632670&r2=1632671&view=diff
==============================================================================
--- pig/branches/branch-0.14/src/org/apache/pig/backend/hadoop/executionengine/fetch/FetchLauncher.java (original)
+++ pig/branches/branch-0.14/src/org/apache/pig/backend/hadoop/executionengine/fetch/FetchLauncher.java Fri Oct 17 21:22:23 2014
@@ -25,7 +25,6 @@ import org.apache.hadoop.mapreduce.TaskA
import org.apache.pig.PigException;
import org.apache.pig.backend.executionengine.ExecException;
import org.apache.pig.backend.hadoop.datastorage.ConfigurationUtil;
-import org.apache.pig.backend.hadoop.executionengine.TaskContext;
import org.apache.pig.backend.hadoop.executionengine.mapReduceLayer.PigHadoopLogger;
import org.apache.pig.backend.hadoop.executionengine.mapReduceLayer.PigMapReduce;
import org.apache.pig.backend.hadoop.executionengine.mapReduceLayer.UDFFinishVisitor;
@@ -40,6 +39,7 @@ import org.apache.pig.backend.hadoop.exe
import org.apache.pig.backend.hadoop.executionengine.util.MapRedUtil;
import org.apache.pig.data.SchemaTupleBackend;
import org.apache.pig.impl.PigContext;
+import org.apache.pig.impl.PigImplConstants;
import org.apache.pig.impl.plan.DependencyOrderWalker;
import org.apache.pig.impl.plan.PlanException;
import org.apache.pig.impl.plan.VisitorException;
@@ -88,6 +88,7 @@ public class FetchLauncher {
}
finally {
UDFContext.getUDFContext().addJobConf(null);
+ pigContext.getProperties().remove(PigImplConstants.CONVERTED_TO_FETCH);
}
}