svn commit: r1545762 - in /hive/trunk/common/src: java/org/apache/hadoop/hive/conf/HiveConf.java test/org/apache/hadoop/hive/conf/TestHiveConfRestrictList.java

[br...@apache.org]

Author: brock
Date: Tue Nov 26 18:24:08 2013
New Revision: 1545762

URL: http://svn.apache.org/r1545762
Log:
HIVE-4741 - Add Hive config API to modify the restrict list (Prasad Mujumdar, Navis via Brock Noland)

Added:
    hive/trunk/common/src/test/org/apache/hadoop/hive/conf/TestHiveConfRestrictList.java
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=1545762&r1=1545761&r2=1545762&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 Nov 26 18:24:08 2013
@@ -1226,14 +1226,7 @@ public class HiveConf extends Configurat
     }
 
     // setup list of conf vars that are not allowed to change runtime
-    String restrictListStr = this.get(ConfVars.HIVE_CONF_RESTRICTED_LIST.toString(), "").trim();
-    for (String entry : restrictListStr.split(",")) {
-      entry = entry.trim();
-      if (!entry.isEmpty()) {
-        restrictList.add(entry);
-      }
-    }
-    restrictList.add(ConfVars.HIVE_CONF_RESTRICTED_LIST.toString());
+    setupRestrictList();
   }
 
 
@@ -1406,4 +1399,36 @@ public class HiveConf extends Configurat
       return null;
     }
   }
+
+  /**
+   * Append comma separated list of config vars to the restrict List
+   * @param restrictListStr
+   */
+  public void addToRestrictList(String restrictListStr) {
+    if (restrictListStr == null) {
+      return;
+    }
+    String oldList = this.getVar(ConfVars.HIVE_CONF_RESTRICTED_LIST);
+    if (oldList == null || oldList.isEmpty()) {
+      this.setVar(ConfVars.HIVE_CONF_RESTRICTED_LIST, restrictListStr);
+    } else {
+      this.setVar(ConfVars.HIVE_CONF_RESTRICTED_LIST, oldList + "," + restrictListStr);
+    }
+    setupRestrictList();
+  }
+
+  /**
+   * Add the HIVE_CONF_RESTRICTED_LIST values to restrictList,
+   * including HIVE_CONF_RESTRICTED_LIST itself
+   */
+  private void setupRestrictList() {
+    String restrictListStr = this.getVar(ConfVars.HIVE_CONF_RESTRICTED_LIST);
+    restrictList.clear();
+    if (restrictListStr != null) {
+      for (String entry : restrictListStr.split(",")) {
+        restrictList.add(entry.trim());
+      }
+    }
+    restrictList.add(ConfVars.HIVE_CONF_RESTRICTED_LIST.toString());
+  }
 }

Added: hive/trunk/common/src/test/org/apache/hadoop/hive/conf/TestHiveConfRestrictList.java
URL: http://svn.apache.org/viewvc/hive/trunk/common/src/test/org/apache/hadoop/hive/conf/TestHiveConfRestrictList.java?rev=1545762&view=auto
==============================================================================
--- hive/trunk/common/src/test/org/apache/hadoop/hive/conf/TestHiveConfRestrictList.java (added)
+++ hive/trunk/common/src/test/org/apache/hadoop/hive/conf/TestHiveConfRestrictList.java Tue Nov 26 18:24:08 2013
@@ -0,0 +1,92 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.hadoop.hive.conf;
+
+import junit.framework.TestCase;
+
+import org.apache.hadoop.hive.conf.HiveConf;
+import org.apache.hadoop.hive.conf.HiveConf.ConfVars;
+import org.junit.Test;
+
+public class TestHiveConfRestrictList extends TestCase {
+
+  private HiveConf conf = null;
+
+  @Override
+  protected void setUp() throws Exception {
+    super.setUp();
+    System.setProperty(ConfVars.HIVE_CONF_RESTRICTED_LIST.varname,
+        ConfVars.HIVETESTMODEPREFIX.varname);
+    conf = new HiveConf();
+  }
+
+  /**
+   * Test that configs in restrict list can't be changed
+   * @throws Exception
+   */
+  @Test
+  public void testRestriction() throws Exception {
+    verifyRestriction(ConfVars.HIVETESTMODEPREFIX.varname, "foo");
+    conf.verifyAndSet(ConfVars.HIVETESTMODE.varname, "false");
+  }
+
+  /**
+   * Test that restrict list config itselft can't be changed
+   * @throws Exception
+   */
+  @Test
+  public void testRestrictList() throws Exception {
+    verifyRestriction(ConfVars.HIVE_CONF_RESTRICTED_LIST.varname, "foo");
+  }
+
+  /**
+   * Test appending new configs vars added to restrict list
+   * @throws Exception
+   */
+  @Test
+  public void testAppendRestriction() throws Exception {
+    String appendListStr = ConfVars.SCRATCHDIR.varname + "," +
+        ConfVars.LOCALSCRATCHDIR.varname + "," +
+        ConfVars.METASTOREURIS.varname;
+
+    conf.addToRestrictList(appendListStr);
+    // check if the new configs are added to HIVE_CONF_RESTRICTED_LIST
+    String newRestrictList = conf.getVar(ConfVars.HIVE_CONF_RESTRICTED_LIST);
+    assertTrue(newRestrictList.contains(ConfVars.SCRATCHDIR.varname));
+    assertTrue(newRestrictList.contains(ConfVars.LOCALSCRATCHDIR.varname));
+    assertTrue(newRestrictList.contains(ConfVars.METASTOREURIS.varname));
+
+    // check if the old values are still there in HIVE_CONF_RESTRICTED_LIST
+    assertTrue(newRestrictList.contains(ConfVars.HIVETESTMODEPREFIX.varname));
+
+    // verify that the new configs are in effect
+    verifyRestriction(ConfVars.HIVETESTMODEPREFIX.varname, "foo");
+    verifyRestriction(ConfVars.HIVE_CONF_RESTRICTED_LIST.varname, "foo");
+    verifyRestriction(ConfVars.LOCALSCRATCHDIR.varname, "foo");
+    verifyRestriction(ConfVars.METASTOREURIS.varname, "foo");
+  }
+
+  private void verifyRestriction(String varName, String newVal) {
+    try {
+      conf.verifyAndSet(varName, newVal);
+      fail("Setting config property " + varName + " should fail");
+    } catch (IllegalArgumentException e) {
+      // the verifyAndSet in this case is expected to fail with the IllegalArgumentException
+    }
+  }
+}