Repository: hive
Updated Branches:
  refs/heads/master 41afa4e21 -> dd0bc33d1


HIVE-18917: Add spark.home to hive.conf.restricted.list (Sahil Takiar, reviewed 
by Aihua Xu)


Project: http://git-wip-us.apache.org/repos/asf/hive/repo
Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/dd0bc33d
Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/dd0bc33d
Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/dd0bc33d

Branch: refs/heads/master
Commit: dd0bc33d125817e20bd4854172b3c8326c834ea0
Parents: 41afa4e
Author: Sahil Takiar <takiar.sa...@gmail.com>
Authored: Sat Mar 10 17:55:08 2018 -0800
Committer: Sahil Takiar <stak...@cloudera.com>
Committed: Sat Mar 10 17:55:08 2018 -0800

----------------------------------------------------------------------
 common/src/java/org/apache/hadoop/hive/conf/HiveConf.java         | 3 ++-
 .../src/test/java/org/apache/hive/jdbc/TestRestrictedList.java    | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hive/blob/dd0bc33d/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java
----------------------------------------------------------------------
diff --git a/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java 
b/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java
index 04b8c4b..aedd1ec 100644
--- a/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java
+++ b/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java
@@ -3674,7 +3674,8 @@ public class HiveConf extends Configuration {
             "hive.druid.coordinator.address.default,"+
             "hikari.,"+
             "hadoop.bin.path,"+
-            "yarn.bin.path",
+            "yarn.bin.path,"+
+            "spark.home",
         "Comma separated list of configuration options which are immutable at 
runtime"),
     HIVE_CONF_HIDDEN_LIST("hive.conf.hidden.list",
         METASTOREPWD.varname + "," + HIVE_SERVER2_SSL_KEYSTORE_PASSWORD.varname

http://git-wip-us.apache.org/repos/asf/hive/blob/dd0bc33d/itests/hive-unit/src/test/java/org/apache/hive/jdbc/TestRestrictedList.java
----------------------------------------------------------------------
diff --git 
a/itests/hive-unit/src/test/java/org/apache/hive/jdbc/TestRestrictedList.java 
b/itests/hive-unit/src/test/java/org/apache/hive/jdbc/TestRestrictedList.java
index 1ec77b0..79fdb68 100644
--- 
a/itests/hive-unit/src/test/java/org/apache/hive/jdbc/TestRestrictedList.java
+++ 
b/itests/hive-unit/src/test/java/org/apache/hive/jdbc/TestRestrictedList.java
@@ -106,6 +106,7 @@ public class TestRestrictedList {
     addToExpectedRestrictedMap("_hive.tmp_table_space");
     addToExpectedRestrictedMap("_hive.hdfs.session.path");
     addToExpectedRestrictedMap("hive.spark.client.rpc.server.address");
+    addToExpectedRestrictedMap("spark.home");
   }
 
   @AfterClass

Reply via email to