Author: daijy
Date: Thu May 21 22:37:05 2015
New Revision: 1680961
URL: http://svn.apache.org/r1680961
Log:
PIG-4556: Local mode is broken in some case by PIG-4247 (PIG-4556-3.patch)
Modified:
pig/branches/branch-0.15/src/org/apache/pig/backend/hadoop/executionengine/HExecutionEngine.java
Modified:
pig/branches/branch-0.15/src/org/apache/pig/backend/hadoop/executionengine/HExecutionEngine.java
URL:
http://svn.apache.org/viewvc/pig/branches/branch-0.15/src/org/apache/pig/backend/hadoop/executionengine/HExecutionEngine.java?rev=1680961&r1=1680960&r2=1680961&view=diff
==============================================================================
---
pig/branches/branch-0.15/src/org/apache/pig/backend/hadoop/executionengine/HExecutionEngine.java
(original)
+++
pig/branches/branch-0.15/src/org/apache/pig/backend/hadoop/executionengine/HExecutionEngine.java
Thu May 21 22:37:05 2015
@@ -189,10 +189,9 @@ public abstract class HExecutionEngine i
// existing properties All of the above is accomplished in the method
// call below
- JobConf jc = getS3Conf();
+ JobConf jc;
if (!this.pigContext.getExecType().isLocal()) {
- JobConf execConf = getExecConf(properties);
- ConfigurationUtil.mergeConf(jc, execConf);
+ jc = getExecConf(properties);
// Trick to invoke static initializer of DistributedFileSystem to
// add hdfs-default.xml into configuration
@@ -206,8 +205,9 @@ public abstract class HExecutionEngine i
properties.setProperty(FILE_SYSTEM_LOCATION, "file:///");
properties.setProperty(ALTERNATIVE_FILE_SYSTEM_LOCATION,
"file:///");
- JobConf localConf = getLocalConf();
- ConfigurationUtil.mergeConf(jc, localConf);
+ jc = getLocalConf();
+ JobConf s3Jc = getS3Conf();
+ ConfigurationUtil.mergeConf(jc, s3Jc);
}
// the method below alters the properties object by overriding the
