From e2f2e9a6418d9e50c05850c875b753f8ecc6fe07 Mon Sep 17 00:00:00 2001 From: Ashutosh Chauhan Date: Wed, 29 Jun 2016 15:53:29 -0700 Subject: [PATCH] HIVE-14132 : Don't fail config validation for removed configs --- ql/src/java/org/apache/hadoop/hive/ql/processors/SetProcessor.java | 6 +++++- ql/src/test/queries/clientpositive/set_metaconf.q | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ql/src/java/org/apache/hadoop/hive/ql/processors/SetProcessor.java b/ql/src/java/org/apache/hadoop/hive/ql/processors/SetProcessor.java index 9a3ba04..63280d1 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/processors/SetProcessor.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/processors/SetProcessor.java @@ -24,8 +24,10 @@ import static org.apache.hadoop.hive.conf.SystemVariables.*; +import java.util.HashSet; import java.util.Map; import java.util.Properties; +import java.util.Set; import java.util.SortedMap; import java.util.TreeMap; @@ -41,6 +43,7 @@ import org.slf4j.LoggerFactory; import com.google.common.collect.Lists; +import com.google.common.collect.Sets; /** * SetProcessor. @@ -50,6 +53,7 @@ private static final Logger LOG = LoggerFactory.getLogger(SetProcessor.class); private static final String prefix = "set: "; + private static final Set removedConfigs = Sets.newHashSet("hive.mapred.supports.subdirectories"); public static boolean getBoolean(String value) { if (value.equals("on") || value.equals("true")) { @@ -202,7 +206,7 @@ private static String setConf(String varname, String key, String varvalue, boole message.append("' FAILED in validation : ").append(fail).append('.'); throw new IllegalArgumentException(message.toString()); } - } else if (key.startsWith("hive.")) { + } else if (!removedConfigs.contains(key) && key.startsWith("hive.")) { throw new IllegalArgumentException("hive configuration " + key + " does not exists."); } } diff --git a/ql/src/test/queries/clientpositive/set_metaconf.q b/ql/src/test/queries/clientpositive/set_metaconf.q index ede3c02..a679489 100644 --- a/ql/src/test/queries/clientpositive/set_metaconf.q +++ b/ql/src/test/queries/clientpositive/set_metaconf.q @@ -1,3 +1,4 @@ +set hive.mapred.supports.subdirectories=true; set metaconf:hive.metastore.try.direct.sql; set metaconf:hive.metastore.try.direct.sql=false; -- 1.7.12.4 (Apple Git-37)