diff --git ql/src/java/org/apache/hadoop/hive/ql/ValidTxnManager.java ql/src/java/org/apache/hadoop/hive/ql/ValidTxnManager.java index 0f2212d682..7d49c57dda 100644 --- ql/src/java/org/apache/hadoop/hive/ql/ValidTxnManager.java +++ ql/src/java/org/apache/hadoop/hive/ql/ValidTxnManager.java @@ -18,6 +18,7 @@ package org.apache.hadoop.hive.ql; +import java.util.Collections; import java.util.HashMap; import java.util.HashSet; import java.util.List; @@ -80,7 +81,7 @@ boolean isValidTxnListState() throws LockException { // - Exclusive for INSERT OVERWRITE, when shared write is disabled (HiveConf.TXN_WRITE_X_LOCK=false). // - Excl-write for UPDATE/DELETE, when shared write is disabled, INSERT OVERWRITE - when enabled. Set nonSharedLockedTables = getNonSharedLockedTables(); - if (nonSharedLockedTables == null) { + if (nonSharedLockedTables.isEmpty()) { return true; // Nothing to check } @@ -100,7 +101,7 @@ boolean isValidTxnListState() throws LockException { private Set getNonSharedLockedTables() { if (CollectionUtils.isEmpty(driver.getContext().getHiveLocks())) { - return null; // Nothing to check + return Collections.emptySet(); // Nothing to check } Set nonSharedLockedTables = new HashSet<>();