Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
lhongjum2003
DolphinScheduler
提交
48d7612c
DolphinScheduler
项目概览
lhongjum2003
/
DolphinScheduler
与 Fork 源项目一致
Fork自
apache / DolphinScheduler
通知
2
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,发现更多精彩内容 >>
未验证
提交
48d7612c
编写于
3月 28, 2020
作者:
G
gabry.wu
提交者:
GitHub
3月 28, 2020
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Adapting partial code(file name start with S #2) to the sonar cloud rule (#2270)
上级
c706b21c
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
17 addition
and
34 deletion
+17
-34
dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/enums/StatusTest.java
...ava/org/apache/dolphinscheduler/api/enums/StatusTest.java
+1
-1
dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/spark/SparkParameters.java
...e/dolphinscheduler/common/task/spark/SparkParameters.java
+7
-3
dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/thread/Stopper.java
...va/org/apache/dolphinscheduler/common/thread/Stopper.java
+1
-1
dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/utils/StringTest.java
.../org/apache/dolphinscheduler/common/utils/StringTest.java
+0
-6
dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/SubProcessTaskExecThread.java
...eduler/server/master/runner/SubProcessTaskExecThread.java
+3
-3
dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/task/sql/SqlTask.java
...ache/dolphinscheduler/server/worker/task/sql/SqlTask.java
+4
-19
dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/worker/task/spark/SparkTaskTest.java
...phinscheduler/server/worker/task/spark/SparkTaskTest.java
+1
-1
未找到文件。
dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/enums/StatusTest.java
浏览文件 @
48d7612c
...
...
@@ -28,7 +28,7 @@ public class StatusTest {
@Test
public
void
testGetCode
()
{
assertEquals
(
Status
.
SUCCESS
.
getCode
(),
0
);
assertEquals
(
0
,
Status
.
SUCCESS
.
getCode
()
);
assertNotEquals
(
Status
.
REQUEST_PARAMS_NOT_VALID_ERROR
.
getCode
(),
0
);
}
...
...
dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/spark/SparkParameters.java
浏览文件 @
48d7612c
...
...
@@ -20,6 +20,7 @@ import org.apache.dolphinscheduler.common.enums.ProgramType;
import
org.apache.dolphinscheduler.common.process.ResourceInfo
;
import
org.apache.dolphinscheduler.common.task.AbstractParameters
;
import
java.util.Collections
;
import
java.util.List
;
import
java.util.stream.Collectors
;
...
...
@@ -222,11 +223,14 @@ public class SparkParameters extends AbstractParameters {
@Override
public
List
<
String
>
getResourceFilesList
()
{
if
(
resourceList
!=
null
)
{
this
.
resourceList
.
add
(
mainJar
);
return
resourceList
.
stream
()
List
<
String
>
resourceFilesList
=
resourceList
.
stream
()
.
map
(
ResourceInfo:
:
getRes
).
collect
(
Collectors
.
toList
());
if
(
mainJar
!=
null
){
resourceFilesList
.
add
(
mainJar
.
getRes
());
}
return
resourceFilesList
;
}
return
null
;
return
Collections
.
emptyList
()
;
}
...
...
dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/thread/Stopper.java
浏览文件 @
48d7612c
...
...
@@ -23,7 +23,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
*/
public
class
Stopper
{
private
static
volatile
AtomicBoolean
signal
=
new
AtomicBoolean
(
false
);
private
static
AtomicBoolean
signal
=
new
AtomicBoolean
(
false
);
public
static
final
boolean
isStopped
(){
return
signal
.
get
();
...
...
dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/utils/StringTest.java
浏览文件 @
48d7612c
...
...
@@ -24,12 +24,6 @@ import java.util.List;
public
class
StringTest
{
@Test
public
void
test1
(){
System
.
out
.
println
(
String
.
format
(
"%s_%010d_%010d"
,
String
.
valueOf
(
1
),
Long
.
valueOf
(
3
),
Integer
.
valueOf
(
4
)));
}
@Test
public
void
stringCompareTest
(){
...
...
dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/SubProcessTaskExecThread.java
浏览文件 @
48d7612c
...
...
@@ -95,7 +95,7 @@ public class SubProcessTaskExecThread extends MasterBaseTaskExecThread {
* set task instance state
* @return
*/
private
B
oolean
setTaskInstanceState
(){
private
b
oolean
setTaskInstanceState
(){
subProcessInstance
=
processService
.
findSubProcessInstance
(
processInstance
.
getId
(),
taskInstance
.
getId
());
if
(
subProcessInstance
==
null
||
taskInstance
.
getState
().
typeIsFinished
()){
return
false
;
...
...
@@ -131,8 +131,8 @@ public class SubProcessTaskExecThread extends MasterBaseTaskExecThread {
if
(
taskInstance
.
getState
().
typeIsFinished
())
{
logger
.
info
(
"sub work flow task {} already complete. task state:{}, parent work flow instance state:{}"
,
this
.
taskInstance
.
getName
(),
this
.
taskInstance
.
getState
()
.
toString
()
,
this
.
processInstance
.
getState
()
.
toString
()
);
this
.
taskInstance
.
getState
(),
this
.
processInstance
.
getState
());
return
;
}
while
(
Stopper
.
isRunning
())
{
...
...
dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/task/sql/SqlTask.java
浏览文件 @
48d7612c
...
...
@@ -378,7 +378,7 @@ public class SqlTask extends AbstractTask {
List
<
User
>
users
=
alertDao
.
queryUserByAlertGroupId
(
instance
.
getWarningGroupId
());
// receiving group list
List
<
String
>
receviersList
=
new
ArrayList
<
String
>();
List
<
String
>
receviersList
=
new
ArrayList
<>();
for
(
User
user:
users
){
receviersList
.
add
(
user
.
getEmail
().
trim
());
}
...
...
@@ -392,7 +392,7 @@ public class SqlTask extends AbstractTask {
}
// copy list
List
<
String
>
receviersCcList
=
new
ArrayList
<
String
>();
List
<
String
>
receviersCcList
=
new
ArrayList
<>();
// Custom Copier
String
receiversCc
=
sqlParameters
.
getReceiversCc
();
if
(
StringUtils
.
isNotEmpty
(
receiversCc
)){
...
...
@@ -406,7 +406,7 @@ public class SqlTask extends AbstractTask {
if
(
EnumUtils
.
isValidEnum
(
ShowType
.
class
,
showTypeName
)){
Map
<
String
,
Object
>
mailResult
=
MailUtils
.
sendMails
(
receviersList
,
receviersCcList
,
title
,
content
,
ShowType
.
valueOf
(
showTypeName
));
if
(!(
B
oolean
)
mailResult
.
get
(
STATUS
)){
if
(!(
b
oolean
)
mailResult
.
get
(
STATUS
)){
throw
new
RuntimeException
(
"send mail failed!"
);
}
}
else
{
...
...
@@ -463,22 +463,7 @@ public class SqlTask extends AbstractTask {
ProcessInstance
processInstance
=
processService
.
findProcessInstanceByTaskId
(
taskProps
.
getTaskInstId
());
int
userId
=
processInstance
.
getExecutorId
();
PermissionCheck
<
Integer
>
permissionCheckUdf
=
new
PermissionCheck
<
Integer
>(
AuthorizationType
.
UDF
,
processService
,
udfFunIds
,
userId
,
logger
);
PermissionCheck
<
Integer
>
permissionCheckUdf
=
new
PermissionCheck
<>(
AuthorizationType
.
UDF
,
processService
,
udfFunIds
,
userId
,
logger
);
permissionCheckUdf
.
checkPermission
();
}
/**
* check data source permission
* @param dataSourceId data source id
* @return if has download permission return true else false
*/
private
void
checkDataSourcePermission
(
int
dataSourceId
)
throws
Exception
{
// process instance
ProcessInstance
processInstance
=
processService
.
findProcessInstanceByTaskId
(
taskProps
.
getTaskInstId
());
int
userId
=
processInstance
.
getExecutorId
();
PermissionCheck
<
Integer
>
permissionCheckDataSource
=
new
PermissionCheck
<
Integer
>(
AuthorizationType
.
DATASOURCE
,
processService
,
new
Integer
[]{
dataSourceId
},
userId
,
logger
);
permissionCheckDataSource
.
checkPermission
();
}
}
dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/worker/task/spark/SparkTaskTest.java
浏览文件 @
48d7612c
...
...
@@ -135,7 +135,7 @@ public class SparkTaskTest {
logger
.
info
(
"spark task command : {}"
,
sparkArgs
);
Assert
.
assertEquals
(
sparkArgs
.
split
(
" "
)[
0
],
SPARK2_COMMAND
);
Assert
.
assertEquals
(
SPARK2_COMMAND
,
sparkArgs
.
split
(
" "
)[
0
]
);
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录