Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
pentaLiker
DolphinScheduler
提交
68e4e5c4
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,发现更多精彩内容 >>
未验证
提交
68e4e5c4
编写于
3月 12, 2020
作者:
Z
zhukai
提交者:
GitHub
3月 12, 2020
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
add input cache for sqoop and conditions tasks (#2118)
Co-authored-by:
N
zhukai
<
zhukai@ygsoft.com
>
上级
7473d5e9
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
96 addition
and
18 deletion
+96
-18
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/formModel.vue
...rc/js/conf/home/pages/dag/_source/formModel/formModel.vue
+10
-2
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/datasource.vue
.../pages/dag/_source/formModel/tasks/_source/datasource.vue
+7
-3
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/conditions.vue
...onf/home/pages/dag/_source/formModel/tasks/conditions.vue
+18
-3
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/sqoop.vue
.../js/conf/home/pages/dag/_source/formModel/tasks/sqoop.vue
+61
-10
未找到文件。
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/formModel.vue
浏览文件 @
68e4e5c4
...
...
@@ -252,6 +252,7 @@
v-if=
"taskType === 'CONDITIONS'"
ref=
"CONDITIONS"
@
on-dependent=
"_onDependent"
@
on-cache-dependent=
"_onCacheDependent"
:backfill-item=
"backfillItem"
:pre-node=
"preNode"
>
</m-conditions>
...
...
@@ -438,6 +439,8 @@
},
_cacheItem
()
{
this
.
conditionResult
.
successNode
[
0
]
=
this
.
successBranch
this
.
conditionResult
.
failedNode
[
0
]
=
this
.
failedBranch
this
.
$emit
(
'
cacheTaskInfo
'
,
{
item
:
{
type
:
this
.
taskType
,
...
...
@@ -446,12 +449,15 @@
params
:
this
.
params
,
description
:
this
.
description
,
runFlag
:
this
.
runFlag
,
conditionResult
:
this
.
conditionResult
,
dependence
:
this
.
cacheDependence
,
maxRetryTimes
:
this
.
maxRetryTimes
,
retryInterval
:
this
.
retryInterval
,
timeout
:
this
.
timeout
,
taskInstancePriority
:
this
.
taskInstancePriority
,
workerGroupId
:
this
.
workerGroupId
workerGroupId
:
this
.
workerGroupId
,
status
:
this
.
status
,
branch
:
this
.
branch
},
fromThis
:
this
})
...
...
@@ -657,7 +663,9 @@
retryInterval
:
this
.
retryInterval
,
timeout
:
this
.
timeout
,
taskInstancePriority
:
this
.
taskInstancePriority
,
workerGroupId
:
this
.
workerGroupId
workerGroupId
:
this
.
workerGroupId
,
successBranch
:
this
.
successBranch
,
failedBranch
:
this
.
failedBranch
}
}
},
...
...
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/datasource.vue
浏览文件 @
68e4e5c4
...
...
@@ -122,8 +122,11 @@
},
// Watch the cacheParams
watch
:
{
cacheParams
(
val
)
{
this
.
$emit
(
'
on-dsData
'
,
val
);
datasource
(
val
)
{
this
.
$emit
(
'
on-dsData
'
,
{
type
:
this
.
type
,
datasource
:
val
});
}
},
created
()
{
...
...
@@ -150,7 +153,8 @@
})
}
this
.
$emit
(
'
on-dsData
'
,
{
type
:
this
.
type
type
:
this
.
type
,
datasource
:
this
.
datasource
})
})
},
...
...
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/conditions.vue
浏览文件 @
68e4e5c4
...
...
@@ -19,7 +19,7 @@
<m-list-box>
<div
slot=
"text"
>
{{
$t
(
'
Custom Parameters
'
)
}}
</div>
<div
slot=
"content"
>
<div
class=
"dep-opt"
>
<div
class=
"dep-opt"
>
<a
href=
"javascript:"
@
click=
"!isDetails && _addDep()"
class=
"add-dep"
>
...
...
@@ -133,6 +133,9 @@
setTimeout
(()
=>
{
this
.
isLoading
=
false
},
600
)
},
cacheDependence
(
val
)
{
this
.
$emit
(
'
on-cache-dependent
'
,
val
)
}
},
beforeCreate
()
{
...
...
@@ -153,7 +156,19 @@
},
destroyed
()
{
},
computed
:
{},
computed
:
{
cacheDependence
()
{
return
{
relation
:
this
.
relation
,
dependTaskList
:
_
.
map
(
this
.
dependTaskList
,
v
=>
{
return
{
relation
:
v
.
relation
,
dependItemList
:
_
.
map
(
v
.
dependItemList
,
v1
=>
_
.
omit
(
v1
,
[
'
depTasksList
'
,
'
state
'
,
'
dateValueList
'
]))
}
})
}
}
},
components
:
{
mListBox
,
mNodeStatus
}
}
</
script
>
...
...
@@ -257,4 +272,4 @@
}
}
}
</
style
>
\ No newline at end of file
</
style
>
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/sqoop.vue
浏览文件 @
68e4e5c4
...
...
@@ -65,7 +65,7 @@
<m-datasource
ref=
"refSourceDs"
@
on-dsData=
"_onSourceDsData"
:data=
"
{ type:
'MYSQL',datasource:
srcDatasource }"
:data=
"
{ type:
sourceMysqlParams.srcType,datasource:sourceMysqlParams.
srcDatasource }"
>
</m-datasource>
</div>
...
...
@@ -186,8 +186,8 @@
<div
slot=
"content"
>
<div
class=
"from-mirror"
>
<textarea
id=
"code-sq
l
-mirror"
name=
"code-sq
l
-mirror"
id=
"code-sq
oop
-mirror"
name=
"code-sq
oop
-mirror"
style=
"opacity: 0;"
>
</textarea>
</div>
...
...
@@ -385,7 +385,7 @@
<m-datasource
ref=
"refTargetDs"
@
on-dsData=
"_onTargetDsData"
:data=
"{ type:t
ype,datasource:
targetDatasource }"
:data=
"{ type:t
argetMysqlParams.targetType,datasource:targetMysqlParams.
targetDatasource }"
>
</m-datasource>
</div>
...
...
@@ -556,7 +556,8 @@
targetType
:
"
HDFS
"
,
sourceMysqlParams
:{
srcDatasource
:
-
1
,
srcType
:
"
MYSQL
"
,
srcDatasource
:
""
,
srcTable
:
""
,
srcQueryType
:
"
1
"
,
srcQuerySql
:
''
,
...
...
@@ -588,7 +589,8 @@
},
targetMysqlParams
:{
targetDatasource
:
-
1
,
targetType
:
"
MYSQL
"
,
targetDatasource
:
""
,
targetTable
:
""
,
targetColumns
:
""
,
fieldsTerminated
:
""
,
...
...
@@ -680,6 +682,7 @@
* return data source
*/
_onSourceDsData
(
o
)
{
this
.
sourceMysqlParams
.
srcType
=
o
.
type
this
.
sourceMysqlParams
.
srcDatasource
=
o
.
datasource
},
...
...
@@ -687,6 +690,7 @@
* return data source
*/
_onTargetDsData
(
o
)
{
this
.
targetMysqlParams
.
targetType
=
o
.
type
this
.
targetMysqlParams
.
targetDatasource
=
o
.
datasource
},
...
...
@@ -697,7 +701,7 @@
var
params
=
null
switch
(
this
.
sourceType
){
case
"
MYSQL
"
:
this
.
sourceMysqlParams
.
srcQuerySql
=
editor
.
getValue
()
this
.
sourceMysqlParams
.
srcQuerySql
=
editor
?
editor
.
getValue
()
:
this
.
sourceMysqlParams
.
srcQuerySql
params
=
JSON
.
stringify
(
this
.
sourceMysqlParams
)
break
;
case
"
ORACLE
"
:
...
...
@@ -879,7 +883,9 @@
* Processing code highlighting
*/
_handlerEditor
()
{
editor
=
codemirror
(
'
code-sql-mirror
'
,
{
this
.
_destroyEditor
()
editor
=
codemirror
(
'
code-sqoop-mirror
'
,
{
mode
:
'
sql
'
,
readOnly
:
this
.
isDetails
})
...
...
@@ -892,9 +898,15 @@
}
}
this
.
changes
=
()
=>
{
this
.
_cacheParams
()
}
// Monitor keyboard
editor
.
on
(
'
keypress
'
,
this
.
keypress
)
editor
.
on
(
'
changes
'
,
this
.
changes
)
editor
.
setValue
(
this
.
sourceMysqlParams
.
srcQuerySql
)
return
editor
...
...
@@ -906,6 +918,27 @@
_onLocalParams
(
a
)
{
this
.
localParams
=
a
},
_cacheParams
()
{
this
.
$emit
(
'
on-cache-params
'
,
{
concurrency
:
this
.
concurrency
,
modelType
:
this
.
modelType
,
sourceType
:
this
.
sourceType
,
targetType
:
this
.
targetType
,
sourceParams
:
this
.
_handleSourceParams
(),
targetParams
:
this
.
_handleTargetParams
(),
localParams
:
this
.
localParams
});
},
_destroyEditor
()
{
if
(
editor
)
{
editor
.
toTextArea
()
// Uninstall
editor
.
off
(
$
(
'
.code-sqoop-mirror
'
),
'
keypress
'
,
this
.
keypress
)
editor
.
off
(
$
(
'
.code-sqoop-mirror
'
),
'
changes
'
,
this
.
changes
)
editor
=
null
}
},
},
watch
:
{
// Listening to sqlType
...
...
@@ -927,11 +960,12 @@
},
//Watch the cacheParams
cacheParams
(
val
)
{
this
.
$emit
(
'
on-cache-params
'
,
val
);
this
.
_cacheParams
()
}
},
created
()
{
this
.
_destroyEditor
()
let
o
=
this
.
backfillItem
// Non-null objects represent backfill
...
...
@@ -963,11 +997,28 @@
*/
if
(
editor
)
{
editor
.
toTextArea
()
// Uninstall
editor
.
off
(
$
(
'
.code-sql-mirror
'
),
'
keypress
'
,
this
.
keypress
)
editor
.
off
(
$
(
'
.code-sqoop-mirror
'
),
'
keypress
'
,
this
.
keypress
)
editor
.
off
(
$
(
'
.code-sqoop-mirror
'
),
'
changes
'
,
this
.
changes
)
editor
=
null
}
},
computed
:
{
cacheParams
()
{
return
{
concurrency
:
this
.
concurrency
,
modelType
:
this
.
modelType
,
sourceType
:
this
.
sourceType
,
targetType
:
this
.
targetType
,
localParams
:
this
.
localParams
,
sourceMysqlParams
:
this
.
sourceMysqlParams
,
sourceHdfsParams
:
this
.
sourceHdfsParams
,
sourceHiveParams
:
this
.
sourceHiveParams
,
targetHdfsParams
:
this
.
targetHdfsParams
,
targetMysqlParams
:
this
.
targetMysqlParams
,
targetHiveParams
:
this
.
targetHiveParams
}
}
},
components
:
{
mListBox
,
mDatasource
,
mLocalParams
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录