This is an automated email from the ASF dual-hosted git repository.
tyrantlucifer pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-seatunnel.git
The following commit(s) were added to refs/heads/dev by this push:
new 980475c4d [Chore][Zeta] Rename class loader (#3994)
980475c4d is described below
commit 980475c4d2e08b33a11bab439779db9ec04d1a3b
Author: Tyrantlucifer <[email protected]>
AuthorDate: Mon Jan 30 01:11:50 2023 +0800
[Chore][Zeta] Rename class loader (#3994)
---
...unnelBaseClassLoader.java => SeaTunnelBaseClassLoader.java} | 10 +++++-----
...rstClassLoader.java => SeaTunnelChildFirstClassLoader.java} | 10 +++++-----
...stClassLoader.java => SeaTunnelParentFirstClassLoader.java} | 4 ++--
.../apache/seatunnel/engine/core/parse/JobConfigParser.java | 4 ++--
.../apache/seatunnel/engine/server/TaskExecutionService.java | 4 ++--
.../org/apache/seatunnel/engine/server/master/JobMaster.java | 4 ++--
6 files changed, 18 insertions(+), 18 deletions(-)
diff --git
a/seatunnel-engine/seatunnel-engine-common/src/main/java/org/apache/seatunnel/engine/common/loader/SeatunnelBaseClassLoader.java
b/seatunnel-engine/seatunnel-engine-common/src/main/java/org/apache/seatunnel/engine/common/loader/SeaTunnelBaseClassLoader.java
similarity index 86%
rename from
seatunnel-engine/seatunnel-engine-common/src/main/java/org/apache/seatunnel/engine/common/loader/SeatunnelBaseClassLoader.java
rename to
seatunnel-engine/seatunnel-engine-common/src/main/java/org/apache/seatunnel/engine/common/loader/SeaTunnelBaseClassLoader.java
index 2655be861..e6be9783b 100644
---
a/seatunnel-engine/seatunnel-engine-common/src/main/java/org/apache/seatunnel/engine/common/loader/SeatunnelBaseClassLoader.java
+++
b/seatunnel-engine/seatunnel-engine-common/src/main/java/org/apache/seatunnel/engine/common/loader/SeaTunnelBaseClassLoader.java
@@ -22,20 +22,20 @@ import java.net.URLClassLoader;
import java.util.List;
import java.util.function.Consumer;
-public abstract class SeatunnelBaseClassLoader extends URLClassLoader {
+public abstract class SeaTunnelBaseClassLoader extends URLClassLoader {
protected static final Consumer<Throwable> NOOP_EXCEPTION_HANDLER =
classLoadingException -> {};
private final Consumer<Throwable> classLoadingExceptionHandler;
- protected SeatunnelBaseClassLoader(List<URL> urls) {
- this(urls.toArray(new URL[0]),
SeatunnelBaseClassLoader.class.getClassLoader());
+ protected SeaTunnelBaseClassLoader(List<URL> urls) {
+ this(urls.toArray(new URL[0]),
SeaTunnelBaseClassLoader.class.getClassLoader());
}
- protected SeatunnelBaseClassLoader(URL[] urls, ClassLoader parent) {
+ protected SeaTunnelBaseClassLoader(URL[] urls, ClassLoader parent) {
this(urls, parent, NOOP_EXCEPTION_HANDLER);
}
- protected SeatunnelBaseClassLoader(URL[] urls, ClassLoader parent,
Consumer<Throwable> classLoadingExceptionHandler) {
+ protected SeaTunnelBaseClassLoader(URL[] urls, ClassLoader parent,
Consumer<Throwable> classLoadingExceptionHandler) {
super(urls, parent);
this.classLoadingExceptionHandler = classLoadingExceptionHandler;
}
diff --git
a/seatunnel-engine/seatunnel-engine-common/src/main/java/org/apache/seatunnel/engine/common/loader/SeatunnelChildFirstClassLoader.java
b/seatunnel-engine/seatunnel-engine-common/src/main/java/org/apache/seatunnel/engine/common/loader/SeaTunnelChildFirstClassLoader.java
similarity index 93%
rename from
seatunnel-engine/seatunnel-engine-common/src/main/java/org/apache/seatunnel/engine/common/loader/SeatunnelChildFirstClassLoader.java
rename to
seatunnel-engine/seatunnel-engine-common/src/main/java/org/apache/seatunnel/engine/common/loader/SeaTunnelChildFirstClassLoader.java
index ea0dc88d0..133af63db 100644
---
a/seatunnel-engine/seatunnel-engine-common/src/main/java/org/apache/seatunnel/engine/common/loader/SeatunnelChildFirstClassLoader.java
+++
b/seatunnel-engine/seatunnel-engine-common/src/main/java/org/apache/seatunnel/engine/common/loader/SeaTunnelChildFirstClassLoader.java
@@ -25,7 +25,7 @@ import java.util.Iterator;
import java.util.List;
import java.util.function.Consumer;
-public class SeatunnelChildFirstClassLoader extends SeatunnelBaseClassLoader {
+public class SeaTunnelChildFirstClassLoader extends SeaTunnelBaseClassLoader {
private final String[] alwaysParentFirstPatterns;
private static final String[] DEFAULT_PARENT_FIRST_PATTERNS = new String[]{
"java.",
@@ -43,18 +43,18 @@ public class SeatunnelChildFirstClassLoader extends
SeatunnelBaseClassLoader {
"com.fasterxml.jackson"
};
- public SeatunnelChildFirstClassLoader(List<URL> urls) {
+ public SeaTunnelChildFirstClassLoader(List<URL> urls) {
this(urls, DEFAULT_PARENT_FIRST_PATTERNS);
}
- public SeatunnelChildFirstClassLoader(List<URL> urls, String[]
alwaysParentFirstPatterns) {
+ public SeaTunnelChildFirstClassLoader(List<URL> urls, String[]
alwaysParentFirstPatterns) {
this(urls.toArray(new URL[0]),
- SeatunnelChildFirstClassLoader.class.getClassLoader(),
+ SeaTunnelChildFirstClassLoader.class.getClassLoader(),
alwaysParentFirstPatterns,
NOOP_EXCEPTION_HANDLER);
}
- public SeatunnelChildFirstClassLoader(
+ public SeaTunnelChildFirstClassLoader(
URL[] urls,
ClassLoader parent,
String[] alwaysParentFirstPatterns,
diff --git
a/seatunnel-engine/seatunnel-engine-common/src/main/java/org/apache/seatunnel/engine/common/loader/SeatunnelParentFirstClassLoader.java
b/seatunnel-engine/seatunnel-engine-common/src/main/java/org/apache/seatunnel/engine/common/loader/SeaTunnelParentFirstClassLoader.java
similarity index 88%
rename from
seatunnel-engine/seatunnel-engine-common/src/main/java/org/apache/seatunnel/engine/common/loader/SeatunnelParentFirstClassLoader.java
rename to
seatunnel-engine/seatunnel-engine-common/src/main/java/org/apache/seatunnel/engine/common/loader/SeaTunnelParentFirstClassLoader.java
index e843c0633..5dd41d1a5 100644
---
a/seatunnel-engine/seatunnel-engine-common/src/main/java/org/apache/seatunnel/engine/common/loader/SeatunnelParentFirstClassLoader.java
+++
b/seatunnel-engine/seatunnel-engine-common/src/main/java/org/apache/seatunnel/engine/common/loader/SeaTunnelParentFirstClassLoader.java
@@ -20,9 +20,9 @@ package org.apache.seatunnel.engine.common.loader;
import java.net.URL;
import java.util.List;
-public class SeatunnelParentFirstClassLoader extends SeatunnelBaseClassLoader {
+public class SeaTunnelParentFirstClassLoader extends SeaTunnelBaseClassLoader {
- public SeatunnelParentFirstClassLoader(List<URL> urls) {
+ public SeaTunnelParentFirstClassLoader(List<URL> urls) {
super(urls);
}
}
diff --git
a/seatunnel-engine/seatunnel-engine-core/src/main/java/org/apache/seatunnel/engine/core/parse/JobConfigParser.java
b/seatunnel-engine/seatunnel-engine-core/src/main/java/org/apache/seatunnel/engine/core/parse/JobConfigParser.java
index 5cd880b9a..a322bd374 100644
---
a/seatunnel-engine/seatunnel-engine-core/src/main/java/org/apache/seatunnel/engine/core/parse/JobConfigParser.java
+++
b/seatunnel-engine/seatunnel-engine-core/src/main/java/org/apache/seatunnel/engine/core/parse/JobConfigParser.java
@@ -36,7 +36,7 @@ import org.apache.seatunnel.common.constants.JobMode;
import org.apache.seatunnel.core.starter.utils.ConfigBuilder;
import org.apache.seatunnel.engine.common.config.JobConfig;
import org.apache.seatunnel.engine.common.exception.JobDefineCheckException;
-import
org.apache.seatunnel.engine.common.loader.SeatunnelChildFirstClassLoader;
+import
org.apache.seatunnel.engine.common.loader.SeaTunnelChildFirstClassLoader;
import org.apache.seatunnel.engine.common.utils.IdGenerator;
import org.apache.seatunnel.engine.core.dag.actions.Action;
import org.apache.seatunnel.engine.core.dag.actions.SinkAction;
@@ -111,7 +111,7 @@ public class JobConfigParser {
}
public ImmutablePair<List<Action>, Set<URL>> parse() {
- Thread.currentThread().setContextClassLoader(new
SeatunnelChildFirstClassLoader(new ArrayList<>()));
+ Thread.currentThread().setContextClassLoader(new
SeaTunnelChildFirstClassLoader(new ArrayList<>()));
List<? extends Config> sinkConfigs =
seaTunnelJobConfig.getConfigList("sink");
List<? extends Config> transformConfigs =
TypesafeConfigUtils.getConfigList(seaTunnelJobConfig, "transform",
Collections.emptyList());
diff --git
a/seatunnel-engine/seatunnel-engine-server/src/main/java/org/apache/seatunnel/engine/server/TaskExecutionService.java
b/seatunnel-engine/seatunnel-engine-server/src/main/java/org/apache/seatunnel/engine/server/TaskExecutionService.java
index aba4180f4..cbe3f6006 100644
---
a/seatunnel-engine/seatunnel-engine-server/src/main/java/org/apache/seatunnel/engine/server/TaskExecutionService.java
+++
b/seatunnel-engine/seatunnel-engine-server/src/main/java/org/apache/seatunnel/engine/server/TaskExecutionService.java
@@ -32,7 +32,7 @@ import static java.util.stream.Collectors.toList;
import org.apache.seatunnel.api.common.metrics.MetricTags;
import org.apache.seatunnel.common.utils.ExceptionUtils;
-import
org.apache.seatunnel.engine.common.loader.SeatunnelChildFirstClassLoader;
+import
org.apache.seatunnel.engine.common.loader.SeaTunnelChildFirstClassLoader;
import org.apache.seatunnel.engine.common.utils.PassiveCompletableFuture;
import org.apache.seatunnel.engine.server.execution.ExecutionState;
import org.apache.seatunnel.engine.server.execution.ProgressState;
@@ -181,7 +181,7 @@ public class TaskExecutionService implements
DynamicMetricsProvider {
Set<URL> jars = taskImmutableInfo.getJars();
ClassLoader classLoader =
Thread.currentThread().getContextClassLoader();
if (!CollectionUtils.isEmpty(jars)) {
- classLoader = new
SeatunnelChildFirstClassLoader(Lists.newArrayList(jars));
+ classLoader = new
SeaTunnelChildFirstClassLoader(Lists.newArrayList(jars));
taskGroup =
CustomClassLoadedObject.deserializeWithCustomClassLoader(nodeEngine.getSerializationService(),
classLoader,
diff --git
a/seatunnel-engine/seatunnel-engine-server/src/main/java/org/apache/seatunnel/engine/server/master/JobMaster.java
b/seatunnel-engine/seatunnel-engine-server/src/main/java/org/apache/seatunnel/engine/server/master/JobMaster.java
index 6029e762c..d8e40366f 100644
---
a/seatunnel-engine/seatunnel-engine-server/src/main/java/org/apache/seatunnel/engine/server/master/JobMaster.java
+++
b/seatunnel-engine/seatunnel-engine-server/src/main/java/org/apache/seatunnel/engine/server/master/JobMaster.java
@@ -30,7 +30,7 @@ import org.apache.seatunnel.engine.common.config.EngineConfig;
import org.apache.seatunnel.engine.common.config.server.CheckpointConfig;
import
org.apache.seatunnel.engine.common.config.server.CheckpointStorageConfig;
import org.apache.seatunnel.engine.common.exception.SeaTunnelEngineException;
-import
org.apache.seatunnel.engine.common.loader.SeatunnelChildFirstClassLoader;
+import
org.apache.seatunnel.engine.common.loader.SeaTunnelChildFirstClassLoader;
import org.apache.seatunnel.engine.common.utils.PassiveCompletableFuture;
import org.apache.seatunnel.engine.core.dag.logical.LogicalDag;
import org.apache.seatunnel.engine.core.job.JobDAGInfo;
@@ -156,7 +156,7 @@ public class JobMaster {
LOGGER.info(String.format("Job %s (%s) needed jar urls %s",
jobImmutableInformation.getJobConfig().getName(),
jobImmutableInformation.getJobId(),
jobImmutableInformation.getPluginJarsUrls()));
- classLoader = new
SeatunnelChildFirstClassLoader(jobImmutableInformation.getPluginJarsUrls());
+ classLoader = new
SeaTunnelChildFirstClassLoader(jobImmutableInformation.getPluginJarsUrls());
logicalDag =
CustomClassLoadedObject.deserializeWithCustomClassLoader(nodeEngine.getSerializationService(),
classLoader, jobImmutableInformation.getLogicalDag());
CheckpointConfig checkpointConfig =
mergeEnvAndEngineConfig(engineConfig.getCheckpointConfig(),
