Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
yanghaoyuan.sh
DolphinScheduler
提交
92a9b7e2
DolphinScheduler
项目概览
yanghaoyuan.sh
/
DolphinScheduler
与 Fork 源项目一致
Fork自
apache / DolphinScheduler
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
DolphinScheduler
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
未验证
提交
92a9b7e2
编写于
11月 15, 2022
作者:
W
Wenjun Ruan
提交者:
GitHub
11月 15, 2022
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Use System#lineSeparator to replace /n (#12889)
上级
6d8befa0
变更
8
隐藏空白更改
内联
并排
Showing
8 changed file
with
18 addition
and
20 deletion
+18
-20
dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/AbstractCommandExecutor.java
...hinscheduler/plugin/task/api/AbstractCommandExecutor.java
+0
-2
dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/ShellCommandExecutor.java
...olphinscheduler/plugin/task/api/ShellCommandExecutor.java
+9
-9
dolphinscheduler-task-plugin/dolphinscheduler-task-datax/src/main/java/org/apache/dolphinscheduler/plugin/task/datax/DataxTask.java
.../apache/dolphinscheduler/plugin/task/datax/DataxTask.java
+1
-1
dolphinscheduler-task-plugin/dolphinscheduler-task-python/src/main/java/org/apache/dolphinscheduler/plugin/task/python/PythonTask.java
...pache/dolphinscheduler/plugin/task/python/PythonTask.java
+4
-4
dolphinscheduler-task-plugin/dolphinscheduler-task-seatunnel/src/main/java/org/apache/dolphinscheduler/plugin/task/seatunnel/SeatunnelTask.java
...dolphinscheduler/plugin/task/seatunnel/SeatunnelTask.java
+1
-1
dolphinscheduler-task-plugin/dolphinscheduler-task-shell/src/main/java/org/apache/dolphinscheduler/plugin/task/shell/ShellTask.java
.../apache/dolphinscheduler/plugin/task/shell/ShellTask.java
+1
-1
dolphinscheduler-task-plugin/dolphinscheduler-task-spark/src/main/java/org/apache/dolphinscheduler/plugin/task/spark/SparkTask.java
.../apache/dolphinscheduler/plugin/task/spark/SparkTask.java
+1
-1
dolphinscheduler-task-plugin/dolphinscheduler-task-sqoop/src/main/java/org/apache/dolphinscheduler/plugin/task/sqoop/generator/SqoopJobGenerator.java
...eduler/plugin/task/sqoop/generator/SqoopJobGenerator.java
+1
-1
未找到文件。
dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/AbstractCommandExecutor.java
浏览文件 @
92a9b7e2
...
...
@@ -33,7 +33,6 @@ import java.io.File;
import
java.io.IOException
;
import
java.io.InputStreamReader
;
import
java.lang.reflect.Field
;
import
java.util.Collections
;
import
java.util.LinkedList
;
import
java.util.List
;
import
java.util.concurrent.ExecutorService
;
...
...
@@ -135,7 +134,6 @@ public abstract class AbstractCommandExecutor {
}
}
command
.
add
(
commandInterpreter
());
command
.
addAll
(
Collections
.
emptyList
());
command
.
add
(
commandFile
);
// setting commands
...
...
dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/ShellCommandExecutor.java
浏览文件 @
92a9b7e2
...
...
@@ -91,24 +91,24 @@ public class ShellCommandExecutor extends AbstractCommandExecutor {
StringBuilder
sb
=
new
StringBuilder
();
if
(
SystemUtils
.
IS_OS_WINDOWS
)
{
sb
.
append
(
"@echo off
\n"
);
sb
.
append
(
"cd /d %~dp0
\n"
);
sb
.
append
(
"@echo off
"
).
append
(
System
.
lineSeparator
()
);
sb
.
append
(
"cd /d %~dp0
"
).
append
(
System
.
lineSeparator
()
);
if
(
StringUtils
.
isNotBlank
(
taskRequest
.
getEnvironmentConfig
()))
{
sb
.
append
(
taskRequest
.
getEnvironmentConfig
()).
append
(
"\n"
);
sb
.
append
(
taskRequest
.
getEnvironmentConfig
()).
append
(
System
.
lineSeparator
()
);
}
else
{
if
(
taskRequest
.
getEnvFile
()
!=
null
)
{
sb
.
append
(
"call "
).
append
(
taskRequest
.
getEnvFile
()).
append
(
"\n"
);
sb
.
append
(
"call "
).
append
(
taskRequest
.
getEnvFile
()).
append
(
System
.
lineSeparator
()
);
}
}
}
else
{
sb
.
append
(
"#!/bin/bash
\n"
);
sb
.
append
(
"BASEDIR=$(cd `dirname $0`; pwd)
\n"
);
sb
.
append
(
"cd $BASEDIR
\n"
);
sb
.
append
(
"#!/bin/bash
"
).
append
(
System
.
lineSeparator
()
);
sb
.
append
(
"BASEDIR=$(cd `dirname $0`; pwd)
"
).
append
(
System
.
lineSeparator
()
);
sb
.
append
(
"cd $BASEDIR
"
).
append
(
System
.
lineSeparator
()
);
if
(
StringUtils
.
isNotBlank
(
taskRequest
.
getEnvironmentConfig
()))
{
sb
.
append
(
taskRequest
.
getEnvironmentConfig
()).
append
(
"\n"
);
sb
.
append
(
taskRequest
.
getEnvironmentConfig
()).
append
(
System
.
lineSeparator
()
);
}
else
{
if
(
taskRequest
.
getEnvFile
()
!=
null
)
{
sb
.
append
(
"source "
).
append
(
taskRequest
.
getEnvFile
()).
append
(
"\n"
);
sb
.
append
(
"source "
).
append
(
taskRequest
.
getEnvFile
()).
append
(
System
.
lineSeparator
()
);
}
}
}
...
...
dolphinscheduler-task-plugin/dolphinscheduler-task-datax/src/main/java/org/apache/dolphinscheduler/plugin/task/datax/DataxTask.java
浏览文件 @
92a9b7e2
...
...
@@ -209,7 +209,7 @@ public class DataxTask extends AbstractTask {
}
if
(
dataXParameters
.
getCustomConfig
()
==
Flag
.
YES
.
ordinal
())
{
json
=
dataXParameters
.
getJson
().
replaceAll
(
"\\r\\n"
,
"\n"
);
json
=
dataXParameters
.
getJson
().
replaceAll
(
"\\r\\n"
,
System
.
lineSeparator
()
);
}
else
{
ObjectNode
job
=
JSONUtils
.
createObjectNode
();
job
.
putArray
(
"content"
).
addAll
(
buildDataxJobContentJson
());
...
...
dolphinscheduler-task-plugin/dolphinscheduler-task-python/src/main/java/org/apache/dolphinscheduler/plugin/task/python/PythonTask.java
浏览文件 @
92a9b7e2
...
...
@@ -89,7 +89,7 @@ public class PythonTask extends AbstractTask {
@Override
public
String
getPreScript
()
{
String
rawPythonScript
=
pythonParameters
.
getRawScript
().
replaceAll
(
"\\r\\n"
,
"\n"
);
String
rawPythonScript
=
pythonParameters
.
getRawScript
().
replaceAll
(
"\\r\\n"
,
System
.
lineSeparator
()
);
try
{
rawPythonScript
=
convertPythonScriptPlaceholders
(
rawPythonScript
);
}
catch
(
StringIndexOutOfBoundsException
e
)
{
...
...
@@ -182,9 +182,9 @@ public class PythonTask extends AbstractTask {
logger
.
info
(
"generate python script file:{}"
,
pythonScriptFile
);
StringBuilder
sb
=
new
StringBuilder
();
sb
.
append
(
"#-*- encoding=utf8 -*-
\n"
);
sb
.
append
(
"#-*- encoding=utf8 -*-
"
).
append
(
System
.
lineSeparator
()
);
sb
.
append
(
"\n\n"
);
sb
.
append
(
System
.
lineSeparator
()
);
sb
.
append
(
pythonScript
);
logger
.
info
(
sb
.
toString
());
...
...
@@ -212,7 +212,7 @@ public class PythonTask extends AbstractTask {
*/
protected
String
buildPythonScriptContent
()
throws
Exception
{
logger
.
info
(
"raw python script : {}"
,
pythonParameters
.
getRawScript
());
String
rawPythonScript
=
pythonParameters
.
getRawScript
().
replaceAll
(
"\\r\\n"
,
"\n"
);
String
rawPythonScript
=
pythonParameters
.
getRawScript
().
replaceAll
(
"\\r\\n"
,
System
.
lineSeparator
()
);
Map
<
String
,
Property
>
paramsMap
=
mergeParamsWithContext
(
pythonParameters
);
return
ParameterUtils
.
convertParameterPlaceholders
(
rawPythonScript
,
ParamUtils
.
convert
(
paramsMap
));
}
...
...
dolphinscheduler-task-plugin/dolphinscheduler-task-seatunnel/src/main/java/org/apache/dolphinscheduler/plugin/task/seatunnel/SeatunnelTask.java
浏览文件 @
92a9b7e2
...
...
@@ -172,7 +172,7 @@ public class SeatunnelTask extends AbstractRemoteTask {
private
String
buildCustomConfigContent
()
{
logger
.
info
(
"raw custom config content : {}"
,
seatunnelParameters
.
getRawScript
());
String
script
=
seatunnelParameters
.
getRawScript
().
replaceAll
(
"\\r\\n"
,
"\n"
);
String
script
=
seatunnelParameters
.
getRawScript
().
replaceAll
(
"\\r\\n"
,
System
.
lineSeparator
()
);
script
=
parseScript
(
script
);
return
script
;
}
...
...
dolphinscheduler-task-plugin/dolphinscheduler-task-shell/src/main/java/org/apache/dolphinscheduler/plugin/task/shell/ShellTask.java
浏览文件 @
92a9b7e2
...
...
@@ -137,7 +137,7 @@ public class ShellTask extends AbstractTask {
return
fileName
;
}
String
script
=
shellParameters
.
getRawScript
().
replaceAll
(
"\\r\\n"
,
"\n"
);
String
script
=
shellParameters
.
getRawScript
().
replaceAll
(
"\\r\\n"
,
System
.
lineSeparator
()
);
script
=
parseScript
(
script
);
shellParameters
.
setRawScript
(
script
);
...
...
dolphinscheduler-task-plugin/dolphinscheduler-task-spark/src/main/java/org/apache/dolphinscheduler/plugin/task/spark/SparkTask.java
浏览文件 @
92a9b7e2
...
...
@@ -254,7 +254,7 @@ public class SparkTask extends AbstractYarnTask {
}
private
String
replaceParam
(
String
script
)
{
script
=
script
.
replaceAll
(
"\\r\\n"
,
"\n"
);
script
=
script
.
replaceAll
(
"\\r\\n"
,
System
.
lineSeparator
()
);
// replace placeholder, and combining local and global parameters
Map
<
String
,
Property
>
paramsMap
=
taskExecutionContext
.
getPrepareParamsMap
();
script
=
ParameterUtils
.
convertParameterPlaceholders
(
script
,
ParamUtils
.
convert
(
paramsMap
));
...
...
dolphinscheduler-task-plugin/dolphinscheduler-task-sqoop/src/main/java/org/apache/dolphinscheduler/plugin/task/sqoop/generator/SqoopJobGenerator.java
浏览文件 @
92a9b7e2
...
...
@@ -80,7 +80,7 @@ public class SqoopJobGenerator {
sourceGenerator
.
generate
(
sqoopParameters
,
sqoopTaskExecutionContext
),
targetGenerator
.
generate
(
sqoopParameters
,
sqoopTaskExecutionContext
));
}
else
if
(
SqoopJobType
.
CUSTOM
.
getDescp
().
equals
(
sqoopParameters
.
getJobType
()))
{
sqoopScripts
=
sqoopParameters
.
getCustomShell
().
replaceAll
(
"\\r\\n"
,
"\n"
);
sqoopScripts
=
sqoopParameters
.
getCustomShell
().
replaceAll
(
"\\r\\n"
,
System
.
lineSeparator
()
);
}
return
sqoopScripts
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录