You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pig.apache.org by da...@apache.org on 2010/01/15 01:04:52 UTC
svn commit: r899486 - in /hadoop/pig/branches/branch-0.6: CHANGES.txt
src/org/apache/pig/backend/hadoop/executionengine/HExecutionEngine.java
Author: daijy
Date: Fri Jan 15 00:04:52 2010
New Revision: 899486
URL: http://svn.apache.org/viewvc?rev=899486&view=rev
Log:
PIG-1186: Pig do not take values in "pig-cluster-hadoop-site.xml"
Modified:
hadoop/pig/branches/branch-0.6/CHANGES.txt
hadoop/pig/branches/branch-0.6/src/org/apache/pig/backend/hadoop/executionengine/HExecutionEngine.java
Modified: hadoop/pig/branches/branch-0.6/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/pig/branches/branch-0.6/CHANGES.txt?rev=899486&r1=899485&r2=899486&view=diff
==============================================================================
--- hadoop/pig/branches/branch-0.6/CHANGES.txt (original)
+++ hadoop/pig/branches/branch-0.6/CHANGES.txt Fri Jan 15 00:04:52 2010
@@ -268,6 +268,8 @@
PIG-1185: Data bags do not close spill files after using iterator to read
tuples (yinghe via daijy)
+PIG-1186: Pig do not take values in "pig-cluster-hadoop-site.xml" (daijy)
+
Release 0.5.0
INCOMPATIBLE CHANGES
Modified: hadoop/pig/branches/branch-0.6/src/org/apache/pig/backend/hadoop/executionengine/HExecutionEngine.java
URL: http://svn.apache.org/viewvc/hadoop/pig/branches/branch-0.6/src/org/apache/pig/backend/hadoop/executionengine/HExecutionEngine.java?rev=899486&r1=899485&r2=899486&view=diff
==============================================================================
--- hadoop/pig/branches/branch-0.6/src/org/apache/pig/backend/hadoop/executionengine/HExecutionEngine.java (original)
+++ hadoop/pig/branches/branch-0.6/src/org/apache/pig/backend/hadoop/executionengine/HExecutionEngine.java Fri Jan 15 00:04:52 2010
@@ -344,7 +344,14 @@
hadoopProperties.put(key, val);
}
+ //clear user defined properties and re-populate
+ properties.clear();
+ Enumeration<Object> hodPropertiesIter = hadoopProperties.keys();
+ while (hodPropertiesIter.hasMoreElements()) {
+ String key = (String) hodPropertiesIter.nextElement();
+ String val = hadoopProperties.getProperty(key);
+ properties.put(key, val);
+ }
}
- }
-
+ }
}