fix: 1.14 1.15 classloader (DataLinkDC#2667)

* fix: 1.14 1.15 classloader Signed-off-by: licho <[email protected]> * Spotless Apply * refactor: 14 15 set currentThread classloader Signed-off-by: licho <[email protected]> * Spotless Apply * refactor: remove other current thread set classloader Signed-off-by: licho <[email protected]> --------- Signed-off-by: licho <[email protected]> Co-authored-by: leechor <[email protected]>
aiwenmo · Dec 17, 2023 · 98891a5 · 98891a5
1 parent 6366ecd
commit 98891a5
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 9 deletions.
diff --git a/dinky-admin/src/main/java/org/dinky/aop/UdfClassLoaderAspect.java b/dinky-admin/src/main/java/org/dinky/aop/UdfClassLoaderAspect.java
@@ -20,7 +20,6 @@
 package org.dinky.aop;
 
 import org.dinky.data.exception.DinkyException;
-import org.dinky.job.JobResult;
 
 import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.annotation.Around;
@@ -51,7 +50,7 @@ public void allPointcut() {}
     @Around("allPointcut()")
     public Object round(ProceedingJoinPoint proceedingJoinPoint) {
         Object proceed = null;
-
+        ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader();
         try {
             proceed = proceedingJoinPoint.proceed();
         } catch (Throwable e) {
@@ -61,7 +60,9 @@ public Object round(ProceedingJoinPoint proceedingJoinPoint) {
             e.printStackTrace();
             throw (DinkyException) e;
         } finally {
-            if (proceed instanceof JobResult) {}
+            if (contextClassLoader != Thread.currentThread().getContextClassLoader()) {
+                Thread.currentThread().setContextClassLoader(contextClassLoader);
+            }
         }
         return proceed;
     }

diff --git a/dinky-alert/dinky-alert-email/src/main/java/org/dinky/alert/email/EmailSender.java b/dinky-alert/dinky-alert-email/src/main/java/org/dinky/alert/email/EmailSender.java
@@ -78,8 +78,6 @@ public AlertResult send(String title, String content) {
             return alertResult;
         }
 
-        Thread.currentThread().setContextClassLoader(getClass().getClassLoader());
-
         try {
             String sendResult = MailUtil.send(
                     getMailAccount(),

diff --git a/...client/dinky-client-1.14/src/main/java/org/dinky/executor/CustomTableEnvironmentImpl.java b/...client/dinky-client-1.14/src/main/java/org/dinky/executor/CustomTableEnvironmentImpl.java
@@ -119,6 +119,7 @@ public CustomTableEnvironmentImpl(
                 executor,
                 isStreamingMode,
                 userClassLoader));
+        Thread.currentThread().setContextClassLoader(userClassLoader);
         this.executor = executor;
         injectParser(new CustomParserImpl(getPlanner().getParser()));
         injectExtendedExecutor(new CustomExtendedOperationExecutorImpl(this));

diff --git a/...client/dinky-client-1.15/src/main/java/org/dinky/executor/CustomTableEnvironmentImpl.java b/...client/dinky-client-1.15/src/main/java/org/dinky/executor/CustomTableEnvironmentImpl.java
@@ -108,6 +108,7 @@ public CustomTableEnvironmentImpl(
                 executor,
                 isStreamingMode,
                 userClassLoader));
+        Thread.currentThread().setContextClassLoader(userClassLoader);
         injectParser(new CustomParserImpl(getPlanner().getParser()));
         injectExtendedExecutor(new CustomExtendedOperationExecutorImpl(this));
     }

diff --git a/dinky-core/src/main/java/org/dinky/executor/Executor.java b/dinky-core/src/main/java/org/dinky/executor/Executor.java
@@ -60,7 +60,6 @@
 import com.fasterxml.jackson.databind.node.ObjectNode;
 
 import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.util.ReflectUtil;
 import cn.hutool.core.util.URLUtil;
 
 /**
@@ -152,9 +151,6 @@ protected void init(DinkyClassLoader classLoader) {
         if (executorConfig.isValidVariables()) {
             variableManager.registerVariable(executorConfig.getVariables());
         }
-        // Fix the Classloader in the env above Flink1.16 to appClassLoader, causing ckp to fail to compile
-        ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader();
-        ReflectUtil.setFieldValue(environment, "userClassloader", contextClassLoader);
     }
 
     abstract CustomTableEnvironment createCustomTableEnvironment(ClassLoader classLoader);