[hive] branch master updated: HIVE-23614: Always pass HiveConfig to removeTempOrDuplicateFiles (John Sherman, reviewed by Jesus Camacho Rodriguez)

[jcamacho]

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

jcamacho 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 2a3a42f  HIVE-23614: Always pass HiveConfig to 
removeTempOrDuplicateFiles (John Sherman, reviewed by Jesus Camacho Rodriguez)
2a3a42f is described below

commit 2a3a42ffcca2162fe4b0b65ed542ad793ea4942e
Author: John Sherman <j...@cloudera.com>
AuthorDate: Thu Jun 4 14:13:10 2020 -0700

    HIVE-23614: Always pass HiveConfig to removeTempOrDuplicateFiles (John 
Sherman, reviewed by Jesus Camacho Rodriguez)
    
    Close apache/hive#1059
---
 ql/src/java/org/apache/hadoop/hive/ql/exec/JoinOperator.java | 2 +-
 ql/src/java/org/apache/hadoop/hive/ql/exec/Utilities.java    | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/JoinOperator.java 
b/ql/src/java/org/apache/hadoop/hive/ql/exec/JoinOperator.java
index 9661bc9..47ae047 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/exec/JoinOperator.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/JoinOperator.java
@@ -232,7 +232,7 @@ public class JoinOperator extends 
CommonJoinOperator<JoinDesc> implements Serial
         Utilities.FILE_OP_LOGGER.info("Moving tmp dir: " + tmpPath + " to: " + 
intermediatePath + "(spec " + specPath + ")");
         Utilities.rename(fs, tmpPath, intermediatePath);
         // Step2: remove any tmp file or double-committed output files
-        Utilities.removeTempOrDuplicateFiles(fs, intermediatePath, false);
+        Utilities.removeTempOrDuplicateFiles(fs, intermediatePath, hconf, 
false);
         // Step3: move to the file destination
         Utilities.FILE_OP_LOGGER.info("Moving tmp dir: " + intermediatePath + 
" to: " + specPath);
         Utilities.renameOrMoveFiles(fs, intermediatePath, specPath);
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/Utilities.java 
b/ql/src/java/org/apache/hadoop/hive/ql/exec/Utilities.java
index ac66925..42675f0 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/exec/Utilities.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/Utilities.java
@@ -1676,8 +1676,9 @@ public final class Utilities {
   /**
    * Remove all temporary files and duplicate (double-committed) files from a 
given directory.
    */
-  public static void removeTempOrDuplicateFiles(FileSystem fs, Path path, 
boolean isBaseDir) throws IOException {
-    removeTempOrDuplicateFiles(fs, path, null,null,null, isBaseDir);
+  public static void removeTempOrDuplicateFiles(FileSystem fs, Path path, 
Configuration hconf, boolean isBaseDir)
+      throws IOException {
+    removeTempOrDuplicateFiles(fs, path, null, null, hconf, isBaseDir);
   }
 
   public static List<Path> removeTempOrDuplicateFiles(FileSystem fs, Path path,