You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by ha...@apache.org on 2016/07/07 21:44:52 UTC
hive git commit: HIVE-14132 : Don't fail config validation for
removed configs (Ashutosh Chauhan via Sergey Shelukhin)
Repository: hive
Updated Branches:
refs/heads/master 1b5ee3d88 -> f40ea94d5
HIVE-14132 : Don't fail config validation for removed configs (Ashutosh Chauhan via Sergey Shelukhin)
Signed-off-by: Ashutosh Chauhan <ha...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/hive/repo
Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/f40ea94d
Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/f40ea94d
Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/f40ea94d
Branch: refs/heads/master
Commit: f40ea94d5506f82c2ad5160b46e1b0cb727defbd
Parents: 1b5ee3d
Author: Ashutosh Chauhan <ha...@apache.org>
Authored: Wed Jun 29 15:53:29 2016 -0700
Committer: Ashutosh Chauhan <ha...@apache.org>
Committed: Thu Jul 7 14:42:06 2016 -0700
----------------------------------------------------------------------
.../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(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hive/blob/f40ea94d/ql/src/java/org/apache/hadoop/hive/ql/processors/SetProcessor.java
----------------------------------------------------------------------
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..a872809 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.serde2.MetadataTypedColumnsetSerDe.defaultN
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.Logger;
import org.slf4j.LoggerFactory;
import com.google.common.collect.Lists;
+import com.google.common.collect.Sets;
/**
* SetProcessor.
@@ -50,6 +53,7 @@ public class SetProcessor implements CommandProcessor {
private static final Logger LOG = LoggerFactory.getLogger(SetProcessor.class);
private static final String prefix = "set: ";
+ private static final Set<String> removedConfigs = Sets.newHashSet("hive.mapred.supports.subdirectories","hive.enforce.sorting","hive.enforce.bucketing");
public static boolean getBoolean(String value) {
if (value.equals("on") || value.equals("true")) {
@@ -202,7 +206,7 @@ public class SetProcessor implements CommandProcessor {
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.");
}
}
http://git-wip-us.apache.org/repos/asf/hive/blob/f40ea94d/ql/src/test/queries/clientpositive/set_metaconf.q
----------------------------------------------------------------------
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;