fix_session_cannot_use_add_customjar

DataLinkDC · Nov 27, 2024 · f969c84 · f969c84
1 parent fa16032
commit f969c84
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/dinky-core/src/main/java/org/dinky/executor/Executor.java b/dinky-core/src/main/java/org/dinky/executor/Executor.java
@@ -275,7 +275,7 @@ public void initPyUDF(String executable, String... udfPyFilePath) {
     private void addJar(String... jarPath) {
         Configuration configuration = tableEnvironment.getRootConfiguration();
         List<String> jars = configuration.get(PipelineOptions.JARS);
-        if (jars == null) {
+        if (CollUtil.isEmpty(jars)) {
             tableEnvironment.addConfiguration(PipelineOptions.JARS, CollUtil.newArrayList(jarPath));
         } else {
             CollUtil.addAll(jars, jarPath);

diff --git a/dinky-core/src/main/java/org/dinky/job/runner/JobDDLRunner.java b/dinky-core/src/main/java/org/dinky/job/runner/JobDDLRunner.java
@@ -143,22 +143,27 @@ public SqlExplainResult explain(JobStatement jobStatement) {
     }
 
     private void executeAdd(String statement) {
-        AddJarSqlParseStrategy.getAllFilePath(statement)
+        Set<File> allFilePath = AddJarSqlParseStrategy.getAllFilePath(statement);
+        allFilePath
                 .forEach(t -> jobManager.getUdfPathContextHolder().addOtherPlugins(t));
         (jobManager.getExecutor().getDinkyClassLoader())
                 .addURLs(URLUtils.getURLs(jobManager.getUdfPathContextHolder().getOtherPluginsFiles()));
     }
 
     private void executeAddFile(String statement) {
-        AddFileSqlParseStrategy.getAllFilePath(statement)
+        Set<File> allFilePath = AddFileSqlParseStrategy.getAllFilePath(statement);
+        allFilePath
                 .forEach(t -> jobManager.getUdfPathContextHolder().addFile(t));
         (jobManager.getExecutor().getDinkyClassLoader())
                 .addURLs(URLUtils.getURLs(jobManager.getUdfPathContextHolder().getFiles()));
+        jobManager.getExecutor().addJar(ArrayUtil.toArray(allFilePath,File.class));
     }
 
     private void executeAddJar(String statement) {
+        Set<File> allFilePath = AddFileSqlParseStrategy.getAllFilePath(statement);
         Configuration combinationConfig = getCombinationConfig();
         FileSystem.initialize(combinationConfig, null);
+        jobManager.getExecutor().addJar(ArrayUtil.toArray(allFilePath,File.class));
         jobManager.getExecutor().executeSql(statement);
     }