You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by om...@apache.org on 2015/11/23 18:24:16 UTC
[53/55] hive git commit: HIVE-12436 : Default
hive.metastore.schema.verification to true (Ashutosh Chauhan via Sushanth
Sowmyan)
HIVE-12436 : Default hive.metastore.schema.verification to true (Ashutosh Chauhan via Sushanth Sowmyan)
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/a2f2e9d2
Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/a2f2e9d2
Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/a2f2e9d2
Branch: refs/heads/master-fixed
Commit: a2f2e9d2fb05d31ad20688c821649a584b3d9c7a
Parents: 855e43d
Author: Ashutosh Chauhan <ha...@apache.org>
Authored: Tue Nov 17 10:46:45 2015 -0800
Committer: Owen O'Malley <om...@apache.org>
Committed: Mon Nov 23 09:23:04 2015 -0800
----------------------------------------------------------------------
.../src/test/org/apache/hive/beeline/cli/TestHiveCli.java | 1 +
beeline/src/test/resources/hive-site.xml | 5 +++++
common/src/java/org/apache/hadoop/hive/conf/HiveConf.java | 2 +-
data/conf/hive-site.xml | 5 +++++
data/conf/llap/hive-site.xml | 5 +++++
data/conf/spark/standalone/hive-site.xml | 5 +++++
data/conf/spark/yarn-client/hive-site.xml | 4 ++++
data/conf/tez/hive-site.xml | 5 +++++
.../src/main/java/org/apache/hadoop/hive/ql/QTestUtil.java | 8 ++------
9 files changed, 33 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hive/blob/a2f2e9d2/beeline/src/test/org/apache/hive/beeline/cli/TestHiveCli.java
----------------------------------------------------------------------
diff --git a/beeline/src/test/org/apache/hive/beeline/cli/TestHiveCli.java b/beeline/src/test/org/apache/hive/beeline/cli/TestHiveCli.java
index 21ba690..53dfa1d 100644
--- a/beeline/src/test/org/apache/hive/beeline/cli/TestHiveCli.java
+++ b/beeline/src/test/org/apache/hive/beeline/cli/TestHiveCli.java
@@ -278,6 +278,7 @@ public class TestHiveCli {
public void setup() {
System.setProperty("datanucleus.fixedDatastore", "false");
System.setProperty("datanucleus.autoCreateSchema", "true");
+ System.setProperty("hive.metastore.schema.verification", "false");
cli = new HiveCli();
redirectOutputStream();
initFromFile();
http://git-wip-us.apache.org/repos/asf/hive/blob/a2f2e9d2/beeline/src/test/resources/hive-site.xml
----------------------------------------------------------------------
diff --git a/beeline/src/test/resources/hive-site.xml b/beeline/src/test/resources/hive-site.xml
index b2347c7..615d4ed 100644
--- a/beeline/src/test/resources/hive-site.xml
+++ b/beeline/src/test/resources/hive-site.xml
@@ -34,6 +34,11 @@
<value>false</value>
</property>
+<property>
+ <name>hive.metastore.schema.verification</name>
+ <value>false</value>
+</property>
+
<property>
<name>javax.jdo.option.ConnectionURL</name>
<value>jdbc:derby:;databaseName=${test.tmp.dir}/metastore_db;create=true</value>
http://git-wip-us.apache.org/repos/asf/hive/blob/a2f2e9d2/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 09f3c3e..f48403b 100644
--- a/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java
+++ b/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java
@@ -540,7 +540,7 @@ public class HiveConf extends Configuration {
METASTORE_AUTO_CREATE_SCHEMA("datanucleus.autoCreateSchema", false,
"creates necessary schema on a startup if one doesn't exist. set this to false, after creating it once"),
METASTORE_FIXED_DATASTORE("datanucleus.fixedDatastore", true, "Dictates whether to allow updates to schema or not."),
- METASTORE_SCHEMA_VERIFICATION("hive.metastore.schema.verification", false,
+ METASTORE_SCHEMA_VERIFICATION("hive.metastore.schema.verification", true,
"Enforce metastore schema version consistency.\n" +
"True: Verify that version information stored in metastore matches with one from Hive jars. Also disable automatic\n" +
" schema migration attempt. Users are required to manually migrate schema after Hive upgrade which ensures\n" +
http://git-wip-us.apache.org/repos/asf/hive/blob/a2f2e9d2/data/conf/hive-site.xml
----------------------------------------------------------------------
diff --git a/data/conf/hive-site.xml b/data/conf/hive-site.xml
index d15cc17..2ebb1c4 100644
--- a/data/conf/hive-site.xml
+++ b/data/conf/hive-site.xml
@@ -69,6 +69,11 @@
</property>
<property>
+ <name>hive.metastore.schema.verification</name>
+ <value>false</value>
+</property>
+
+<property>
<name>javax.jdo.option.ConnectionURL</name>
<value>jdbc:derby:;databaseName=${test.tmp.dir}/junit_metastore_db;create=true</value>
</property>
http://git-wip-us.apache.org/repos/asf/hive/blob/a2f2e9d2/data/conf/llap/hive-site.xml
----------------------------------------------------------------------
diff --git a/data/conf/llap/hive-site.xml b/data/conf/llap/hive-site.xml
index becb5b2..9e15eda 100644
--- a/data/conf/llap/hive-site.xml
+++ b/data/conf/llap/hive-site.xml
@@ -79,6 +79,11 @@
</property>
<property>
+ <name>hive.metastore.schema.verification</name>
+ <value>false</value>
+</property>
+
+<property>
<name>javax.jdo.option.ConnectionURL</name>
<value>jdbc:derby:;databaseName=${test.tmp.dir}/junit_metastore_db;create=true</value>
</property>
http://git-wip-us.apache.org/repos/asf/hive/blob/a2f2e9d2/data/conf/spark/standalone/hive-site.xml
----------------------------------------------------------------------
diff --git a/data/conf/spark/standalone/hive-site.xml b/data/conf/spark/standalone/hive-site.xml
index 38d0832..1a45274 100644
--- a/data/conf/spark/standalone/hive-site.xml
+++ b/data/conf/spark/standalone/hive-site.xml
@@ -55,6 +55,11 @@
</property>
<property>
+ <name>hive.metastore.schema.verification</name>
+ <value>false</value>
+</property>
+
+<property>
<name>javax.jdo.option.ConnectionURL</name>
<value>jdbc:derby:;databaseName=${test.tmp.dir}/junit_metastore_db;create=true</value>
</property>
http://git-wip-us.apache.org/repos/asf/hive/blob/a2f2e9d2/data/conf/spark/yarn-client/hive-site.xml
----------------------------------------------------------------------
diff --git a/data/conf/spark/yarn-client/hive-site.xml b/data/conf/spark/yarn-client/hive-site.xml
index ada3f3b..346c248 100644
--- a/data/conf/spark/yarn-client/hive-site.xml
+++ b/data/conf/spark/yarn-client/hive-site.xml
@@ -54,6 +54,10 @@
<value>false</value>
</property>
+<property>
+ <name>hive.metastore.schema.verification</name>
+ <value>false</value>
+</property>
<property>
<name>javax.jdo.option.ConnectionURL</name>
http://git-wip-us.apache.org/repos/asf/hive/blob/a2f2e9d2/data/conf/tez/hive-site.xml
----------------------------------------------------------------------
diff --git a/data/conf/tez/hive-site.xml b/data/conf/tez/hive-site.xml
index d008ad1..9e8b04f 100644
--- a/data/conf/tez/hive-site.xml
+++ b/data/conf/tez/hive-site.xml
@@ -73,6 +73,11 @@
</property>
<property>
+ <name>hive.metastore.schema.verification</name>
+ <value>false</value>
+</property>
+
+<property>
<name>hive.exec.local.scratchdir</name>
<value>${test.tmp.dir}/localscratchdir/</value>
<description>Local scratch space for Hive jobs</description>
http://git-wip-us.apache.org/repos/asf/hive/blob/a2f2e9d2/itests/util/src/main/java/org/apache/hadoop/hive/ql/QTestUtil.java
----------------------------------------------------------------------
diff --git a/itests/util/src/main/java/org/apache/hadoop/hive/ql/QTestUtil.java b/itests/util/src/main/java/org/apache/hadoop/hive/ql/QTestUtil.java
index ac1f15e..6713a2f 100644
--- a/itests/util/src/main/java/org/apache/hadoop/hive/ql/QTestUtil.java
+++ b/itests/util/src/main/java/org/apache/hadoop/hive/ql/QTestUtil.java
@@ -107,10 +107,10 @@ import org.apache.tools.ant.BuildException;
import org.apache.zookeeper.WatchedEvent;
import org.apache.zookeeper.Watcher;
import org.apache.zookeeper.ZooKeeper;
+import org.junit.Assert;
import com.google.common.collect.ImmutableList;
-import junit.framework.Assert;
import junit.framework.TestSuite;
/**
@@ -156,7 +156,6 @@ public class QTestUtil {
private HadoopShims.MiniMrShim mr = null;
private HadoopShims.MiniDFSShim dfs = null;
private HadoopShims.HdfsEncryptionShim hes = null;
- private final boolean miniMr = false;
private String hadoopVer = null;
private QTestSetup setup = null;
private TezSessionState tezSessionState = null;
@@ -907,11 +906,8 @@ public class QTestUtil {
}
public void init() throws Exception {
- // System.out.println(conf.toString());
- testWarehouse = conf.getVar(HiveConf.ConfVars.METASTOREWAREHOUSE);
- // conf.logVars(System.out);
- // System.out.flush();
+ testWarehouse = conf.getVar(HiveConf.ConfVars.METASTOREWAREHOUSE);
String execEngine = conf.get("hive.execution.engine");
conf.set("hive.execution.engine", "mr");
SessionState.start(conf);