Browse Source

[fix-13492]add single quotes (#13534)

* [fix-13492]add single quotes

* [improve-#13201] fix test error

---------

Co-authored-by: fuchanghai <‘2875334588@qq.com’>
3.2.0-release
fuchanghai 2 years ago committed by GitHub
parent
commit
37939add0c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      dolphinscheduler-task-plugin/dolphinscheduler-task-datax/src/main/java/org/apache/dolphinscheduler/plugin/task/datax/DataxTask.java
  2. 2
      dolphinscheduler-task-plugin/dolphinscheduler-task-datax/src/test/java/org/apache/dolphinscheduler/plugin/task/datax/DataxTaskTest.java

2
dolphinscheduler-task-plugin/dolphinscheduler-task-datax/src/main/java/org/apache/dolphinscheduler/plugin/task/datax/DataxTask.java

@ -84,7 +84,7 @@ public class DataxTask extends AbstractTask {
*/ */
public static final String JVM_PARAM = " --jvm=\"-Xms%sG -Xmx%sG\" "; public static final String JVM_PARAM = " --jvm=\"-Xms%sG -Xmx%sG\" ";
public static final String CUSTOM_PARAM = " -D%s=%s"; public static final String CUSTOM_PARAM = " -D%s='%s'";
/** /**
* python process(datax only supports version 2.7 by default) * python process(datax only supports version 2.7 by default)
*/ */

2
dolphinscheduler-task-plugin/dolphinscheduler-task-datax/src/test/java/org/apache/dolphinscheduler/plugin/task/datax/DataxTaskTest.java

@ -157,7 +157,7 @@ public class DataxTaskTest {
InputStream shellCommandInputStream = Files.newInputStream(shellCommandFile.toPath()); InputStream shellCommandInputStream = Files.newInputStream(shellCommandFile.toPath());
String shellCommandStr = FileUtils.readFile2Str(shellCommandInputStream); String shellCommandStr = FileUtils.readFile2Str(shellCommandInputStream);
Assertions.assertEquals(shellCommandStr, "python2.7 ${DATAX_HOME}/bin/datax.py --jvm=\"-Xms1G -Xmx1G\" " + Assertions.assertEquals(shellCommandStr, "python2.7 ${DATAX_HOME}/bin/datax.py --jvm=\"-Xms1G -Xmx1G\" " +
"-p \"-DDT=DT -DDS=DS\" /tmp/execution/app-id_job.json"); "-p \"-DDT='DT' -DDS='DS'\" /tmp/execution/app-id_job.json");
delete = shellCommandFile.delete(); delete = shellCommandFile.delete();
Assertions.assertTrue(delete); Assertions.assertTrue(delete);
} }

Loading…
Cancel
Save