diff --git common/src/java/org/apache/hadoop/hive/conf/HiveConf.java common/src/java/org/apache/hadoop/hive/conf/HiveConf.java index ae7cd53..635891f 100644 --- common/src/java/org/apache/hadoop/hive/conf/HiveConf.java +++ common/src/java/org/apache/hadoop/hive/conf/HiveConf.java @@ -739,7 +739,7 @@ // 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 @@ "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",