Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
weixin_44739061
DolphinScheduler
提交
1ce97039
DolphinScheduler
项目概览
weixin_44739061
/
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,发现更多精彩内容 >>
提交
1ce97039
编写于
4月 23, 2019
作者:
B
baoliang
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
add worker group id in task instance
上级
12caae72
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
7 addition
and
0 deletion
+7
-0
escheduler-dao/src/main/java/cn/escheduler/dao/mapper/TaskInstanceMapper.java
...ain/java/cn/escheduler/dao/mapper/TaskInstanceMapper.java
+5
-0
escheduler-dao/src/main/java/cn/escheduler/dao/mapper/TaskInstanceMapperProvider.java
.../cn/escheduler/dao/mapper/TaskInstanceMapperProvider.java
+2
-0
未找到文件。
escheduler-dao/src/main/java/cn/escheduler/dao/mapper/TaskInstanceMapper.java
浏览文件 @
1ce97039
...
@@ -88,6 +88,7 @@ public interface TaskInstanceMapper {
...
@@ -88,6 +88,7 @@ public interface TaskInstanceMapper {
@Result
(
property
=
"appLink"
,
column
=
"app_link"
,
javaType
=
String
.
class
,
jdbcType
=
JdbcType
.
VARCHAR
),
@Result
(
property
=
"appLink"
,
column
=
"app_link"
,
javaType
=
String
.
class
,
jdbcType
=
JdbcType
.
VARCHAR
),
@Result
(
property
=
"duration"
,
column
=
"duration"
,
javaType
=
Long
.
class
,
jdbcType
=
JdbcType
.
BIGINT
),
@Result
(
property
=
"duration"
,
column
=
"duration"
,
javaType
=
Long
.
class
,
jdbcType
=
JdbcType
.
BIGINT
),
@Result
(
property
=
"flag"
,
column
=
"flag"
,
typeHandler
=
EnumOrdinalTypeHandler
.
class
,
javaType
=
Flag
.
class
,
jdbcType
=
JdbcType
.
TINYINT
),
@Result
(
property
=
"flag"
,
column
=
"flag"
,
typeHandler
=
EnumOrdinalTypeHandler
.
class
,
javaType
=
Flag
.
class
,
jdbcType
=
JdbcType
.
TINYINT
),
@Result
(
property
=
"workerGroupId"
,
column
=
"worker_group_id"
,
javaType
=
Integer
.
class
,
jdbcType
=
JdbcType
.
INTEGER
),
@Result
(
property
=
"taskInstancePriority"
,
column
=
"task_instance_priority"
,
javaType
=
Priority
.
class
,
typeHandler
=
EnumOrdinalTypeHandler
.
class
,
jdbcType
=
JdbcType
.
TINYINT
)
@Result
(
property
=
"taskInstancePriority"
,
column
=
"task_instance_priority"
,
javaType
=
Priority
.
class
,
typeHandler
=
EnumOrdinalTypeHandler
.
class
,
jdbcType
=
JdbcType
.
TINYINT
)
})
})
@SelectProvider
(
type
=
TaskInstanceMapperProvider
.
class
,
method
=
"queryById"
)
@SelectProvider
(
type
=
TaskInstanceMapperProvider
.
class
,
method
=
"queryById"
)
...
@@ -131,6 +132,7 @@ public interface TaskInstanceMapper {
...
@@ -131,6 +132,7 @@ public interface TaskInstanceMapper {
@Result
(
property
=
"appLink"
,
column
=
"app_link"
,
javaType
=
String
.
class
,
jdbcType
=
JdbcType
.
VARCHAR
),
@Result
(
property
=
"appLink"
,
column
=
"app_link"
,
javaType
=
String
.
class
,
jdbcType
=
JdbcType
.
VARCHAR
),
@Result
(
property
=
"duration"
,
column
=
"duration"
,
javaType
=
Long
.
class
,
jdbcType
=
JdbcType
.
BIGINT
),
@Result
(
property
=
"duration"
,
column
=
"duration"
,
javaType
=
Long
.
class
,
jdbcType
=
JdbcType
.
BIGINT
),
@Result
(
property
=
"flag"
,
column
=
"flag"
,
typeHandler
=
EnumOrdinalTypeHandler
.
class
,
javaType
=
Flag
.
class
,
jdbcType
=
JdbcType
.
TINYINT
),
@Result
(
property
=
"flag"
,
column
=
"flag"
,
typeHandler
=
EnumOrdinalTypeHandler
.
class
,
javaType
=
Flag
.
class
,
jdbcType
=
JdbcType
.
TINYINT
),
@Result
(
property
=
"workerGroupId"
,
column
=
"worker_group_id"
,
javaType
=
Integer
.
class
,
jdbcType
=
JdbcType
.
INTEGER
),
@Result
(
property
=
"taskInstancePriority"
,
column
=
"task_instance_priority"
,
javaType
=
Priority
.
class
,
typeHandler
=
EnumOrdinalTypeHandler
.
class
,
jdbcType
=
JdbcType
.
TINYINT
)
@Result
(
property
=
"taskInstancePriority"
,
column
=
"task_instance_priority"
,
javaType
=
Priority
.
class
,
typeHandler
=
EnumOrdinalTypeHandler
.
class
,
jdbcType
=
JdbcType
.
TINYINT
)
})
})
@SelectProvider
(
type
=
TaskInstanceMapperProvider
.
class
,
method
=
"findValidTaskListByProcessId"
)
@SelectProvider
(
type
=
TaskInstanceMapperProvider
.
class
,
method
=
"findValidTaskListByProcessId"
)
...
@@ -164,6 +166,7 @@ public interface TaskInstanceMapper {
...
@@ -164,6 +166,7 @@ public interface TaskInstanceMapper {
@Result
(
property
=
"appLink"
,
column
=
"app_link"
,
javaType
=
String
.
class
,
jdbcType
=
JdbcType
.
VARCHAR
),
@Result
(
property
=
"appLink"
,
column
=
"app_link"
,
javaType
=
String
.
class
,
jdbcType
=
JdbcType
.
VARCHAR
),
@Result
(
property
=
"duration"
,
column
=
"duration"
,
javaType
=
Long
.
class
,
jdbcType
=
JdbcType
.
BIGINT
),
@Result
(
property
=
"duration"
,
column
=
"duration"
,
javaType
=
Long
.
class
,
jdbcType
=
JdbcType
.
BIGINT
),
@Result
(
property
=
"flag"
,
column
=
"flag"
,
typeHandler
=
EnumOrdinalTypeHandler
.
class
,
javaType
=
Flag
.
class
,
jdbcType
=
JdbcType
.
TINYINT
),
@Result
(
property
=
"flag"
,
column
=
"flag"
,
typeHandler
=
EnumOrdinalTypeHandler
.
class
,
javaType
=
Flag
.
class
,
jdbcType
=
JdbcType
.
TINYINT
),
@Result
(
property
=
"workerGroupId"
,
column
=
"worker_group_id"
,
javaType
=
Integer
.
class
,
jdbcType
=
JdbcType
.
INTEGER
),
@Result
(
property
=
"taskInstancePriority"
,
column
=
"task_instance_priority"
,
javaType
=
Priority
.
class
,
typeHandler
=
EnumOrdinalTypeHandler
.
class
,
jdbcType
=
JdbcType
.
TINYINT
)
@Result
(
property
=
"taskInstancePriority"
,
column
=
"task_instance_priority"
,
javaType
=
Priority
.
class
,
typeHandler
=
EnumOrdinalTypeHandler
.
class
,
jdbcType
=
JdbcType
.
TINYINT
)
})
})
@SelectProvider
(
type
=
TaskInstanceMapperProvider
.
class
,
method
=
"queryByHostAndStatus"
)
@SelectProvider
(
type
=
TaskInstanceMapperProvider
.
class
,
method
=
"queryByHostAndStatus"
)
...
@@ -255,6 +258,7 @@ public interface TaskInstanceMapper {
...
@@ -255,6 +258,7 @@ public interface TaskInstanceMapper {
@Result
(
property
=
"appLink"
,
column
=
"app_link"
,
javaType
=
String
.
class
,
jdbcType
=
JdbcType
.
VARCHAR
),
@Result
(
property
=
"appLink"
,
column
=
"app_link"
,
javaType
=
String
.
class
,
jdbcType
=
JdbcType
.
VARCHAR
),
@Result
(
property
=
"duration"
,
column
=
"duration"
,
javaType
=
Long
.
class
,
jdbcType
=
JdbcType
.
BIGINT
),
@Result
(
property
=
"duration"
,
column
=
"duration"
,
javaType
=
Long
.
class
,
jdbcType
=
JdbcType
.
BIGINT
),
@Result
(
property
=
"flag"
,
column
=
"flag"
,
typeHandler
=
EnumOrdinalTypeHandler
.
class
,
javaType
=
Flag
.
class
,
jdbcType
=
JdbcType
.
TINYINT
),
@Result
(
property
=
"flag"
,
column
=
"flag"
,
typeHandler
=
EnumOrdinalTypeHandler
.
class
,
javaType
=
Flag
.
class
,
jdbcType
=
JdbcType
.
TINYINT
),
@Result
(
property
=
"workerGroupId"
,
column
=
"worker_group_id"
,
javaType
=
Integer
.
class
,
jdbcType
=
JdbcType
.
INTEGER
),
@Result
(
property
=
"taskInstancePriority"
,
column
=
"task_instance_priority"
,
javaType
=
Priority
.
class
,
typeHandler
=
EnumOrdinalTypeHandler
.
class
,
jdbcType
=
JdbcType
.
TINYINT
)
@Result
(
property
=
"taskInstancePriority"
,
column
=
"task_instance_priority"
,
javaType
=
Priority
.
class
,
typeHandler
=
EnumOrdinalTypeHandler
.
class
,
jdbcType
=
JdbcType
.
TINYINT
)
})
})
@SelectProvider
(
type
=
TaskInstanceMapperProvider
.
class
,
method
=
"queryTaskInstanceListPaging"
)
@SelectProvider
(
type
=
TaskInstanceMapperProvider
.
class
,
method
=
"queryTaskInstanceListPaging"
)
...
@@ -299,6 +303,7 @@ public interface TaskInstanceMapper {
...
@@ -299,6 +303,7 @@ public interface TaskInstanceMapper {
@Result
(
property
=
"appLink"
,
column
=
"app_link"
,
javaType
=
String
.
class
,
jdbcType
=
JdbcType
.
VARCHAR
),
@Result
(
property
=
"appLink"
,
column
=
"app_link"
,
javaType
=
String
.
class
,
jdbcType
=
JdbcType
.
VARCHAR
),
@Result
(
property
=
"duration"
,
column
=
"duration"
,
javaType
=
Long
.
class
,
jdbcType
=
JdbcType
.
BIGINT
),
@Result
(
property
=
"duration"
,
column
=
"duration"
,
javaType
=
Long
.
class
,
jdbcType
=
JdbcType
.
BIGINT
),
@Result
(
property
=
"flag"
,
column
=
"flag"
,
typeHandler
=
EnumOrdinalTypeHandler
.
class
,
javaType
=
Flag
.
class
,
jdbcType
=
JdbcType
.
TINYINT
),
@Result
(
property
=
"flag"
,
column
=
"flag"
,
typeHandler
=
EnumOrdinalTypeHandler
.
class
,
javaType
=
Flag
.
class
,
jdbcType
=
JdbcType
.
TINYINT
),
@Result
(
property
=
"workerGroupId"
,
column
=
"worker_group_id"
,
javaType
=
Integer
.
class
,
jdbcType
=
JdbcType
.
INTEGER
),
@Result
(
property
=
"taskInstancePriority"
,
column
=
"task_instance_priority"
,
javaType
=
Priority
.
class
,
typeHandler
=
EnumOrdinalTypeHandler
.
class
,
jdbcType
=
JdbcType
.
TINYINT
)
@Result
(
property
=
"taskInstancePriority"
,
column
=
"task_instance_priority"
,
javaType
=
Priority
.
class
,
typeHandler
=
EnumOrdinalTypeHandler
.
class
,
jdbcType
=
JdbcType
.
TINYINT
)
})
})
@SelectProvider
(
type
=
TaskInstanceMapperProvider
.
class
,
method
=
"queryByInstanceIdAndName"
)
@SelectProvider
(
type
=
TaskInstanceMapperProvider
.
class
,
method
=
"queryByInstanceIdAndName"
)
...
...
escheduler-dao/src/main/java/cn/escheduler/dao/mapper/TaskInstanceMapperProvider.java
浏览文件 @
1ce97039
...
@@ -62,6 +62,7 @@ public class TaskInstanceMapperProvider {
...
@@ -62,6 +62,7 @@ public class TaskInstanceMapperProvider {
VALUES
(
"`max_retry_times`"
,
"#{taskInstance.maxRetryTimes}"
);
VALUES
(
"`max_retry_times`"
,
"#{taskInstance.maxRetryTimes}"
);
VALUES
(
"`retry_interval`"
,
"#{taskInstance.retryInterval}"
);
VALUES
(
"`retry_interval`"
,
"#{taskInstance.retryInterval}"
);
VALUES
(
"`app_link`"
,
"#{taskInstance.appLink}"
);
VALUES
(
"`app_link`"
,
"#{taskInstance.appLink}"
);
VALUES
(
"`worker_group_id`"
,
"#{taskInstance.workerGroupId}"
);
VALUES
(
"`flag`"
,
EnumFieldUtil
.
genFieldStr
(
"taskInstance.flag"
,
Flag
.
class
));
VALUES
(
"`flag`"
,
EnumFieldUtil
.
genFieldStr
(
"taskInstance.flag"
,
Flag
.
class
));
VALUES
(
"`task_instance_priority`"
,
EnumFieldUtil
.
genFieldStr
(
"taskInstance.taskInstancePriority"
,
Priority
.
class
));
VALUES
(
"`task_instance_priority`"
,
EnumFieldUtil
.
genFieldStr
(
"taskInstance.taskInstancePriority"
,
Priority
.
class
));
...
@@ -114,6 +115,7 @@ public class TaskInstanceMapperProvider {
...
@@ -114,6 +115,7 @@ public class TaskInstanceMapperProvider {
SET
(
"`max_retry_times`=#{taskInstance.maxRetryTimes}"
);
SET
(
"`max_retry_times`=#{taskInstance.maxRetryTimes}"
);
SET
(
"`retry_interval`=#{taskInstance.retryInterval}"
);
SET
(
"`retry_interval`=#{taskInstance.retryInterval}"
);
SET
(
"`app_link`=#{taskInstance.appLink}"
);
SET
(
"`app_link`=#{taskInstance.appLink}"
);
SET
(
"`worker_group_id`=#{taskInstance.workerGroupId}"
);
SET
(
"`flag`="
+
EnumFieldUtil
.
genFieldStr
(
"taskInstance.flag"
,
Flag
.
class
));
SET
(
"`flag`="
+
EnumFieldUtil
.
genFieldStr
(
"taskInstance.flag"
,
Flag
.
class
));
SET
(
"`task_instance_priority`="
+
EnumFieldUtil
.
genFieldStr
(
"taskInstance.taskInstancePriority"
,
Priority
.
class
));
SET
(
"`task_instance_priority`="
+
EnumFieldUtil
.
genFieldStr
(
"taskInstance.taskInstancePriority"
,
Priority
.
class
));
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录