Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
pentaLiker
DolphinScheduler
提交
15a5b058
DolphinScheduler
项目概览
pentaLiker
/
DolphinScheduler
与 Fork 源项目一致
Fork自
apache / DolphinScheduler
通知
1
Star
1
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 搜索 >>
未验证
提交
15a5b058
编写于
2月 18, 2021
作者:
S
Shiwen Cheng
提交者:
GitHub
2月 18, 2021
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[Improvement-3369][api] Introduce executor and datasource service interface for clear code (#4759)
上级
9ae29a75
变更
10
展开全部
隐藏空白更改
内联
并排
Showing
10 changed file
with
1277 addition
and
1037 deletion
+1277
-1037
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/ExecutorController.java
...e/dolphinscheduler/api/controller/ExecutorController.java
+1
-2
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/ResourcesController.java
.../dolphinscheduler/api/controller/ResourcesController.java
+2
-6
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/DataSourceService.java
...pache/dolphinscheduler/api/service/DataSourceService.java
+16
-526
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ExecutorService.java
.../apache/dolphinscheduler/api/service/ExecutorService.java
+11
-498
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/DataSourceServiceImpl.java
...phinscheduler/api/service/impl/DataSourceServiceImpl.java
+660
-0
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ExecutorServiceImpl.java
...olphinscheduler/api/service/impl/ExecutorServiceImpl.java
+579
-0
dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/DataSourceServiceTest.java
...e/dolphinscheduler/api/service/DataSourceServiceTest.java
+2
-1
dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/ExecutorService2Test.java
...he/dolphinscheduler/api/service/ExecutorService2Test.java
+2
-1
dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/ExecutorServiceTest.java
...che/dolphinscheduler/api/service/ExecutorServiceTest.java
+2
-1
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
...ache/dolphinscheduler/service/process/ProcessService.java
+2
-2
未找到文件。
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/ExecutorController.java
浏览文件 @
15a5b058
...
...
@@ -35,7 +35,6 @@ import org.apache.dolphinscheduler.common.enums.WarningType;
import
org.apache.dolphinscheduler.common.utils.JSONUtils
;
import
org.apache.dolphinscheduler.dao.entity.User
;
import
java.text.ParseException
;
import
java.util.Map
;
import
org.slf4j.Logger
;
...
...
@@ -121,7 +120,7 @@ public class ExecutorController extends BaseController {
@RequestParam
(
value
=
"processInstancePriority"
,
required
=
false
)
Priority
processInstancePriority
,
@RequestParam
(
value
=
"workerGroup"
,
required
=
false
,
defaultValue
=
"default"
)
String
workerGroup
,
@RequestParam
(
value
=
"timeout"
,
required
=
false
)
Integer
timeout
,
@RequestParam
(
value
=
"startParams"
,
required
=
false
)
String
startParams
)
throws
ParseException
{
@RequestParam
(
value
=
"startParams"
,
required
=
false
)
String
startParams
)
{
logger
.
info
(
"login user {}, start process instance, project name: {}, process definition id: {}, schedule time: {}, "
+
"failure policy: {}, node name: {}, node dep: {}, notify type: {}, "
+
"notify group id: {}, run mode: {},process instance priority:{}, workerGroup: {}, timeout: {}, startParams: {} "
,
...
...
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/ResourcesController.java
浏览文件 @
15a5b058
...
...
@@ -322,9 +322,7 @@ public class ResourcesController extends BaseController {
@RequestParam
(
value
=
"programType"
,
required
=
false
)
ProgramType
programType
)
{
String
programTypeName
=
programType
==
null
?
""
:
programType
.
name
();
String
userName
=
loginUser
.
getUserName
();
userName
=
userName
.
replaceAll
(
"[\n|\r|\t]"
,
"_"
);
logger
.
info
(
"query resource list, login user:{}, resource type:{}, program type:{}"
,
userName
,
programTypeName
);
logger
.
info
(
"query resource list, resource type:{}, program type:{}"
,
type
,
programTypeName
);
Map
<
String
,
Object
>
result
=
resourceService
.
queryResourceByProgramType
(
loginUser
,
type
,
programType
);
return
returnDataList
(
result
);
}
...
...
@@ -641,9 +639,7 @@ public class ResourcesController extends BaseController {
@ApiException
(
QUERY_DATASOURCE_BY_TYPE_ERROR
)
public
Result
<
Object
>
queryUdfFuncList
(
@ApiIgnore
@RequestAttribute
(
value
=
Constants
.
SESSION_USER
)
User
loginUser
,
@RequestParam
(
"type"
)
UdfType
type
)
{
String
userName
=
loginUser
.
getUserName
();
userName
=
userName
.
replaceAll
(
"[\n|\r|\t]"
,
"_"
);
logger
.
info
(
"query udf func list, user:{}, type:{}"
,
userName
,
type
);
logger
.
info
(
"query udf func list, type:{}"
,
type
);
Map
<
String
,
Object
>
result
=
udfFuncService
.
queryUdfFuncList
(
loginUser
,
type
.
ordinal
());
return
returnDataList
(
result
);
}
...
...
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/DataSourceService.java
浏览文件 @
15a5b058
此差异已折叠。
点击以展开。
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ExecutorService.java
浏览文件 @
15a5b058
此差异已折叠。
点击以展开。
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/DataSourceServiceImpl.java
0 → 100644
浏览文件 @
15a5b058
此差异已折叠。
点击以展开。
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ExecutorServiceImpl.java
0 → 100644
浏览文件 @
15a5b058
此差异已折叠。
点击以展开。
dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/DataSourceServiceTest.java
浏览文件 @
15a5b058
...
...
@@ -18,6 +18,7 @@
package
org.apache.dolphinscheduler.api.service
;
import
org.apache.dolphinscheduler.api.enums.Status
;
import
org.apache.dolphinscheduler.api.service.impl.DataSourceServiceImpl
;
import
org.apache.dolphinscheduler.api.utils.Result
;
import
org.apache.dolphinscheduler.common.Constants
;
import
org.apache.dolphinscheduler.common.enums.DbConnectType
;
...
...
@@ -57,7 +58,7 @@ public class DataSourceServiceTest {
@InjectMocks
private
DataSourceService
dataSourceService
;
private
DataSourceService
Impl
dataSourceService
;
@Mock
private
DataSourceMapper
dataSourceMapper
;
@Mock
...
...
dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/ExecutorService2Test.java
浏览文件 @
15a5b058
...
...
@@ -22,6 +22,7 @@ import static org.mockito.Mockito.times;
import
static
org
.
mockito
.
Mockito
.
verify
;
import
org.apache.dolphinscheduler.api.enums.Status
;
import
org.apache.dolphinscheduler.api.service.impl.ExecutorServiceImpl
;
import
org.apache.dolphinscheduler.api.service.impl.ProjectServiceImpl
;
import
org.apache.dolphinscheduler.common.Constants
;
import
org.apache.dolphinscheduler.common.enums.CommandType
;
...
...
@@ -65,7 +66,7 @@ import org.mockito.junit.MockitoJUnitRunner;
public
class
ExecutorService2Test
{
@InjectMocks
private
ExecutorService
executorService
;
private
ExecutorService
Impl
executorService
;
@Mock
private
ProcessService
processService
;
...
...
dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/ExecutorServiceTest.java
浏览文件 @
15a5b058
...
...
@@ -18,6 +18,7 @@ package org.apache.dolphinscheduler.api.service;
import
org.apache.dolphinscheduler.api.ApiApplicationServer
;
import
org.apache.dolphinscheduler.api.enums.Status
;
import
org.apache.dolphinscheduler.api.service.impl.ExecutorServiceImpl
;
import
org.apache.dolphinscheduler.common.Constants
;
import
org.junit.Assert
;
import
org.junit.Ignore
;
...
...
@@ -39,7 +40,7 @@ public class ExecutorServiceTest {
private
static
final
Logger
logger
=
LoggerFactory
.
getLogger
(
ExecutorServiceTest
.
class
);
@Autowired
private
ExecutorService
executorService
;
private
ExecutorService
Impl
executorService
;
@Ignore
@Test
...
...
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
浏览文件 @
15a5b058
...
...
@@ -260,8 +260,8 @@ public class ProcessService {
* @param command command
* @return create command result
*/
public
B
oolean
verifyIsNeedCreateCommand
(
Command
command
)
{
B
oolean
isNeedCreate
=
true
;
public
b
oolean
verifyIsNeedCreateCommand
(
Command
command
)
{
b
oolean
isNeedCreate
=
true
;
EnumMap
<
CommandType
,
Integer
>
cmdTypeMap
=
new
EnumMap
<>(
CommandType
.
class
);
cmdTypeMap
.
put
(
CommandType
.
REPEAT_RUNNING
,
1
);
cmdTypeMap
.
put
(
CommandType
.
RECOVER_SUSPENDED_PROCESS
,
1
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录