diff --git itests/src/test/resources/testconfiguration.properties itests/src/test/resources/testconfiguration.properties index 217a819250..837284399c 100644 --- itests/src/test/resources/testconfiguration.properties +++ 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 llap-server/src/java/org/apache/hadoop/hive/llap/daemon/impl/FunctionLocalizer.java llap-server/src/java/org/apache/hadoop/hive/llap/daemon/impl/FunctionLocalizer.java index 315c5becb3..e50c11a610 100644 --- llap-server/src/java/org/apache/hadoop/hive/llap/daemon/impl/FunctionLocalizer.java +++ llap-server/src/java/org/apache/hadoop/hive/llap/daemon/impl/FunctionLocalizer.java @@ -45,6 +45,7 @@ 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 FunctionLocalizer(Configuration conf, String localDir) { 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 ql/src/test/results/clientpositive/llap/mapjoin_addjar.q.out 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 41f5adb29d..a8b94f596f 100644 --- ql/src/test/results/clientpositive/llap/mapjoin_addjar.q.out +++ 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