Repository: hive Updated Branches: refs/heads/master 064eac221 -> 04f3be030
HIVE-17661 : DBTxnManager.acquireLocks() - MM tables should use shared lock for Insert (Sergey Shelukhin, reviewed by Eugene Koifman) Project: http://git-wip-us.apache.org/repos/asf/hive/repo Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/04f3be03 Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/04f3be03 Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/04f3be03 Branch: refs/heads/master Commit: 04f3be030d6fc74adff65bef9f9ecc416a1da6d8 Parents: 064eac2 Author: sergey <ser...@apache.org> Authored: Tue Apr 3 13:10:53 2018 -0700 Committer: sergey <ser...@apache.org> Committed: Tue Apr 3 13:10:53 2018 -0700 ---------------------------------------------------------------------- ql/src/java/org/apache/hadoop/hive/ql/lockmgr/DbTxnManager.java | 2 +- ql/src/test/queries/clientnegative/mm_convert.q | 2 ++ ql/src/test/queries/clientnegative/mm_truncate_cols.q | 3 +++ 3 files changed, 6 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hive/blob/04f3be03/ql/src/java/org/apache/hadoop/hive/ql/lockmgr/DbTxnManager.java ---------------------------------------------------------------------- diff --git a/ql/src/java/org/apache/hadoop/hive/ql/lockmgr/DbTxnManager.java b/ql/src/java/org/apache/hadoop/hive/ql/lockmgr/DbTxnManager.java index 6513e0f..5a95649 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/lockmgr/DbTxnManager.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/lockmgr/DbTxnManager.java @@ -514,7 +514,7 @@ public final class DbTxnManager extends HiveTxnManagerImpl { break; case INSERT: assert t != null; - if(AcidUtils.isFullAcidTable(t)) { + if(AcidUtils.isTransactionalTable(t)) { compBuilder.setShared(); } else { http://git-wip-us.apache.org/repos/asf/hive/blob/04f3be03/ql/src/test/queries/clientnegative/mm_convert.q ---------------------------------------------------------------------- diff --git a/ql/src/test/queries/clientnegative/mm_convert.q b/ql/src/test/queries/clientnegative/mm_convert.q index acbf4bb..ff44387 100644 --- a/ql/src/test/queries/clientnegative/mm_convert.q +++ b/ql/src/test/queries/clientnegative/mm_convert.q @@ -2,6 +2,8 @@ set hive.mapred.mode=nonstrict; set hive.explain.user=false; set hive.fetch.task.conversion=none; set hive.exec.dynamic.partition.mode=nonstrict; +set hive.support.concurrency=true; +set hive.txn.manager=org.apache.hadoop.hive.ql.lockmgr.DbTxnManager; drop table convert_mm; create table convert_mm(key int, id int) tblproperties("transactional"="true", "transactional_properties"="insert_only"); http://git-wip-us.apache.org/repos/asf/hive/blob/04f3be03/ql/src/test/queries/clientnegative/mm_truncate_cols.q ---------------------------------------------------------------------- diff --git a/ql/src/test/queries/clientnegative/mm_truncate_cols.q b/ql/src/test/queries/clientnegative/mm_truncate_cols.q index 3335ed8..a4dae38 100644 --- a/ql/src/test/queries/clientnegative/mm_truncate_cols.q +++ b/ql/src/test/queries/clientnegative/mm_truncate_cols.q @@ -1,3 +1,6 @@ +set hive.support.concurrency=true; +set hive.txn.manager=org.apache.hadoop.hive.ql.lockmgr.DbTxnManager; + CREATE TABLE mm_table(key int, value string) stored as rcfile tblproperties ("transactional"="true", "transactional_properties"="insert_only"); TRUNCATE TABLE mm_table COLUMNS (value);