Repository: hive
Updated Branches:
  refs/heads/master a21302f10 -> 7fa2ba8c7


HIVE-18781 broke WarehouseInstance (Alan Gates, reviewed by Thejas Nair)


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

Branch: refs/heads/master
Commit: 7fa2ba8c77b77d176c6d6180e6444b97aebf1503
Parents: a21302f
Author: Alan Gates <ga...@hortonworks.com>
Authored: Mon Apr 9 11:49:55 2018 -0700
Committer: Alan Gates <ga...@hortonworks.com>
Committed: Mon Apr 9 11:49:55 2018 -0700

----------------------------------------------------------------------
 .../java/org/apache/hadoop/hive/ql/parse/WarehouseInstance.java   | 3 +++
 1 file changed, 3 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hive/blob/7fa2ba8c/itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/parse/WarehouseInstance.java
----------------------------------------------------------------------
diff --git 
a/itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/parse/WarehouseInstance.java
 
b/itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/parse/WarehouseInstance.java
index fe4660c..7c8020d 100644
--- 
a/itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/parse/WarehouseInstance.java
+++ 
b/itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/parse/WarehouseInstance.java
@@ -123,6 +123,9 @@ public class WarehouseInstance implements Closeable {
     hiveConf.setIntVar(HiveConf.ConfVars.METASTORETHRIFTCONNECTIONRETRIES, 3);
     hiveConf.set(HiveConf.ConfVars.PREEXECHOOKS.varname, "");
     hiveConf.set(HiveConf.ConfVars.POSTEXECHOOKS.varname, "");
+    if 
(!hiveConf.getVar(HiveConf.ConfVars.HIVE_TXN_MANAGER).equals("org.apache.hadoop.hive.ql.lockmgr.DbTxnManager"))
 {
+      hiveConf.set(HiveConf.ConfVars.HIVE_SUPPORT_CONCURRENCY.varname, 
"false");
+    }
     System.setProperty(HiveConf.ConfVars.PREEXECHOOKS.varname, " ");
     System.setProperty(HiveConf.ConfVars.POSTEXECHOOKS.varname, " ");
 

Reply via email to