Fix jar path is not correct in java task (apache#15906)

ruanwenjun · Apr 29, 2024 · 0a11cd2 · 0a11cd2
1 parent 647cbae
commit 0a11cd2
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 56 deletions.
diff --git a/...i/src/main/java/org/apache/dolphinscheduler/plugin/task/api/resource/ResourceContext.java b/...i/src/main/java/org/apache/dolphinscheduler/plugin/task/api/resource/ResourceContext.java
@@ -60,7 +60,6 @@ public ResourceItem getResourceItem(String resourceAbsolutePathInStorage) {
     public static class ResourceItem {
 
         private String resourceAbsolutePathInStorage;
-        private String resourceRelativePath;
         private String resourceAbsolutePathInLocal;
     }
 

diff --git a/...ivecli/src/test/java/org/apache/dolphinscheduler/plugin/task/hivecli/HiveCliTaskTest.java b/...ivecli/src/test/java/org/apache/dolphinscheduler/plugin/task/hivecli/HiveCliTaskTest.java
@@ -65,7 +65,7 @@ public void after() {
     }
 
     @Test
-    public void hiveCliTaskExecuteSqlFromScript() throws Exception {
+    public void hiveCliTaskExecuteSqlFromScript() {
         String hiveCliTaskParameters = buildHiveCliTaskExecuteSqlFromScriptParameters();
         HiveCliTask hiveCliTask = prepareHiveCliTaskForTest(hiveCliTaskParameters);
         hiveCliTask.init();
@@ -78,7 +78,7 @@ public void hiveCliTaskExecuteSqlFromFile() {
         TaskExecutionContext taskExecutionContext = new TaskExecutionContext();
         taskExecutionContext.setTaskParams(hiveCliTaskParameters);
         ResourceContext resourceContext = new ResourceContext();
-        resourceContext.addResourceItem(new ResourceContext.ResourceItem("/sql_tasks/hive_task.sql", "123_node.sql",
+        resourceContext.addResourceItem(new ResourceContext.ResourceItem("/sql_tasks/hive_task.sql",
                 "/sql_tasks/hive_task.sql"));
         taskExecutionContext.setResourceContext(resourceContext);
 

diff --git a/...eduler-task-java/src/main/java/org/apache/dolphinscheduler/plugin/task/java/JavaTask.java b/...eduler-task-java/src/main/java/org/apache/dolphinscheduler/plugin/task/java/JavaTask.java
@@ -88,6 +88,7 @@ public JavaTask(TaskExecutionContext taskRequest) {
 
     /**
      * Initializes a Java task
+     *
      * @return void
      **/
     @Override
@@ -178,15 +179,16 @@ protected String buildJavaCommand() throws Exception {
      **/
     protected String buildJarCommand() {
         ResourceContext resourceContext = taskRequest.getResourceContext();
-        String mainJarName = resourceContext.getResourceItem(javaParameters.getMainJar().getResourceName())
+        String mainJarAbsolutePathInLocal = resourceContext
+                .getResourceItem(javaParameters.getMainJar().getResourceName())
                 .getResourceAbsolutePathInLocal();
         StringBuilder builder = new StringBuilder();
         builder.append(getJavaCommandPath())
                 .append("java").append(" ")
                 .append(buildResourcePath()).append(" ")
                 .append("-jar").append(" ")
                 .append(taskRequest.getExecutePath()).append(FOLDER_SEPARATOR)
-                .append(mainJarName).append(" ")
+                .append(mainJarAbsolutePathInLocal).append(" ")
                 .append(javaParameters.getMainArgs().trim()).append(" ")
                 .append(javaParameters.getJvmArgs().trim());
         return builder.toString();
@@ -207,39 +209,6 @@ public AbstractParameters getParameters() {
         return javaParameters;
     }
 
-    /**
-     * Replaces placeholders such as local variables in source files
-     *
-     * @param rawScript
-     * @return String
-     * @throws StringIndexOutOfBoundsException
-     */
-    protected static String convertJavaSourceCodePlaceholders(String rawScript) throws StringIndexOutOfBoundsException {
-        int len = "${setShareVar(${".length();
-
-        int scriptStart = 0;
-        while ((scriptStart = rawScript.indexOf("${setShareVar(${", scriptStart)) != -1) {
-            int start = -1;
-            int end = rawScript.indexOf('}', scriptStart + len);
-            String prop = rawScript.substring(scriptStart + len, end);
-
-            start = rawScript.indexOf(',', end);
-            end = rawScript.indexOf(')', start);
-
-            String value = rawScript.substring(start + 1, end);
-
-            start = rawScript.indexOf('}', start) + 1;
-            end = rawScript.length();
-
-            String replaceScript = String.format("print(\"${{setValue({},{})}}\".format(\"%s\",%s))", prop, value);
-
-            rawScript = rawScript.substring(0, scriptStart) + replaceScript + rawScript.substring(start, end);
-
-            scriptStart += replaceScript.length();
-        }
-        return rawScript;
-    }
-
     /**
      * Creates a Java source file when it does not exist
      *
@@ -290,8 +259,6 @@ protected String buildResourcePath() {
         for (ResourceInfo info : javaParameters.getResourceFilesList()) {
             builder.append(JavaConstants.PATH_SEPARATOR);
             builder
-                    .append(taskRequest.getExecutePath())
-                    .append(FOLDER_SEPARATOR)
                     .append(resourceContext.getResourceItem(info.getResourceName()).getResourceAbsolutePathInLocal());
         }
         return builder.toString();

diff --git a/...er-task-java/src/test/java/org/apache/dolphinscheduler/plugin/task/java/JavaTaskTest.java b/...er-task-java/src/test/java/org/apache/dolphinscheduler/plugin/task/java/JavaTaskTest.java
@@ -17,6 +17,7 @@
 
 package org.apache.dolphinscheduler.plugin.task.java;
 
+import static com.google.common.truth.Truth.assertThat;
 import static org.apache.dolphinscheduler.plugin.task.api.enums.DataType.VARCHAR;
 import static org.apache.dolphinscheduler.plugin.task.api.enums.Direct.IN;
 import static org.apache.dolphinscheduler.plugin.task.java.JavaConstants.RUN_TYPE_JAR;
@@ -34,7 +35,6 @@
 import org.apache.dolphinscheduler.plugin.task.java.exception.PublicClassNotFoundException;
 import org.apache.dolphinscheduler.plugin.task.java.exception.RunTypeNotFoundException;
 
-import java.io.File;
 import java.io.IOException;
 import java.lang.reflect.Field;
 import java.nio.file.Files;
@@ -82,10 +82,10 @@ public void testGetPubllicClassName() {
      **/
     @Test
     public void buildJarCommand() {
-        String homeBinPath = JavaConstants.JAVA_HOME_VAR + File.separator + "bin" + File.separator;
         JavaTask javaTask = runJarType();
-        Assertions.assertEquals(javaTask.buildJarCommand(), homeBinPath
-                + "java -classpath .:/tmp/dolphinscheduler/test/executepath:/tmp/dolphinscheduler/test/executepath/opt/share/jar/resource2.jar -jar /tmp/dolphinscheduler/test/executepath/opt/share/jar/main.jar -host 127.0.0.1 -port 8080 -xms:50m");
+        assertThat(javaTask.buildJarCommand())
+                .isEqualTo(
+                        "${JAVA_HOME}/bin/java -classpath .:/tmp/dolphinscheduler/test/executepath:opt/share/jar/resource2.jar -jar /tmp/dolphinscheduler/test/executepath/opt/share/jar/main.jar -host 127.0.0.1 -port 8080 -xms:50m");
     }
 
     /**
@@ -101,14 +101,13 @@ public void buildJavaCompileCommand() throws IOException {
         Assertions.assertEquals("JavaTaskTest", publicClassName);
         String fileName = javaTask.buildJavaSourceCodeFileFullName(publicClassName);
         try {
-            String homeBinPath = JavaConstants.JAVA_HOME_VAR + File.separator + "bin" + File.separator;
             Path path = Paths.get(fileName);
             if (Files.exists(path)) {
                 Files.delete(path);
             }
-            Assertions.assertEquals(homeBinPath
-                    + "javac -classpath .:/tmp/dolphinscheduler/test/executepath:/tmp/dolphinscheduler/test/executepath/opt/share/jar/resource2.jar /tmp/dolphinscheduler/test/executepath/JavaTaskTest.java",
-                    javaTask.buildJavaCompileCommand(sourceCode));
+            assertThat(javaTask.buildJavaCompileCommand(sourceCode))
+                    .isEqualTo(
+                            "${JAVA_HOME}/bin/javac -classpath .:/tmp/dolphinscheduler/test/executepath:opt/share/jar/resource2.jar /tmp/dolphinscheduler/test/executepath/JavaTaskTest.java");
         } finally {
             Path path = Paths.get(fileName);
             if (Files.exists(path)) {
@@ -121,26 +120,29 @@ public void buildJavaCompileCommand() throws IOException {
     /**
      * Construct java to run the command
      *
-     *  @return void
+     * @return void
      **/
     @Test
     public void buildJavaCommand() throws Exception {
-        String wantJavaCommand =
-                "${JAVA_HOME}/bin/javac -classpath .:/tmp/dolphinscheduler/test/executepath:/tmp/dolphinscheduler/test/executepath/opt/share/jar/resource2.jar /tmp/dolphinscheduler/test/executepath/JavaTaskTest.java;${JAVA_HOME}/bin/java -classpath .:/tmp/dolphinscheduler/test/executepath:/tmp/dolphinscheduler/test/executepath/opt/share/jar/resource2.jar JavaTaskTest -host 127.0.0.1 -port 8080 -xms:50m";
         JavaTask javaTask = runJavaType();
         String sourceCode = javaTask.buildJavaSourceContent();
         String publicClassName = javaTask.getPublicClassName(sourceCode);
+
         Assertions.assertEquals("JavaTaskTest", publicClassName);
+
         String fileName = javaTask.buildJavaSourceCodeFileFullName(publicClassName);
         Path path = Paths.get(fileName);
         if (Files.exists(path)) {
             Files.delete(path);
         }
-        Assertions.assertEquals(wantJavaCommand, javaTask.buildJavaCommand());
+        assertThat(javaTask.buildJavaCommand())
+                .isEqualTo(
+                        "${JAVA_HOME}/bin/javac -classpath .:/tmp/dolphinscheduler/test/executepath:opt/share/jar/resource2.jar /tmp/dolphinscheduler/test/executepath/JavaTaskTest.java;${JAVA_HOME}/bin/java -classpath .:/tmp/dolphinscheduler/test/executepath:opt/share/jar/resource2.jar JavaTaskTest -host 127.0.0.1 -port 8080 -xms:50m");
     }
 
     /**
      * There is no exception to overwriting the Java source file
+     *
      * @return void
      * @throws IOException
      **/
@@ -259,8 +261,8 @@ public JavaTask runJavaType() {
         resourceItem2.setResourceAbsolutePathInLocal("opt/share/jar/main.jar");
 
         ResourceContext.ResourceItem resourceItem3 = new ResourceContext.ResourceItem();
-        resourceItem2.setResourceAbsolutePathInStorage("/JavaTaskTest.java");
-        resourceItem2.setResourceAbsolutePathInLocal("JavaTaskTest.java");
+        resourceItem3.setResourceAbsolutePathInStorage("/JavaTaskTest.java");
+        resourceItem3.setResourceAbsolutePathInLocal("JavaTaskTest.java");
 
         ResourceContext resourceContext = new ResourceContext();
         resourceContext.addResourceItem(resourceItem1);
@@ -275,7 +277,7 @@ public JavaTask runJavaType() {
     /**
      * The Java task to construct the jar run mode
      *
-     *  @return JavaTask
+     * @return JavaTask
      **/
     private JavaTask runJarType() {
         TaskExecutionContext taskExecutionContext = new TaskExecutionContext();

diff --git a/.../main/java/org/apache/dolphinscheduler/server/worker/utils/TaskExecutionContextUtils.java b/.../main/java/org/apache/dolphinscheduler/server/worker/utils/TaskExecutionContextUtils.java
@@ -151,7 +151,6 @@ public static ResourceContext downloadResourcesIfNeeded(String tenant,
             }
             ResourceContext.ResourceItem resourceItem = ResourceContext.ResourceItem.builder()
                     .resourceAbsolutePathInStorage(resourceAbsolutePathInStorage)
-                    .resourceRelativePath(resourceRelativePath)
                     .resourceAbsolutePathInLocal(resourceAbsolutePathInLocal)
                     .build();
             resourceContext.addResourceItem(resourceItem);