You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pig.apache.org by ch...@apache.org on 2013/02/01 23:38:02 UTC
svn commit: r1441649 - in /pig/trunk: CHANGES.txt
src/org/apache/pig/backend/hadoop/executionengine/HExecutionEngine.java
Author: cheolsoo
Date: Fri Feb 1 22:38:02 2013
New Revision: 1441649
URL: http://svn.apache.org/viewvc?rev=1441649&view=rev
Log:
PIG-3145: Parameters in core-site.xml and mapred-site.xml are not correctly substituted (cheolsoo)
Modified:
pig/trunk/CHANGES.txt
pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/HExecutionEngine.java
Modified: pig/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/pig/trunk/CHANGES.txt?rev=1441649&r1=1441648&r2=1441649&view=diff
==============================================================================
--- pig/trunk/CHANGES.txt (original)
+++ pig/trunk/CHANGES.txt Fri Feb 1 22:38:02 2013
@@ -92,6 +92,8 @@ PIG-3013: BinInterSedes improve chararra
BUG FIXES
+PIG-3145: Parameters in core-site.xml and mapred-site.xml are not correctly substituted (cheolsoo)
+
PIG-3149: e2e build.xml still refers to jython 2.5.0 jar even though it's replaced by jython standalone 2.5.2 jar (cheolsoo)
PIG-2266: Bug with input file joining optimization in Pig (jadler via cheolsoo)
Modified: pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/HExecutionEngine.java
URL: http://svn.apache.org/viewvc/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/HExecutionEngine.java?rev=1441649&r1=1441648&r2=1441649&view=diff
==============================================================================
--- pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/HExecutionEngine.java (original)
+++ pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/HExecutionEngine.java Fri Feb 1 22:38:02 2013
@@ -172,15 +172,10 @@ public class HExecutionEngine {
jc.addResource("mapred-default.xml");
jc.addResource("yarn-default.xml");
recomputeProperties(jc, properties);
-
- properties.setProperty("mapreduce.framework.name", "local");
- properties.setProperty(JOB_TRACKER_LOCATION, LOCAL );
- properties.setProperty(FILE_SYSTEM_LOCATION, "file:///");
- properties.setProperty(ALTERNATIVE_FILE_SYSTEM_LOCATION, "file:///");
}
- cluster = properties.getProperty(JOB_TRACKER_LOCATION);
- nameNode = properties.getProperty(FILE_SYSTEM_LOCATION);
+ cluster = jc.get(JOB_TRACKER_LOCATION);
+ nameNode = jc.get(FILE_SYSTEM_LOCATION);
if (nameNode==null)
nameNode = (String)pigContext.getProperties().get(ALTERNATIVE_FILE_SYSTEM_LOCATION);