diff --git common/src/java/org/apache/hadoop/hive/conf/HiveConf.java common/src/java/org/apache/hadoop/hive/conf/HiveConf.java index 85ceda3..5f5446c 100644 --- common/src/java/org/apache/hadoop/hive/conf/HiveConf.java +++ common/src/java/org/apache/hadoop/hive/conf/HiveConf.java @@ -5348,7 +5348,7 @@ public String getLogIdVar(String defaultValue) { public static void setVar(Configuration conf, ConfVars var, String val) { assert (var.valClass == String.class) : var.varname; - conf.set(var.varname, val); + conf.set(var.varname, val, "setVar"); } public static void setVar(Configuration conf, ConfVars var, String val, EncoderDecoder encoderDecoder) { @@ -5368,7 +5368,7 @@ public String getVar(ConfVars var) { } public void setVar(ConfVars var, String val) { - setVar(this, var, val); + setVar(this, var, val, "setVar"); } public String getQueryString() { @@ -5457,7 +5457,7 @@ private void initialize(Class cls) { origProp = getAllProperties(); // Overlay the ConfVars. Note that this ignores ConfVars with null values - addResource(getConfVarInputStream()); + addResource(getConfVarInputStream(), "HiveConf.java"); // Overlay hive-site.xml if it exists if (hiveSiteURL != null) { @@ -5570,8 +5570,8 @@ private void setupSQLStdAuthWhiteList() { if (whiteListParamsStr == null || whiteListParamsStr.trim().isEmpty()) { // set the default configs in whitelist whiteListParamsStr = getSQLStdAuthDefaultWhiteListPattern(); + setVar(ConfVars.HIVE_AUTHORIZATION_SQL_STD_AUTH_CONFIG_WHITELIST, whiteListParamsStr); } - setVar(ConfVars.HIVE_AUTHORIZATION_SQL_STD_AUTH_CONFIG_WHITELIST, whiteListParamsStr); } private static String getSQLStdAuthDefaultWhiteListPattern() {