Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
D
dlink
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
zhaowei
dlink
Commits
c03d16bd
Commit
c03d16bd
authored
Mar 17, 2022
by
wenmo
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
功能优化
parent
27fb0a75
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
18 additions
and
5 deletions
+18
-5
README.md
README.md
+1
-0
Job2MysqlHandler.java
...k-admin/src/main/java/com/dlink/job/Job2MysqlHandler.java
+2
-1
package.xml
dlink-assembly/src/main/assembly/package.xml
+8
-0
Executor.java
...k-executor/src/main/java/com/dlink/executor/Executor.java
+4
-4
Welcome.tsx
dlink-web/src/pages/Welcome.tsx
+3
-0
No files found.
README.md
View file @
c03d16bd
...
@@ -118,6 +118,7 @@ Dinky(原 Dlink):
...
@@ -118,6 +118,7 @@ Dinky(原 Dlink):
| | | 新增 Doris 数据源注册及测试 | 0.6.0 |
| | | 新增 Doris 数据源注册及测试 | 0.6.0 |
| | | 新增 Phoenix 数据源注册及测试 | 0.6.0 |
| | | 新增 Phoenix 数据源注册及测试 | 0.6.0 |
| | | 新增 SqlServer 数据源注册及测试 | 0.6.0 |
| | | 新增 SqlServer 数据源注册及测试 | 0.6.0 |
| | | 新增 Hive 数据源注册及测试 | 0.6.0 |
| | 报警实例管理 | 新增 钉钉报警 | 0.6.0 |
| | 报警实例管理 | 新增 钉钉报警 | 0.6.0 |
| | | 新增 微信企业号报警 | 0.6.0 |
| | | 新增 微信企业号报警 | 0.6.0 |
| | 报警组管理 | 新增 报警组管理 | 0.6.0 |
| | 报警组管理 | 新增 报警组管理 | 0.6.0 |
...
...
dlink-admin/src/main/java/com/dlink/job/Job2MysqlHandler.java
View file @
c03d16bd
...
@@ -4,6 +4,7 @@ import com.dlink.assertion.Asserts;
...
@@ -4,6 +4,7 @@ import com.dlink.assertion.Asserts;
import
com.dlink.context.SpringContextUtils
;
import
com.dlink.context.SpringContextUtils
;
import
com.dlink.daemon.task.DaemonFactory
;
import
com.dlink.daemon.task.DaemonFactory
;
import
com.dlink.daemon.task.DaemonTaskConfig
;
import
com.dlink.daemon.task.DaemonTaskConfig
;
import
com.dlink.gateway.GatewayType
;
import
com.dlink.model.*
;
import
com.dlink.model.*
;
import
com.dlink.service.*
;
import
com.dlink.service.*
;
import
com.dlink.utils.JSONUtil
;
import
com.dlink.utils.JSONUtil
;
...
@@ -114,7 +115,7 @@ public class Job2MysqlHandler implements JobHandler {
...
@@ -114,7 +115,7 @@ public class Job2MysqlHandler implements JobHandler {
if
(
Asserts
.
isNotNull
(
job
.
getJobConfig
().
getJarId
()))
{
if
(
Asserts
.
isNotNull
(
job
.
getJobConfig
().
getJarId
()))
{
jar
=
jarService
.
getById
(
job
.
getJobConfig
().
getJarId
());
jar
=
jarService
.
getById
(
job
.
getJobConfig
().
getJarId
());
}
}
if
(
Asserts
.
isNotNullCollection
(
job
.
getJids
()))
{
if
(
Asserts
.
isNotNullCollection
(
job
.
getJids
())
&&
!
GatewayType
.
LOCAL
.
equalsValue
(
job
.
getJobConfig
().
getType
())
)
{
for
(
String
jid
:
job
.
getJids
())
{
for
(
String
jid
:
job
.
getJids
())
{
JobInstance
jobInstance
=
history
.
buildJobInstance
();
JobInstance
jobInstance
=
history
.
buildJobInstance
();
jobInstance
.
setHistoryId
(
job
.
getId
());
jobInstance
.
setHistoryId
(
job
.
getId
());
...
...
dlink-assembly/src/main/assembly/package.xml
View file @
c03d16bd
...
@@ -158,6 +158,14 @@
...
@@ -158,6 +158,14 @@
<include>
dlink-metadata-doris-${project.version}.jar
</include>
<include>
dlink-metadata-doris-${project.version}.jar
</include>
</includes>
</includes>
</fileSet>
</fileSet>
<fileSet>
<directory>
${project.parent.basedir}/dlink-metadata/dlink-metadata-phoenix/target
</directory>
<outputDirectory>
lib
</outputDirectory>
<includes>
<include>
dlink-metadata-phoenix-${project.version}.jar
</include>
</includes>
</fileSet>
<fileSet>
<fileSet>
<directory>
${project.parent.basedir}/dlink-alert/dlink-alert-dingtalk/target
<directory>
${project.parent.basedir}/dlink-alert/dlink-alert-dingtalk/target
</directory>
</directory>
...
...
dlink-executor/src/main/java/com/dlink/executor/Executor.java
View file @
c03d16bd
...
@@ -127,9 +127,9 @@ public abstract class Executor {
...
@@ -127,9 +127,9 @@ public abstract class Executor {
}
}
public
void
initEnvironment
()
{
public
void
initEnvironment
()
{
if
(
executorSetting
.
getCheckpoint
()
!=
null
&&
executorSetting
.
getCheckpoint
()
>
0
)
{
/*
if (executorSetting.getCheckpoint() != null && executorSetting.getCheckpoint() > 0) {
environment.enableCheckpointing(executorSetting.getCheckpoint());
environment.enableCheckpointing(executorSetting.getCheckpoint());
}
}
*/
if
(
executorSetting
.
getParallelism
()
!=
null
&&
executorSetting
.
getParallelism
()
>
0
)
{
if
(
executorSetting
.
getParallelism
()
!=
null
&&
executorSetting
.
getParallelism
()
>
0
)
{
environment
.
setParallelism
(
executorSetting
.
getParallelism
());
environment
.
setParallelism
(
executorSetting
.
getParallelism
());
}
}
...
@@ -140,9 +140,9 @@ public abstract class Executor {
...
@@ -140,9 +140,9 @@ public abstract class Executor {
}
}
public
void
updateEnvironment
(
ExecutorSetting
executorSetting
)
{
public
void
updateEnvironment
(
ExecutorSetting
executorSetting
)
{
if
(
executorSetting
.
getCheckpoint
()
!=
null
&&
executorSetting
.
getCheckpoint
()
>
0
)
{
/*
if (executorSetting.getCheckpoint() != null && executorSetting.getCheckpoint() > 0) {
environment.enableCheckpointing(executorSetting.getCheckpoint());
environment.enableCheckpointing(executorSetting.getCheckpoint());
}
}
*/
if
(
executorSetting
.
getParallelism
()
!=
null
&&
executorSetting
.
getParallelism
()
>
0
)
{
if
(
executorSetting
.
getParallelism
()
!=
null
&&
executorSetting
.
getParallelism
()
>
0
)
{
environment
.
setParallelism
(
executorSetting
.
getParallelism
());
environment
.
setParallelism
(
executorSetting
.
getParallelism
());
}
}
...
...
dlink-web/src/pages/Welcome.tsx
View file @
c03d16bd
...
@@ -770,6 +770,9 @@ export default (): React.ReactNode => {
...
@@ -770,6 +770,9 @@ export default (): React.ReactNode => {
<
li
>
<
li
>
<
Link
>
优化 Studio血缘分析为字段级
</
Link
>
<
Link
>
优化 Studio血缘分析为字段级
</
Link
>
</
li
>
</
li
>
<
li
>
<
Link
>
新增 Hive 数据源注册、元数据、查询和执行
</
Link
>
</
li
>
</
ul
>
</
ul
>
</
Paragraph
>
</
Paragraph
>
</
Timeline
.
Item
>
</
Timeline
.
Item
>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment