Merge branch '1.5_v3.5.5_classloader' into '1.5_v3.5.5'

修改类加载器



See merge request !24

Author: toutian

core/src/main/java/com/dtstack/flink/sql/Main.java

@@ -139,15 +139,8 @@ public static void main(String[] args) throws Exception {
         }
 
         ClassLoader threadClassLoader = Thread.currentThread().getContextClassLoader();
-        DtClassLoader dtClassLoader = new DtClassLoader(new URL[]{}, threadClassLoader);
-        Thread.currentThread().setContextClassLoader(dtClassLoader);
-
-        URLClassLoader parentClassloader;
-        if(!ClusterMode.local.name().equals(deployMode)){
-            parentClassloader = (URLClassLoader) threadClassLoader.getParent();
-        }else{
-            parentClassloader = dtClassLoader;
-        }
+        DtClassLoader parentClassloader = new DtClassLoader(new URL[]{}, threadClassLoader);
+        Thread.currentThread().setContextClassLoader(parentClassloader);
 
         confProp = URLDecoder.decode(confProp, Charsets.UTF_8.toString());
         Properties confProperties = PluginUtil.jsonStrToObject(confProp, Properties.class);
@@ -218,7 +211,7 @@ public static void main(String[] args) throws Exception {
 
         if(env instanceof MyLocalStreamEnvironment) {
             List<URL> urlList = new ArrayList<>();
-            urlList.addAll(Arrays.asList(dtClassLoader.getURLs()));
+            urlList.addAll(Arrays.asList(parentClassloader.getURLs()));
             ((MyLocalStreamEnvironment) env).setClasspaths(urlList);
         }
 
@@ -254,7 +247,6 @@ private static void registerUDF(SqlTree sqlTree, List<URL> jarURList, URLClassLo
             if (classLoader == null) {
                 classLoader = FlinkUtil.loadExtraJar(jarURList, parentClassloader);
             }
-            classLoader.loadClass(funcInfo.getClassName());
             FlinkUtil.registerUDF(funcInfo.getType(), funcInfo.getClassName(), funcInfo.getName(),
                     tableEnv, classLoader);
         }