[hive] branch master updated: HIVE-22373 : File Merge tasks fail when containers are reused (Toshihiko Uchida via Ashutosh Chauhan)

[ha...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

hashutosh 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 d5ca6f6  HIVE-22373 : File Merge tasks fail when containers are reused (Toshihiko Uchida via Ashutosh Chauhan)
d5ca6f6 is described below

commit d5ca6f6b83ac8e333ad5a621c3b5609b1c56119c
Author: Ashutosh Chauhan <ha...@apache.org>
AuthorDate: Wed Oct 23 09:31:09 2019 -0700

    HIVE-22373 : File Merge tasks fail when containers are reused (Toshihiko Uchida via Ashutosh Chauhan)
    
    Signed-off-by: Ashutosh Chauhan <ha...@apache.org>
---
 .../org/apache/hadoop/hive/ql/exec/AbstractFileMergeOperator.java     | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/AbstractFileMergeOperator.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/AbstractFileMergeOperator.java
index bb89f80..9a32581 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/exec/AbstractFileMergeOperator.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/AbstractFileMergeOperator.java
@@ -110,9 +110,7 @@ public abstract class AbstractFileMergeOperator<T extends FileMergeDesc>
 
   // sets up temp and task temp path
   private void updatePaths(Path tp, Path ttp) {
-    if (taskId == null) {
-      taskId = Utilities.getTaskId(jc);
-    }
+    taskId = Utilities.getTaskId(jc);
     tmpPath = tp;
     if (isMmTable) {
       taskTmpPath = null;