Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
liyuanzhong001
DolphinScheduler
提交
289ae6ac
DolphinScheduler
项目概览
liyuanzhong001
/
DolphinScheduler
与 Fork 源项目一致
Fork自
apache / DolphinScheduler
通知
11
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,发现更多精彩内容 >>
提交
289ae6ac
编写于
1月 13, 2020
作者:
Z
zhukai
提交者:
qiaozhanwei
1月 13, 2020
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Implements the spark and flink type task, now they can be cache the previous input. (#1795)
上级
24f362de
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
82 addition
and
0 deletion
+82
-0
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/formModel.vue
...rc/js/conf/home/pages/dag/_source/formModel/formModel.vue
+4
-0
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/resources.vue
...e/pages/dag/_source/formModel/tasks/_source/resources.vue
+7
-0
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/flink.vue
.../js/conf/home/pages/dag/_source/formModel/tasks/flink.vue
+35
-0
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/spark.vue
.../js/conf/home/pages/dag/_source/formModel/tasks/spark.vue
+36
-0
未找到文件。
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/formModel.vue
浏览文件 @
289ae6ac
...
@@ -152,12 +152,14 @@
...
@@ -152,12 +152,14 @@
<m-spark
<m-spark
v-if=
"taskType === 'SPARK'"
v-if=
"taskType === 'SPARK'"
@
on-params=
"_onParams"
@
on-params=
"_onParams"
@
on-cache-params=
"_onCacheParams"
ref=
"SPARK"
ref=
"SPARK"
:backfill-item=
"backfillItem"
>
:backfill-item=
"backfillItem"
>
</m-spark>
</m-spark>
<m-flink
<m-flink
v-if=
"taskType === 'FLINK'"
v-if=
"taskType === 'FLINK'"
@
on-params=
"_onParams"
@
on-params=
"_onParams"
@
on-cache-params=
"_onCacheParams"
ref=
"FLINK"
ref=
"FLINK"
:backfill-item=
"backfillItem"
>
:backfill-item=
"backfillItem"
>
</m-flink>
</m-flink>
...
@@ -511,6 +513,8 @@
...
@@ -511,6 +513,8 @@
this
.
workerGroupId
=
o
.
workerGroupId
this
.
workerGroupId
=
o
.
workerGroupId
}
}
this
.
params
=
o
.
params
||
{};
}
}
this
.
isContentBox
=
true
this
.
isContentBox
=
true
},
},
...
...
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/resources.vue
浏览文件 @
289ae6ac
...
@@ -66,6 +66,13 @@
...
@@ -66,6 +66,13 @@
// Listening data source
// Listening data source
resourceList
(
a
)
{
resourceList
(
a
)
{
this
.
value
=
_
.
map
(
_
.
cloneDeep
(
a
),
v
=>
v
.
res
)
this
.
value
=
_
.
map
(
_
.
cloneDeep
(
a
),
v
=>
v
.
res
)
},
value
(
val
)
{
this
.
$emit
(
'
on-cache-resourcesData
'
,
_
.
map
(
val
,
v
=>
{
return
{
res
:
v
}
}))
}
}
},
},
created
()
{
created
()
{
...
...
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/flink.vue
浏览文件 @
289ae6ac
...
@@ -154,6 +154,7 @@
...
@@ -154,6 +154,7 @@
<m-resources
<m-resources
ref=
"refResources"
ref=
"refResources"
@
on-resourcesData=
"_onResourcesData"
@
on-resourcesData=
"_onResourcesData"
@
on-cache-resourcesData=
"_onCacheResourcesData"
:resource-list=
"resourceList"
>
:resource-list=
"resourceList"
>
</m-resources>
</m-resources>
</div>
</div>
...
@@ -193,6 +194,8 @@
...
@@ -193,6 +194,8 @@
deployMode
:
'
cluster
'
,
deployMode
:
'
cluster
'
,
// Resource(list)
// Resource(list)
resourceList
:
[],
resourceList
:
[],
// Cache ResourceList
cacheResourceList
:
[],
// Custom function
// Custom function
localParams
:
[],
localParams
:
[],
// Driver Number of cores
// Driver Number of cores
...
@@ -232,6 +235,12 @@
...
@@ -232,6 +235,12 @@
_onResourcesData
(
a
)
{
_onResourcesData
(
a
)
{
this
.
resourceList
=
a
this
.
resourceList
=
a
},
},
/**
* cache resourceList
*/
_onCacheResourcesData
(
a
)
{
this
.
cacheResourceList
=
a
},
/**
/**
* verification
* verification
*/
*/
...
@@ -336,6 +345,31 @@
...
@@ -336,6 +345,31 @@
if
(
type
===
'
PYTHON
'
)
{
if
(
type
===
'
PYTHON
'
)
{
this
.
mainClass
=
''
this
.
mainClass
=
''
}
}
},
//Watch the cacheParams
cacheParams
(
val
)
{
this
.
$emit
(
'
on-cache-params
'
,
val
);
}
},
computed
:
{
cacheParams
()
{
return
{
mainClass
:
this
.
mainClass
,
mainJar
:
{
res
:
this
.
mainJar
},
deployMode
:
this
.
deployMode
,
resourceList
:
this
.
cacheResourceList
,
localParams
:
this
.
localParams
,
slot
:
this
.
slot
,
taskManager
:
this
.
taskManager
,
jobManagerMemory
:
this
.
jobManagerMemory
,
taskManagerMemory
:
this
.
taskManagerMemory
,
executorCores
:
this
.
executorCores
,
mainArgs
:
this
.
mainArgs
,
others
:
this
.
others
,
programType
:
this
.
programType
}
}
}
},
},
created
()
{
created
()
{
...
@@ -360,6 +394,7 @@
...
@@ -360,6 +394,7 @@
let
resourceList
=
o
.
params
.
resourceList
||
[]
let
resourceList
=
o
.
params
.
resourceList
||
[]
if
(
resourceList
.
length
)
{
if
(
resourceList
.
length
)
{
this
.
resourceList
=
resourceList
this
.
resourceList
=
resourceList
this
.
cacheResourceList
=
resourceList
}
}
// backfill localParams
// backfill localParams
...
...
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/spark.vue
浏览文件 @
289ae6ac
...
@@ -182,6 +182,7 @@
...
@@ -182,6 +182,7 @@
<m-resources
<m-resources
ref=
"refResources"
ref=
"refResources"
@
on-resourcesData=
"_onResourcesData"
@
on-resourcesData=
"_onResourcesData"
@
on-cache-resourcesData=
"_onCacheResourcesData"
:resource-list=
"resourceList"
>
:resource-list=
"resourceList"
>
</m-resources>
</m-resources>
</div>
</div>
...
@@ -221,6 +222,8 @@
...
@@ -221,6 +222,8 @@
deployMode
:
'
cluster
'
,
deployMode
:
'
cluster
'
,
// Resource(list)
// Resource(list)
resourceList
:
[],
resourceList
:
[],
// Cache ResourceList
cacheResourceList
:
[],
// Custom function
// Custom function
localParams
:
[],
localParams
:
[],
// Driver Number of cores
// Driver Number of cores
...
@@ -264,6 +267,12 @@
...
@@ -264,6 +267,12 @@
_onResourcesData
(
a
)
{
_onResourcesData
(
a
)
{
this
.
resourceList
=
a
this
.
resourceList
=
a
},
},
/**
* cache resourceList
*/
_onCacheResourcesData
(
a
)
{
this
.
cacheResourceList
=
a
},
/**
/**
* verification
* verification
*/
*/
...
@@ -368,6 +377,32 @@
...
@@ -368,6 +377,32 @@
if
(
type
===
'
PYTHON
'
)
{
if
(
type
===
'
PYTHON
'
)
{
this
.
mainClass
=
''
this
.
mainClass
=
''
}
}
},
//Watch the cacheParams
cacheParams
(
val
)
{
this
.
$emit
(
'
on-cache-params
'
,
val
)
}
},
computed
:
{
cacheParams
()
{
return
{
mainClass
:
this
.
mainClass
,
mainJar
:
{
res
:
this
.
mainJar
},
deployMode
:
this
.
deployMode
,
resourceList
:
this
.
cacheResourceList
,
localParams
:
this
.
localParams
,
driverCores
:
this
.
driverCores
,
driverMemory
:
this
.
driverMemory
,
numExecutors
:
this
.
numExecutors
,
executorMemory
:
this
.
executorMemory
,
executorCores
:
this
.
executorCores
,
mainArgs
:
this
.
mainArgs
,
others
:
this
.
others
,
programType
:
this
.
programType
,
sparkVersion
:
this
.
sparkVersion
}
}
}
},
},
created
()
{
created
()
{
...
@@ -393,6 +428,7 @@
...
@@ -393,6 +428,7 @@
let
resourceList
=
o
.
params
.
resourceList
||
[]
let
resourceList
=
o
.
params
.
resourceList
||
[]
if
(
resourceList
.
length
)
{
if
(
resourceList
.
length
)
{
this
.
resourceList
=
resourceList
this
.
resourceList
=
resourceList
this
.
cacheResourceList
=
resourceList
}
}
// backfill localParams
// backfill localParams
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录