svn commit: r989865 - in /hadoop/hive/branches/branch-0.6: CHANGES.txt conf/hive-default.xml

[na...@apache.org]

Author: namit
Date: Thu Aug 26 18:33:57 2010
New Revision: 989865

URL: http://svn.apache.org/viewvc?rev=989865&view=rev
Log:
HIVE-1594. Typo of hive.merge.size.smallfiles.avgsize prevents
change of value. (Yun Huang Yong via namit)


Modified:
    hadoop/hive/branches/branch-0.6/CHANGES.txt
    hadoop/hive/branches/branch-0.6/conf/hive-default.xml

Modified: hadoop/hive/branches/branch-0.6/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/hive/branches/branch-0.6/CHANGES.txt?rev=989865&r1=989864&r2=989865&view=diff
==============================================================================
--- hadoop/hive/branches/branch-0.6/CHANGES.txt (original)
+++ hadoop/hive/branches/branch-0.6/CHANGES.txt Thu Aug 26 18:33:57 2010
@@ -593,6 +593,9 @@ Release 0.6.0 -  Unreleased
     HIVE-1543. Abort if record reader's next throws an exception
     (Ning Zhang via namit)
 
+    HIVE-1594. Typo of hive.merge.size.smallfiles.avgsize prevents
+    change of value. (Yun Huang Yong via namit)
+
 Release 0.5.0 -  Unreleased
 
   INCOMPATIBLE CHANGES

Modified: hadoop/hive/branches/branch-0.6/conf/hive-default.xml
URL: http://svn.apache.org/viewvc/hadoop/hive/branches/branch-0.6/conf/hive-default.xml?rev=989865&r1=989864&r2=989865&view=diff
==============================================================================
--- hadoop/hive/branches/branch-0.6/conf/hive-default.xml (original)
+++ hadoop/hive/branches/branch-0.6/conf/hive-default.xml Thu Aug 26 18:33:57 2010
@@ -450,7 +450,7 @@
 </property>
 
 <property>
-  <name>hive.merge.size.smallfiles.avgsize</name>
+  <name>hive.merge.smallfiles.avgsize</name>
   <value>16000000</value>
   <description>When the average output file size of a job is less than this number, Hive will start an additional map-reduce job to merge the output files into bigger files.  This is only done for map-only jobs if hive.merge.mapfiles is true, and for map-reduce jobs if hive.merge.mapredfiles is true.</description>
 </property>
@@ -582,7 +582,7 @@
 </property>
 
 <property>
-  <name>hive.default.partition.name</name>
+  <name>hive.exec.default.partition.name</name>
   <value>__HIVE_DEFAULT_PARTITION__</value>
   <description>The default partition name in case the dynamic partition column value is null/empty string or anyother values that cannot be escaped. This value must not contain any special character used in HDFS URI (e.g., ':', '%', '/' etc). The user has to be aware that the dynamic partition value should not contain this value to avoid confusions.</description>
 </property>