[hive] branch master updated: HIVE-23311: Fix ValidTxnManager regression (Peter Varga, reviewed by Peter Vary)

[dk...@apache.org]

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 be9e50f  HIVE-23311: Fix ValidTxnManager regression (Peter Varga, reviewed by Peter Vary)
be9e50f is described below

commit be9e50f88955a1c7af493342a4e178c16e5f0be6
Author: Peter Varga <pv...@cloudera.com>
AuthorDate: Tue May 5 11:33:07 2020 +0200

    HIVE-23311: Fix ValidTxnManager regression (Peter Varga, reviewed by Peter Vary)
---
 ql/src/java/org/apache/hadoop/hive/ql/ValidTxnManager.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/ql/src/java/org/apache/hadoop/hive/ql/ValidTxnManager.java b/ql/src/java/org/apache/hadoop/hive/ql/ValidTxnManager.java
index 0f2212d..7d49c57 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/ValidTxnManager.java
+++ b/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 @@ class ValidTxnManager {
     // - 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<String> nonSharedLockedTables = getNonSharedLockedTables();
-    if (nonSharedLockedTables == null) {
+    if (nonSharedLockedTables.isEmpty()) {
       return true; // Nothing to check
     }
 
@@ -100,7 +101,7 @@ class ValidTxnManager {
 
   private Set<String> getNonSharedLockedTables() {
     if (CollectionUtils.isEmpty(driver.getContext().getHiveLocks())) {
-      return null; // Nothing to check
+      return Collections.emptySet(); // Nothing to check
     }
 
     Set<String> nonSharedLockedTables = new HashSet<>();