hive-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From na...@apache.org
Subject svn commit: r1614279 - /hive/trunk/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java
Date Tue, 29 Jul 2014 08:00:15 GMT
Author: navis
Date: Tue Jul 29 08:00:14 2014
New Revision: 1614279

URL: http://svn.apache.org/r1614279
Log:
HIVE-7497 : Fix some default values in HiveConf (Dong Chen reviewed by Brock Noland, Navis)

Modified:
    hive/trunk/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java

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=1614279&r1=1614278&r2=1614279&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 Tue Jul 29 08:00:14
2014
@@ -739,7 +739,7 @@ public class HiveConf extends Configurat
     // HWI
     HIVEHWILISTENHOST("hive.hwi.listen.host", "0.0.0.0", "This is the host address the Hive
Web Interface will listen on"),
     HIVEHWILISTENPORT("hive.hwi.listen.port", "9999", "This is the port the Hive Web Interface
will listen on"),
-    HIVEHWIWARFILE("hive.hwi.war.file", "${system:HWI_WAR_FILE}",
+    HIVEHWIWARFILE("hive.hwi.war.file", "${env:HWI_WAR_FILE}",
         "This sets the path to the HWI war file, relative to ${HIVE_HOME}. "),
 
     HIVEHADOOPMAXMEM("hive.mapred.local.mem", 0, "mapper/reducer memory in local mode"),
@@ -1388,10 +1388,9 @@ public class HiveConf extends Configurat
         "which you can then extract a URL from and pass to PropertyConfigurator.configure(URL)."),
 
     // Hive global init file location
-    HIVE_GLOBAL_INIT_FILE_LOCATION("hive.global.init.file.location", System.getenv("HIVE_CONF_DIR"),
+    HIVE_GLOBAL_INIT_FILE_LOCATION("hive.server2.global.init.file.location", "${env:HIVE_CONF_DIR}",
         "The location of HS2 global init file (.hiverc).\n" +
-        "If the property is not set, then HS2 will search for the file in $HIVE_CONF_DIR/.\n"
+
-        "If the property is set, the value must be a valid path where the init file is located."),
+        "If the property is reset, the value must be a valid path where the init file is
located."),
 
     // prefix used to auto generated column aliases (this should be started with '_')
     HIVE_AUTOGEN_COLUMNALIAS_PREFIX_LABEL("hive.autogen.columnalias.prefix.label", "_c",



Mime
View raw message