Author: nzhang
Date: Wed Jul 6 19:47:28 2011
New Revision: 1143540
URL: http://svn.apache.org/viewvc?rev=1143540&view=rev
Log:
HIVE-2245. Make CombineHiveInputFormat the default hive.input.format (Carl
Steinbach via Ning Zhang)
Modified:
hive/trunk/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java
hive/trunk/conf/hive-default.xml
Modified: hive/trunk/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java
URL:
http://svn.apache.org/viewvc/hive/trunk/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java?rev=1143540&r1=1143539&r2=1143540&view=diff
==============================================================================
--- hive/trunk/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java
(original)
+++ hive/trunk/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java Wed
Jul 6 19:47:28 2011
@@ -353,7 +353,7 @@ public class HiveConf extends Configurat
HIVEJOBPROGRESS("hive.task.progress", false),
- HIVEINPUTFORMAT("hive.input.format", ""),
+ HIVEINPUTFORMAT("hive.input.format",
"org.apache.hadoop.hive.ql.io.CombineHiveInputFormat"),
HIVEENFORCEBUCKETING("hive.enforce.bucketing", false),
HIVEENFORCESORTING("hive.enforce.sorting", false),
Modified: hive/trunk/conf/hive-default.xml
URL:
http://svn.apache.org/viewvc/hive/trunk/conf/hive-default.xml?rev=1143540&r1=1143539&r2=1143540&view=diff
==============================================================================
--- hive/trunk/conf/hive-default.xml (original)
+++ hive/trunk/conf/hive-default.xml Wed Jul 6 19:47:28 2011
@@ -638,8 +638,8 @@
<property>
<name>hive.input.format</name>
- <value>org.apache.hadoop.hive.ql.io.HiveInputFormat</value>
- <description>The default input format, if it is not specified, the system
assigns it. It is set to HiveInputFormat for hadoop versions 17, 18 and 19,
whereas it is set to CombineHiveInputFormat for hadoop 20. The user can always
overwrite it - if there is a bug in CombineHiveInputFormat, it can always be
manually set to HiveInputFormat. </description>
+ <value>org.apache.hadoop.hive.ql.io.CombineHiveInputFormat</value>
+ <description>The default input format. Set this to HiveInputFormat if you
encounter problems with CombineHiveInputFormat.</description>
</property>
<property>