Author: daijy
Date: Tue May 19 23:40:47 2015
New Revision: 1680423
URL: http://svn.apache.org/r1680423
Log:
PIG-4556: Local mode is broken in some case by PIG-4247
Modified:
pig/branches/branch-0.15/CHANGES.txt
pig/branches/branch-0.15/src/org/apache/pig/backend/hadoop/executionengine/HExecutionEngine.java
Modified: pig/branches/branch-0.15/CHANGES.txt
URL:
http://svn.apache.org/viewvc/pig/branches/branch-0.15/CHANGES.txt?rev=1680423&r1=1680422&r2=1680423&view=diff
==============================================================================
--- pig/branches/branch-0.15/CHANGES.txt (original)
+++ pig/branches/branch-0.15/CHANGES.txt Tue May 19 23:40:47 2015
@@ -66,6 +66,8 @@ PIG-4333: Split BigData tests into multi
BUG FIXES
+PIG-4556: Local mode is broken in some case by PIG-4247 (daijy)
+
PIG-4523: Tez engine should use tez config rather than mr config whenever
possible (daijy)
PIG-4452: Embedded SQL using "SQL" instead of "sql" fails with string index
out of range: -1 error (daijy)
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=1680423&r1=1680422&r2=1680423&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
Tue May 19 23:40:47 2015
@@ -116,16 +116,17 @@ public abstract class HExecutionEngine i
public JobConf getS3Conf() throws ExecException {
JobConf jc = new JobConf();
jc.addResource(CORE_SITE);
+ JobConf s3Jc = new JobConf(false);
Iterator<Entry<String, String>> i = jc.iterator();
while (i.hasNext()) {
Entry<String, String> e = i.next();
String key = e.getKey();
String value = e.getValue();
if (key.startsWith("fs.s3") || key.startsWith("fs.s3n")) {
- jc.set(key, value);
+ s3Jc.set(key, value);
}
}
- return jc;
+ return s3Jc;
}
public JobConf getLocalConf() {
