You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by we...@apache.org on 2017/05/31 00:08:11 UTC

hive git commit: HIVE-16728 : Fix some regression caused by HIVE-14879, ADDENDUM (Wei Zheng)

Repository: hive
Updated Branches:
  refs/heads/hive-14535 144efb0fc -> 7ab6f01c1


HIVE-16728 : Fix some regression caused by HIVE-14879, ADDENDUM (Wei Zheng)


Project: http://git-wip-us.apache.org/repos/asf/hive/repo
Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/7ab6f01c
Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/7ab6f01c
Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/7ab6f01c

Branch: refs/heads/hive-14535
Commit: 7ab6f01c1197052220c670a0538c95e54346256b
Parents: 144efb0
Author: Wei Zheng <we...@apache.org>
Authored: Tue May 30 17:07:49 2017 -0700
Committer: Wei Zheng <we...@apache.org>
Committed: Tue May 30 17:07:49 2017 -0700

----------------------------------------------------------------------
 .../org/apache/hadoop/hive/ql/exec/FetchOperator.java     | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hive/blob/7ab6f01c/ql/src/java/org/apache/hadoop/hive/ql/exec/FetchOperator.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/FetchOperator.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/FetchOperator.java
index 77e664f..0582f94 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/exec/FetchOperator.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/FetchOperator.java
@@ -435,15 +435,11 @@ public class FetchOperator implements Serializable {
   }
 
   private ValidTxnList extractValidTxnList() {
-    ValidTxnList validTxnList;
-    if (org.apache.commons.lang.StringUtils.isBlank(currDesc.getTableName())) {
-      validTxnList = null; // i.e. not fetching from a table directly but from a temp location
-    } else {
+    if (currDesc.getTableName() == null || !org.apache.commons.lang.StringUtils.isBlank(currDesc.getTableName())) {
       String txnString = job.get(ValidTxnList.VALID_TXNS_KEY);
-      validTxnList = txnString == null ? new ValidReadTxnList() :
-          new ValidReadTxnList(txnString);
+      return txnString == null ? new ValidReadTxnList() : new ValidReadTxnList(txnString);
     }
-    return validTxnList;
+    return null;  // not fetching from a table directly but from a temp location
   }
 
   private FetchInputFormatSplit[] splitSampling(SplitSample splitSample,