diff --git common/src/java/org/apache/hadoop/hive/conf/HiveConf.java common/src/java/org/apache/hadoop/hive/conf/HiveConf.java index 8a7c4df..4fc7c97 100644 --- common/src/java/org/apache/hadoop/hive/conf/HiveConf.java +++ common/src/java/org/apache/hadoop/hive/conf/HiveConf.java @@ -1386,10 +1386,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", diff --git conf/hive-default.xml.template conf/hive-default.xml.template index 17c7023..d7deafc 100644 --- conf/hive-default.xml.template +++ conf/hive-default.xml.template @@ -2452,12 +2452,11 @@ - hive.global.init.file.location - + hive.server2.global.init.file.location + ${env:HIVE_CONF_DIR} The location of HS2 global init file (.hiverc). - If the property is not set, then HS2 will search for the file in $HIVE_CONF_DIR/. - 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.