deniskuzZ commented on code in PR #4291:
URL: https://github.com/apache/hive/pull/4291#discussion_r1235010227
##########
iceberg/iceberg-catalog/src/main/java/org/apache/iceberg/hive/HiveTableOperations.java:
##########
@@ -510,6 +548,53 @@ private static boolean hiveEngineEnabled(TableMetadata
metadata, Configuration c
return metadata.propertyAsBoolean(TableProperties.ENGINE_HIVE_ENABLED,
false);
}
- return conf.getBoolean(ConfigProperties.ENGINE_HIVE_ENABLED,
TableProperties.ENGINE_HIVE_ENABLED_DEFAULT);
+ return conf.getBoolean(
+ ConfigProperties.ENGINE_HIVE_ENABLED,
TableProperties.ENGINE_HIVE_ENABLED_DEFAULT);
+ }
+
+ /**
+ * Returns if the hive locking should be enabled on the table, or not.
+ *
+ * <p>The decision is made like this:
+ *
+ * <ol>
+ * <li>Table property value {@link TableProperties#HIVE_LOCK_ENABLED}
+ * <li>If the table property is not set then check the hive-site.xml
property value {@link
+ * ConfigProperties#LOCK_HIVE_ENABLED}
+ * <li>If none of the above is enabled then use the default value {@link
+ * TableProperties#HIVE_LOCK_ENABLED_DEFAULT}
+ * </ol>
+ *
+ * @param metadata Table metadata to use
+ * @param conf The hive configuration to use
+ * @return if the hive engine related values should be enabled or not
+ */
+ private static boolean hiveLockEnabled(TableMetadata metadata, Configuration
conf) {
+ if (metadata.properties().get(TableProperties.HIVE_LOCK_ENABLED) != null) {
+ // We know that the property is set, so default value will not be used,
+ return metadata.propertyAsBoolean(TableProperties.HIVE_LOCK_ENABLED,
false);
+ }
+
+ return conf.getBoolean(
+ ConfigProperties.LOCK_HIVE_ENABLED,
TableProperties.HIVE_LOCK_ENABLED_DEFAULT);
+ }
+
+ @VisibleForTesting
+ HiveLock lockObject(TableMetadata metadata) {
+ if (hiveLockEnabled(metadata, conf)) {
+ Optional<Long> txnId = Optional.empty();
+
+ SessionState sessionState = SessionState.get();
+ if (sessionState != null) {
+ HiveTxnManager txnMgr = sessionState.getTxnMgr();
+ if (txnMgr != null) {
+ txnId = Optional.of(txnMgr.getCurrentTxnId());
+ }
+ }
+
+ return new MetastoreLock(conf, metaClients, catalogName, database,
tableName, txnId);
Review Comment:
could you please move txnId fetch logic in MetastoreLock?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
