This is an automated email from the ASF dual-hosted git repository.
dkuzmenko pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hive.git
The following commit(s) were added to refs/heads/master by this push:
new 714c260e4a7 HIVE-26429: Enable X locking for CTAS by default (Simhadri
Govindappa, reviewed by Denys Kuzmenko)
714c260e4a7 is described below
commit 714c260e4a7c6b147c897718a33e693699267792
Author: SimhadriGovindappa <simhadri...@gmail.com>
AuthorDate: Fri Jul 29 16:14:09 2022 +0530
HIVE-26429: Enable X locking for CTAS by default (Simhadri Govindappa,
reviewed by Denys Kuzmenko)
Closes #3475
---
common/src/java/org/apache/hadoop/hive/conf/HiveConf.java | 2 +-
data/conf/hive-site.xml | 5 +++++
data/conf/iceberg/llap/hive-site.xml | 5 +++++
data/conf/iceberg/tez/hive-site.xml | 5 +++++
data/conf/llap/hive-site.xml | 7 ++++++-
data/conf/tez/hive-site.xml | 7 ++++++-
itests/hive-blobstore/src/test/resources/hive-site.xml | 5 +++++
7 files changed, 33 insertions(+), 3 deletions(-)
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 044040f8f11..b5a7cc346db 100644
--- a/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java
+++ b/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java
@@ -4689,7 +4689,7 @@ public class HiveConf extends Configuration {
HIVE_ACID_DIRECT_INSERT_ENABLED("hive.acid.direct.insert.enabled", true,
"Enable writing the data files directly to the table's final
destination instead of the staging directory."
+ "This optimization only applies on INSERT operations on ACID
tables."),
- TXN_CTAS_X_LOCK("hive.txn.xlock.ctas", false,
+ TXN_CTAS_X_LOCK("hive.txn.xlock.ctas", true,
"Enables exclusive locking for CTAS operations."),
// role names are case-insensitive
USERS_IN_ADMIN_ROLE("hive.users.in.admin.role", "", false,
diff --git a/data/conf/hive-site.xml b/data/conf/hive-site.xml
index a47ba9727e9..7681932c404 100644
--- a/data/conf/hive-site.xml
+++ b/data/conf/hive-site.xml
@@ -404,4 +404,9 @@
<name>hive.server2.operation.log.purgePolicy.timeToLive</name>
<value>5s</value>
</property>
+
+<property>
+ <name>hive.txn.xlock.ctas</name>
+ <value>false</value>
+</property>
</configuration>
diff --git a/data/conf/iceberg/llap/hive-site.xml
b/data/conf/iceberg/llap/hive-site.xml
index cd7fed223ec..9a3288509d5 100644
--- a/data/conf/iceberg/llap/hive-site.xml
+++ b/data/conf/iceberg/llap/hive-site.xml
@@ -399,4 +399,9 @@
</description>
</property>
+ <property>
+ <name>hive.txn.xlock.ctas</name>
+ <value>false</value>
+ </property>
+
</configuration>
diff --git a/data/conf/iceberg/tez/hive-site.xml
b/data/conf/iceberg/tez/hive-site.xml
index e1be19d1b28..23fd95fbde1 100644
--- a/data/conf/iceberg/tez/hive-site.xml
+++ b/data/conf/iceberg/tez/hive-site.xml
@@ -325,4 +325,9 @@
We want we keep the stats in Hive sessions.
</description>
</property>
+
+<property>
+ <name>hive.txn.xlock.ctas</name>
+ <value>false</value>
+</property>
</configuration>
diff --git a/data/conf/llap/hive-site.xml b/data/conf/llap/hive-site.xml
index 2a14e7a73ed..dbd5d28042b 100644
--- a/data/conf/llap/hive-site.xml
+++ b/data/conf/llap/hive-site.xml
@@ -411,5 +411,10 @@
<name>hive.cbo.fallback.strategy</name>
<value>TEST</value>
</property>
-
+
+<property>
+ <name>hive.txn.xlock.ctas</name>
+ <value>false</value>
+</property>
+
</configuration>
diff --git a/data/conf/tez/hive-site.xml b/data/conf/tez/hive-site.xml
index 8c0ce63b398..0c4de1466b0 100644
--- a/data/conf/tez/hive-site.xml
+++ b/data/conf/tez/hive-site.xml
@@ -312,5 +312,10 @@
<name>hive.cbo.fallback.strategy</name>
<value>TEST</value>
</property>
-
+
+<property>
+ <name>hive.txn.xlock.ctas</name>
+ <value>false</value>
+</property>
+
</configuration>
diff --git a/itests/hive-blobstore/src/test/resources/hive-site.xml
b/itests/hive-blobstore/src/test/resources/hive-site.xml
index 91bef552a27..42693dbe84c 100644
--- a/itests/hive-blobstore/src/test/resources/hive-site.xml
+++ b/itests/hive-blobstore/src/test/resources/hive-site.xml
@@ -295,6 +295,11 @@
<value>false</value>
</property>
+ <property>
+ <name>hive.txn.xlock.ctas</name>
+ <value>false</value>
+ </property>
+
<!--
To run these tests:
# Create a file blobstore-conf.xml - DO NOT ADD TO REVISION CONTROL
