[hive] 01/03: HIVE-24108: AddToClassPathAction should use TezClassLoader (László Bodor reviewed by Harish JP, Ashutosh Chauhan)

[abstractdog]

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

abstractdog pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hive.git

commit 86f73ab199965f538c2dae7fbd679882b423087b
Author: László Bodor <bodorlaszlo0...@gmail.com>
AuthorDate: Wed Oct 28 22:03:42 2020 +0100

    HIVE-24108: AddToClassPathAction should use TezClassLoader (László Bodor 
reviewed by Harish JP, Ashutosh Chauhan)
    
    Signed-off-by: Laszlo Bodor <bodorlaszlo0...@gmail.com>
---
 itests/src/test/resources/testconfiguration.properties                | 1 +
 .../org/apache/hadoop/hive/llap/daemon/impl/FunctionLocalizer.java    | 3 ++-
 ql/src/test/results/clientpositive/{llap => tez}/mapjoin_addjar.q.out | 4 ++--
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/itests/src/test/resources/testconfiguration.properties 
b/itests/src/test/resources/testconfiguration.properties
index 217a819..8372843 100644
--- a/itests/src/test/resources/testconfiguration.properties
+++ b/itests/src/test/resources/testconfiguration.properties
@@ -20,6 +20,7 @@ minitez.query.files=\
   explainanalyze_4.q,\
   explainanalyze_5.q,\
   explainuser_3.q,\
+  mapjoin_addjar.q,\
   multi_count_distinct.q,\
   orc_merge12.q,\
   orc_vectorization_ppd.q,\
diff --git 
a/llap-server/src/java/org/apache/hadoop/hive/llap/daemon/impl/FunctionLocalizer.java
 
b/llap-server/src/java/org/apache/hadoop/hive/llap/daemon/impl/FunctionLocalizer.java
index 315c5be..e50c11a 100644
--- 
a/llap-server/src/java/org/apache/hadoop/hive/llap/daemon/impl/FunctionLocalizer.java
+++ 
b/llap-server/src/java/org/apache/hadoop/hive/llap/daemon/impl/FunctionLocalizer.java
@@ -45,6 +45,7 @@ import org.apache.hadoop.hive.ql.metadata.HiveException;
 import org.apache.hadoop.hive.ql.session.SessionState.ResourceType;
 import org.apache.hadoop.hive.ql.udf.generic.GenericUDFBridge;
 import org.apache.hadoop.hive.ql.util.ResourceDownloader;
+import org.apache.tez.common.TezClassLoader;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -73,7 +74,7 @@ public class FunctionLocalizer implements 
GenericUDFBridge.UdfWhitelistChecker {
     this.conf = conf;
     this.localDir = new File(localDir, DIR_NAME);
     AddToClassPathAction addAction = new AddToClassPathAction(
-        Thread.currentThread().getContextClassLoader(), 
Collections.emptyList(), true);
+        TezClassLoader.getInstance(), Collections.emptyList(), true);
     this.executorClassloader = AccessController.doPrivileged(addAction);
     this.workThread = new Thread(new Runnable() {
       @Override
diff --git a/ql/src/test/results/clientpositive/llap/mapjoin_addjar.q.out 
b/ql/src/test/results/clientpositive/tez/mapjoin_addjar.q.out
similarity index 99%
rename from ql/src/test/results/clientpositive/llap/mapjoin_addjar.q.out
rename to ql/src/test/results/clientpositive/tez/mapjoin_addjar.q.out
index 41f5adb..a8b94f5 100644
--- a/ql/src/test/results/clientpositive/llap/mapjoin_addjar.q.out
+++ b/ql/src/test/results/clientpositive/tez/mapjoin_addjar.q.out
@@ -17,11 +17,11 @@ POSTHOOK: Output: default@t1_n66
 PREHOOK: query: select * from t1_n66 l join t1_n66 r on l.key =r.key
 PREHOOK: type: QUERY
 PREHOOK: Input: default@t1_n66
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select * from t1_n66 l join t1_n66 r on l.key =r.key
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@t1_n66
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 238    val_238 238     val_238
 238    val_238 238     val_238
 86     val_86  86      val_86