Commit c1ce6abb authored by wenmo's avatar wenmo

任务提交成功后保存多任务实例

parent a0e43a64
...@@ -3,11 +3,13 @@ package com.dlink.job; ...@@ -3,11 +3,13 @@ package com.dlink.job;
import cn.hutool.json.JSONUtil; import cn.hutool.json.JSONUtil;
import com.dlink.assertion.Asserts; import com.dlink.assertion.Asserts;
import com.dlink.context.SpringContextUtils; import com.dlink.context.SpringContextUtils;
import com.dlink.gateway.GatewayType;
import com.dlink.model.Cluster; import com.dlink.model.Cluster;
import com.dlink.model.History; import com.dlink.model.History;
import com.dlink.model.JobInstance;
import com.dlink.model.JobStatus;
import com.dlink.service.ClusterService; import com.dlink.service.ClusterService;
import com.dlink.service.HistoryService; import com.dlink.service.HistoryService;
import com.dlink.service.JobInstanceService;
import org.springframework.context.annotation.DependsOn; import org.springframework.context.annotation.DependsOn;
import java.time.LocalDateTime; import java.time.LocalDateTime;
...@@ -23,10 +25,12 @@ public class Job2MysqlHandler implements JobHandler { ...@@ -23,10 +25,12 @@ public class Job2MysqlHandler implements JobHandler {
private static HistoryService historyService; private static HistoryService historyService;
private static ClusterService clusterService; private static ClusterService clusterService;
private static JobInstanceService jobInstanceService;
static { static {
historyService = SpringContextUtils.getBean("historyServiceImpl",HistoryService.class); historyService = SpringContextUtils.getBean("historyServiceImpl", HistoryService.class);
clusterService = SpringContextUtils.getBean("clusterServiceImpl",ClusterService.class); clusterService = SpringContextUtils.getBean("clusterServiceImpl", ClusterService.class);
jobInstanceService = SpringContextUtils.getBean("jobInstanceServiceImpl", JobInstanceService.class);
} }
@Override @Override
...@@ -34,9 +38,9 @@ public class Job2MysqlHandler implements JobHandler { ...@@ -34,9 +38,9 @@ public class Job2MysqlHandler implements JobHandler {
Job job = JobContextHolder.getJob(); Job job = JobContextHolder.getJob();
History history = new History(); History history = new History();
history.setType(job.getType().getLongValue()); history.setType(job.getType().getLongValue());
if(job.isUseGateway()) { if (job.isUseGateway()) {
history.setClusterConfigurationId(job.getJobConfig().getClusterConfigurationId()); history.setClusterConfigurationId(job.getJobConfig().getClusterConfigurationId());
}else{ } else {
history.setClusterId(job.getJobConfig().getClusterId()); history.setClusterId(job.getJobConfig().getClusterId());
} }
history.setJobManagerAddress(job.getJobManagerAddress()); history.setJobManagerAddress(job.getJobManagerAddress());
...@@ -67,24 +71,38 @@ public class Job2MysqlHandler implements JobHandler { ...@@ -67,24 +71,38 @@ public class Job2MysqlHandler implements JobHandler {
Job job = JobContextHolder.getJob(); Job job = JobContextHolder.getJob();
History history = new History(); History history = new History();
history.setId(job.getId()); history.setId(job.getId());
if(job.isUseGateway()&&Asserts.isNullString(job.getJobId())){ if (job.isUseGateway() && Asserts.isNullString(job.getJobId())) {
job.setJobId("unknown-"+LocalDateTime.now().toString()); job.setJobId("unknown-" + LocalDateTime.now().toString());
} }
history.setJobId(job.getJobId()); history.setJobId(job.getJobId());
history.setStatus(job.getStatus().ordinal()); history.setStatus(job.getStatus().ordinal());
history.setEndTime(job.getEndTime()); history.setEndTime(job.getEndTime());
if(job.isUseGateway()){ if (job.isUseGateway()) {
history.setJobManagerAddress(job.getJobManagerAddress()); history.setJobManagerAddress(job.getJobManagerAddress());
} }
if(job.isUseGateway()){ Integer clusterId = job.getJobConfig().getClusterId();
if (job.isUseGateway()) {
Cluster cluster = clusterService.registersCluster(Cluster.autoRegistersCluster(job.getJobManagerAddress(), Cluster cluster = clusterService.registersCluster(Cluster.autoRegistersCluster(job.getJobManagerAddress(),
job.getJobId(),job.getJobConfig().getJobName()+ LocalDateTime.now(), job.getType().getLongValue(), job.getJobId(), job.getJobConfig().getJobName() + LocalDateTime.now(), job.getType().getLongValue(),
job.getJobConfig().getClusterConfigurationId(),job.getJobConfig().getTaskId())); job.getJobConfig().getClusterConfigurationId(), job.getJobConfig().getTaskId()));
if(Asserts.isNotNull(cluster)){ if (Asserts.isNotNull(cluster)) {
history.setClusterId(cluster.getId()); clusterId = cluster.getId();
} }
} }
history.setClusterId(clusterId);
historyService.updateById(history); historyService.updateById(history);
if (Asserts.isNotNullCollection(job.getJids())) {
for (String jid : job.getJids()) {
JobInstance jobInstance = history.buildJobInstance();
jobInstance.setHistoryId(job.getId());
jobInstance.setClusterId(clusterId);
jobInstance.setTaskId(job.getJobConfig().getTaskId());
jobInstance.setName(job.getJobConfig().getJobName());
jobInstance.setJid(jid);
jobInstance.setStatus(JobStatus.INITIALIZING.getValue());
jobInstanceService.save(jobInstance);
}
}
return true; return true;
} }
......
...@@ -44,4 +44,13 @@ public class History implements Serializable { ...@@ -44,4 +44,13 @@ public class History implements Serializable {
private String clusterAlias; private String clusterAlias;
@TableField(exist = false) @TableField(exist = false)
private String taskAlias; private String taskAlias;
public JobInstance buildJobInstance() {
JobInstance jobInstance = new JobInstance();
jobInstance.setHistoryId(id);
jobInstance.setClusterId(clusterId);
jobInstance.setTaskId(taskId);
jobInstance.setName(jobName);
return jobInstance;
}
} }
package com.dlink.model; package com.dlink.model;
import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
...@@ -25,10 +27,12 @@ public class JobInstance implements Serializable { ...@@ -25,10 +27,12 @@ public class JobInstance implements Serializable {
private Integer taskId; private Integer taskId;
private Integer clusterId; private Integer clusterId;
private String jid; private String jid;
private Integer status; private String status;
private Integer historyId; private Integer historyId;
private String error; private String error;
@TableField(fill = FieldFill.INSERT)
private LocalDateTime createTime; private LocalDateTime createTime;
@TableField(fill = FieldFill.INSERT_UPDATE)
private LocalDateTime updateTime; private LocalDateTime updateTime;
private LocalDateTime finishTime; private LocalDateTime finishTime;
private Integer failed_restart_count; private Integer failed_restart_count;
......
package com.dlink.model;
/**
* JobState
*
* @author wenmo
* @since 2022/2/22 14:29
**/
public enum JobStatus {
/**
* The job has been received by the Dispatcher, and is waiting for the job manager to receive
* leadership and to be created.
*/
INITIALIZING("INITIALIZING"),
/**
* Job is newly created, no task has started to run.
*/
CREATED("CREATED"),
/**
* Some tasks are scheduled or running, some may be pending, some may be finished.
*/
RUNNING("RUNNING"),
/**
* The job has failed and is currently waiting for the cleanup to complete.
*/
FAILING("FAILING"),
/**
* The job has failed with a non-recoverable task failure.
*/
FAILED("FAILED"),
/**
* Job is being cancelled.
*/
CANCELLING("CANCELLING"),
/**
* Job has been cancelled.
*/
CANCELED("CANCELED"),
/**
* All of the job's tasks have successfully finished.
*/
FINISHED("FINISHED"),
/**
* The job is currently undergoing a reset and total restart.
*/
RESTARTING("RESTARTING"),
/**
* The job has been suspended which means that it has been stopped but not been removed from a
* potential HA job store.
*/
SUSPENDED("SUSPENDED"),
/**
* The job is currently reconciling and waits for task execution report to recover state.
*/
RECONCILING("RECONCILING"),
/**
* The job can't get any info.
*/
UNKNOWN("UNKNOWN");
private String value;
JobStatus(String value) {
this.value = value;
}
public String getValue() {
return value;
}
}
...@@ -3,13 +3,12 @@ package com.dlink.job; ...@@ -3,13 +3,12 @@ package com.dlink.job;
import com.dlink.executor.Executor; import com.dlink.executor.Executor;
import com.dlink.executor.ExecutorSetting; import com.dlink.executor.ExecutorSetting;
import com.dlink.gateway.GatewayType; import com.dlink.gateway.GatewayType;
import com.dlink.parser.SqlType;
import com.dlink.result.IResult; import com.dlink.result.IResult;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
import java.time.LocalDate;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.util.List;
/** /**
* Job * Job
...@@ -34,6 +33,7 @@ public class Job { ...@@ -34,6 +33,7 @@ public class Job {
private LocalDateTime endTime; private LocalDateTime endTime;
private Executor executor; private Executor executor;
private boolean useGateway; private boolean useGateway;
private List<String> jids;
public enum JobStatus { public enum JobStatus {
INITIALIZE, INITIALIZE,
......
...@@ -2,7 +2,6 @@ package com.dlink.job; ...@@ -2,7 +2,6 @@ package com.dlink.job;
import com.dlink.api.FlinkAPI; import com.dlink.api.FlinkAPI;
import com.dlink.assertion.Asserts; import com.dlink.assertion.Asserts;
import com.dlink.config.Dialect;
import com.dlink.constant.FlinkSQLConstant; import com.dlink.constant.FlinkSQLConstant;
import com.dlink.executor.EnvironmentSetting; import com.dlink.executor.EnvironmentSetting;
import com.dlink.executor.Executor; import com.dlink.executor.Executor;
...@@ -46,8 +45,6 @@ import org.apache.flink.yarn.configuration.YarnConfigOptions; ...@@ -46,8 +45,6 @@ import org.apache.flink.yarn.configuration.YarnConfigOptions;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import java.io.PrintWriter;
import java.io.StringWriter;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
...@@ -239,7 +236,6 @@ public class JobManager { ...@@ -239,7 +236,6 @@ public class JobManager {
JobContextHolder.setJob(job); JobContextHolder.setJob(job);
ready(); ready();
String currentSql = ""; String currentSql = "";
// JobParam jobParam = pretreatStatements(SqlUtil.getStatements(statement));
JobParam jobParam = Explainer.build(executor, useStatementSet, sqlSeparator).pretreatStatements(SqlUtil.getStatements(statement, sqlSeparator)); JobParam jobParam = Explainer.build(executor, useStatementSet, sqlSeparator).pretreatStatements(SqlUtil.getStatements(statement, sqlSeparator));
try { try {
for (StatementParam item : jobParam.getDdl()) { for (StatementParam item : jobParam.getDdl()) {
...@@ -247,41 +243,40 @@ public class JobManager { ...@@ -247,41 +243,40 @@ public class JobManager {
executor.executeSql(item.getValue()); executor.executeSql(item.getValue());
} }
if (jobParam.getTrans().size() > 0) { if (jobParam.getTrans().size() > 0) {
// Use statement set or gateway only submit inserts.
if (useStatementSet && useGateway) { if (useStatementSet && useGateway) {
List<String> inserts = new ArrayList<>(); List<String> inserts = new ArrayList<>();
for (StatementParam item : jobParam.getTrans()) { for (StatementParam item : jobParam.getTrans()) {
inserts.add(item.getValue()); inserts.add(item.getValue());
} }
// Use statement set need to merge all insert sql into a sql.
currentSql = String.join(sqlSeparator, inserts); currentSql = String.join(sqlSeparator, inserts);
JobGraph jobGraph = executor.getJobGraphFromInserts(inserts); GatewayResult gatewayResult = submitByGateway(inserts);
GatewayResult gatewayResult = null; // Use statement set only has one jid.
if (GatewayType.YARN_APPLICATION.equals(runMode) || GatewayType.KUBERNETES_APPLICATION.equals(runMode)) {
config.addGatewayConfig(executor.getSetConfig());
gatewayResult = Gateway.build(config.getGatewayConfig()).submitJar();
} else {
config.addGatewayConfig(executor.getSetConfig());
if (Asserts.isNotNullString(config.getSavePointPath())) {
jobGraph.setSavepointRestoreSettings(SavepointRestoreSettings.forPath(config.getSavePointPath()));
}
gatewayResult = Gateway.build(config.getGatewayConfig()).submitJobGraph(jobGraph);
}
job.setResult(InsertResult.success(gatewayResult.getAppId())); job.setResult(InsertResult.success(gatewayResult.getAppId()));
job.setJobId(gatewayResult.getAppId()); job.setJobId(gatewayResult.getAppId());
job.setJids(gatewayResult.getJids());
job.setJobManagerAddress(formatAddress(gatewayResult.getWebURL())); job.setJobManagerAddress(formatAddress(gatewayResult.getWebURL()));
} else if (useStatementSet && !useGateway) { } else if (useStatementSet && !useGateway) {
List<String> inserts = new ArrayList<>(); List<String> inserts = new ArrayList<>();
for (StatementParam item : jobParam.getTrans()) { for (StatementParam item : jobParam.getTrans()) {
if (item.getType().equals(SqlType.INSERT)) { if (item.getType().isInsert()) {
inserts.add(item.getValue()); inserts.add(item.getValue());
} }
} }
if (inserts.size() > 0) { if (inserts.size() > 0) {
currentSql = String.join(sqlSeparator, inserts); currentSql = String.join(sqlSeparator, inserts);
// Remote mode can get the table result.
TableResult tableResult = executor.executeStatementSet(inserts); TableResult tableResult = executor.executeStatementSet(inserts);
if (tableResult.getJobClient().isPresent()) { if (tableResult.getJobClient().isPresent()) {
job.setJobId(tableResult.getJobClient().get().getJobID().toHexString()); job.setJobId(tableResult.getJobClient().get().getJobID().toHexString());
job.setJids(new ArrayList<String>() {{
add(job.getJobId());
}});
} }
if (config.isUseResult()) { if (config.isUseResult()) {
// Build insert result.
IResult result = ResultBuilder.build(SqlType.INSERT, config.getMaxRowNum(), config.isUseChangeLog(), config.isUseAutoCancel()).getResult(tableResult); IResult result = ResultBuilder.build(SqlType.INSERT, config.getMaxRowNum(), config.isUseChangeLog(), config.isUseAutoCancel()).getResult(tableResult);
job.setResult(result); job.setResult(result);
} }
...@@ -290,23 +285,14 @@ public class JobManager { ...@@ -290,23 +285,14 @@ public class JobManager {
List<String> inserts = new ArrayList<>(); List<String> inserts = new ArrayList<>();
for (StatementParam item : jobParam.getTrans()) { for (StatementParam item : jobParam.getTrans()) {
inserts.add(item.getValue()); inserts.add(item.getValue());
// Only can submit the first of insert sql, when not use statement set.
break; break;
} }
currentSql = String.join(sqlSeparator, inserts); currentSql = String.join(sqlSeparator, inserts);
JobGraph jobGraph = executor.getJobGraphFromInserts(inserts); GatewayResult gatewayResult = submitByGateway(inserts);
GatewayResult gatewayResult = null;
if (GatewayType.YARN_APPLICATION.equals(runMode) || GatewayType.KUBERNETES_APPLICATION.equals(runMode)) {
config.addGatewayConfig(executor.getSetConfig());
gatewayResult = Gateway.build(config.getGatewayConfig()).submitJar();
} else {
config.addGatewayConfig(executor.getSetConfig());
if (Asserts.isNotNullString(config.getSavePointPath())) {
jobGraph.setSavepointRestoreSettings(SavepointRestoreSettings.forPath(config.getSavePointPath()));
}
gatewayResult = Gateway.build(config.getGatewayConfig()).submitJobGraph(jobGraph);
}
job.setResult(InsertResult.success(gatewayResult.getAppId())); job.setResult(InsertResult.success(gatewayResult.getAppId()));
job.setJobId(gatewayResult.getAppId()); job.setJobId(gatewayResult.getAppId());
job.setJids(gatewayResult.getJids());
job.setJobManagerAddress(formatAddress(gatewayResult.getWebURL())); job.setJobManagerAddress(formatAddress(gatewayResult.getWebURL()));
} else { } else {
for (StatementParam item : jobParam.getTrans()) { for (StatementParam item : jobParam.getTrans()) {
...@@ -322,6 +308,9 @@ public class JobManager { ...@@ -322,6 +308,9 @@ public class JobManager {
TableResult tableResult = executor.executeSql(item.getValue()); TableResult tableResult = executor.executeSql(item.getValue());
if (tableResult.getJobClient().isPresent()) { if (tableResult.getJobClient().isPresent()) {
job.setJobId(tableResult.getJobClient().get().getJobID().toHexString()); job.setJobId(tableResult.getJobClient().get().getJobID().toHexString());
job.setJids(new ArrayList<String>() {{
add(job.getJobId());
}});
} }
if (config.isUseResult()) { if (config.isUseResult()) {
IResult result = ResultBuilder.build(item.getType(), config.getMaxRowNum(), config.isUseChangeLog(), config.isUseAutoCancel()).getResult(tableResult); IResult result = ResultBuilder.build(item.getType(), config.getMaxRowNum(), config.isUseChangeLog(), config.isUseAutoCancel()).getResult(tableResult);
...@@ -329,6 +318,8 @@ public class JobManager { ...@@ -329,6 +318,8 @@ public class JobManager {
} }
} }
} }
// Only can submit the first of insert sql, when not use statement set.
break;
} }
} }
} }
...@@ -340,15 +331,14 @@ public class JobManager { ...@@ -340,15 +331,14 @@ public class JobManager {
break; break;
} }
} }
StreamGraph streamGraph = executor.getStreamGraph();
streamGraph.setJobName(config.getJobName());
JobGraph jobGraph = streamGraph.getJobGraph();
GatewayResult gatewayResult = null; GatewayResult gatewayResult = null;
if (GatewayType.YARN_APPLICATION.equals(runMode) || GatewayType.KUBERNETES_APPLICATION.equals(runMode)) { config.addGatewayConfig(executor.getSetConfig());
config.addGatewayConfig(executor.getSetConfig()); if (runMode.isApplicationMode()) {
gatewayResult = Gateway.build(config.getGatewayConfig()).submitJar(); gatewayResult = Gateway.build(config.getGatewayConfig()).submitJar();
} else { } else {
config.addGatewayConfig(executor.getSetConfig()); StreamGraph streamGraph = executor.getStreamGraph();
streamGraph.setJobName(config.getJobName());
JobGraph jobGraph = streamGraph.getJobGraph();
if (Asserts.isNotNullString(config.getSavePointPath())) { if (Asserts.isNotNullString(config.getSavePointPath())) {
jobGraph.setSavepointRestoreSettings(SavepointRestoreSettings.forPath(config.getSavePointPath())); jobGraph.setSavepointRestoreSettings(SavepointRestoreSettings.forPath(config.getSavePointPath()));
} }
...@@ -356,6 +346,7 @@ public class JobManager { ...@@ -356,6 +346,7 @@ public class JobManager {
} }
job.setResult(InsertResult.success(gatewayResult.getAppId())); job.setResult(InsertResult.success(gatewayResult.getAppId()));
job.setJobId(gatewayResult.getAppId()); job.setJobId(gatewayResult.getAppId());
job.setJids(gatewayResult.getJids());
job.setJobManagerAddress(formatAddress(gatewayResult.getWebURL())); job.setJobManagerAddress(formatAddress(gatewayResult.getWebURL()));
} else { } else {
for (StatementParam item : jobParam.getExecute()) { for (StatementParam item : jobParam.getExecute()) {
...@@ -367,6 +358,9 @@ public class JobManager { ...@@ -367,6 +358,9 @@ public class JobManager {
JobExecutionResult jobExecutionResult = executor.execute(config.getJobName()); JobExecutionResult jobExecutionResult = executor.execute(config.getJobName());
if (jobExecutionResult.isJobExecutionResult()) { if (jobExecutionResult.isJobExecutionResult()) {
job.setJobId(jobExecutionResult.getJobID().toHexString()); job.setJobId(jobExecutionResult.getJobID().toHexString());
job.setJids(new ArrayList<String>() {{
add(job.getJobId());
}});
} }
if (config.isUseResult()) { if (config.isUseResult()) {
IResult result = ResultBuilder.build(SqlType.EXECUTE, config.getMaxRowNum(), config.isUseChangeLog(), config.isUseAutoCancel()).getResult(null); IResult result = ResultBuilder.build(SqlType.EXECUTE, config.getMaxRowNum(), config.isUseChangeLog(), config.isUseAutoCancel()).getResult(null);
...@@ -389,6 +383,27 @@ public class JobManager { ...@@ -389,6 +383,27 @@ public class JobManager {
return job.getJobResult(); return job.getJobResult();
} }
private GatewayResult submitByGateway(List<String> inserts) {
GatewayResult gatewayResult = null;
// Use gateway need to build gateway config, include flink configeration.
config.addGatewayConfig(executor.getSetConfig());
if (runMode.isApplicationMode()) {
// Application mode need to submit dlink-app.jar that in the hdfs or image.
gatewayResult = Gateway.build(config.getGatewayConfig()).submitJar();
} else {
JobGraph jobGraph = executor.getJobGraphFromInserts(inserts);
// Perjob mode need to set savepoint restore path, when recovery from savepoint.
if (Asserts.isNotNullString(config.getSavePointPath())) {
jobGraph.setSavepointRestoreSettings(SavepointRestoreSettings.forPath(config.getSavePointPath()));
}
// Perjob mode need to submit job graph.
gatewayResult = Gateway.build(config.getGatewayConfig()).submitJobGraph(jobGraph);
}
return gatewayResult;
}
private String formatAddress(String webURL) { private String formatAddress(String webURL) {
if (Asserts.isNotNullString(webURL)) { if (Asserts.isNotNullString(webURL)) {
return webURL.replaceAll("http://", ""); return webURL.replaceAll("http://", "");
......
...@@ -22,17 +22,17 @@ SET FOREIGN_KEY_CHECKS = 0; ...@@ -22,17 +22,17 @@ SET FOREIGN_KEY_CHECKS = 0;
-- ---------------------------- -- ----------------------------
DROP TABLE IF EXISTS `dlink_catalogue`; DROP TABLE IF EXISTS `dlink_catalogue`;
CREATE TABLE `dlink_catalogue` ( CREATE TABLE `dlink_catalogue` (
`id` int(11) NOT NULL AUTO_INCREMENT COMMENT 'ID', `id` int(11) NOT NULL AUTO_INCREMENT COMMENT 'ID',
`task_id` int(11) NULL DEFAULT NULL COMMENT '任务ID', `task_id` int(11) NULL DEFAULT NULL COMMENT '任务ID',
`name` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '名称', `name` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '名称',
`type` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '类型', `type` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '类型',
`parent_id` int(11) NOT NULL DEFAULT 0 COMMENT '父ID', `parent_id` int(11) NOT NULL DEFAULT 0 COMMENT '父ID',
`enabled` tinyint(1) NOT NULL DEFAULT 1 COMMENT '启用', `enabled` tinyint(1) NOT NULL DEFAULT 1 COMMENT '启用',
`is_leaf` tinyint(1) NOT NULL COMMENT '是否为文件夹', `is_leaf` tinyint(1) NOT NULL COMMENT '是否为文件夹',
`create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
`update_time` datetime(0) NULL DEFAULT NULL COMMENT '最近修改时间', `update_time` datetime(0) NULL DEFAULT NULL COMMENT '最近修改时间',
PRIMARY KEY (`id`) USING BTREE, PRIMARY KEY (`id`) USING BTREE,
UNIQUE INDEX `idx_name`(`name`, `parent_id`) USING BTREE UNIQUE INDEX `idx_name`(`name`, `parent_id`) USING BTREE
) ENGINE = InnoDB AUTO_INCREMENT = 37 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '目录' ROW_FORMAT = Dynamic; ) ENGINE = InnoDB AUTO_INCREMENT = 37 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '目录' ROW_FORMAT = Dynamic;
-- ---------------------------- -- ----------------------------
...@@ -40,23 +40,23 @@ CREATE TABLE `dlink_catalogue` ( ...@@ -40,23 +40,23 @@ CREATE TABLE `dlink_catalogue` (
-- ---------------------------- -- ----------------------------
DROP TABLE IF EXISTS `dlink_cluster`; DROP TABLE IF EXISTS `dlink_cluster`;
CREATE TABLE `dlink_cluster` ( CREATE TABLE `dlink_cluster` (
`id` int(11) NOT NULL AUTO_INCREMENT COMMENT 'ID', `id` int(11) NOT NULL AUTO_INCREMENT COMMENT 'ID',
`name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '名称', `name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '名称',
`alias` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '别名', `alias` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '别名',
`type` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '类型', `type` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '类型',
`hosts` text CHARACTER SET utf8 COLLATE utf8_general_ci NULL COMMENT 'HOSTS', `hosts` text CHARACTER SET utf8 COLLATE utf8_general_ci NULL COMMENT 'HOSTS',
`job_manager_host` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT 'JMhost', `job_manager_host` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT 'JMhost',
`version` varchar(20) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '版本', `version` varchar(20) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '版本',
`status` int(1) NULL DEFAULT NULL COMMENT '状态', `status` int(1) NULL DEFAULT NULL COMMENT '状态',
`note` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '注释', `note` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '注释',
`auto_registers` tinyint(1) NULL DEFAULT 0 COMMENT '是否自动注册', `auto_registers` tinyint(1) NULL DEFAULT 0 COMMENT '是否自动注册',
`cluster_configuration_id` int(11) NULL DEFAULT NULL COMMENT '集群配置ID', `cluster_configuration_id` int(11) NULL DEFAULT NULL COMMENT '集群配置ID',
`task_id` int(11) NULL DEFAULT NULL COMMENT '任务ID', `task_id` int(11) NULL DEFAULT NULL COMMENT '任务ID',
`enabled` tinyint(1) NOT NULL DEFAULT 1 COMMENT '是否启用', `enabled` tinyint(1) NOT NULL DEFAULT 1 COMMENT '是否启用',
`create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
`update_time` datetime(0) NULL DEFAULT NULL COMMENT '更新时间', `update_time` datetime(0) NULL DEFAULT NULL COMMENT '更新时间',
PRIMARY KEY (`id`) USING BTREE, PRIMARY KEY (`id`) USING BTREE,
UNIQUE INDEX `idx_name`(`name`) USING BTREE UNIQUE INDEX `idx_name`(`name`) USING BTREE
) ENGINE = InnoDB AUTO_INCREMENT = 42 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '集群' ROW_FORMAT = Dynamic; ) ENGINE = InnoDB AUTO_INCREMENT = 42 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '集群' ROW_FORMAT = Dynamic;
-- ---------------------------- -- ----------------------------
...@@ -64,17 +64,17 @@ CREATE TABLE `dlink_cluster` ( ...@@ -64,17 +64,17 @@ CREATE TABLE `dlink_cluster` (
-- ---------------------------- -- ----------------------------
DROP TABLE IF EXISTS `dlink_cluster_configuration`; DROP TABLE IF EXISTS `dlink_cluster_configuration`;
CREATE TABLE `dlink_cluster_configuration` ( CREATE TABLE `dlink_cluster_configuration` (
`id` int(11) NOT NULL AUTO_INCREMENT COMMENT 'ID', `id` int(11) NOT NULL AUTO_INCREMENT COMMENT 'ID',
`name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '名称', `name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '名称',
`alias` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '别名', `alias` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '别名',
`type` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '类型', `type` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '类型',
`config_json` text CHARACTER SET utf8 COLLATE utf8_general_ci NULL COMMENT '配置JSON', `config_json` text CHARACTER SET utf8 COLLATE utf8_general_ci NULL COMMENT '配置JSON',
`is_available` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '是否可用', `is_available` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '是否可用',
`note` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '注释', `note` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '注释',
`enabled` tinyint(1) NOT NULL DEFAULT 1 COMMENT '是否启用', `enabled` tinyint(1) NOT NULL DEFAULT 1 COMMENT '是否启用',
`create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
`update_time` datetime(0) NULL DEFAULT NULL COMMENT '更新时间', `update_time` datetime(0) NULL DEFAULT NULL COMMENT '更新时间',
PRIMARY KEY (`id`) USING BTREE PRIMARY KEY (`id`) USING BTREE
) ENGINE = InnoDB AUTO_INCREMENT = 11 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic; ) ENGINE = InnoDB AUTO_INCREMENT = 11 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic;
-- ---------------------------- -- ----------------------------
...@@ -82,28 +82,28 @@ CREATE TABLE `dlink_cluster_configuration` ( ...@@ -82,28 +82,28 @@ CREATE TABLE `dlink_cluster_configuration` (
-- ---------------------------- -- ----------------------------
DROP TABLE IF EXISTS `dlink_database`; DROP TABLE IF EXISTS `dlink_database`;
CREATE TABLE `dlink_database` ( CREATE TABLE `dlink_database` (
`id` int(11) NOT NULL AUTO_INCREMENT COMMENT 'ID', `id` int(11) NOT NULL AUTO_INCREMENT COMMENT 'ID',
`name` varchar(30) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '数据源名', `name` varchar(30) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '数据源名',
`alias` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '数据源标题', `alias` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '数据源标题',
`group_name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT 'Default' COMMENT '数据源分组', `group_name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT 'Default' COMMENT '数据源分组',
`type` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '类型', `type` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '类型',
`ip` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT 'IP', `ip` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT 'IP',
`port` int(11) NULL DEFAULT NULL COMMENT '端口号', `port` int(11) NULL DEFAULT NULL COMMENT '端口号',
`url` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT 'url', `url` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT 'url',
`username` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '用户名', `username` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '用户名',
`password` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '密码', `password` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '密码',
`note` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '注释', `note` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '注释',
`flink_config` text CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT 'Flink配置', `flink_config` text CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT 'Flink配置',
`flink_template` text CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT 'Flink模板', `flink_template` text CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT 'Flink模板',
`db_version` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '版本,如oracle的11g,hbase的2.2.3', `db_version` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '版本,如oracle的11g,hbase的2.2.3',
`status` tinyint(1) NULL DEFAULT 0 COMMENT '状态', `status` tinyint(1) NULL DEFAULT 0 COMMENT '状态',
`health_time` datetime(0) NULL DEFAULT NULL COMMENT '最近健康时间', `health_time` datetime(0) NULL DEFAULT NULL COMMENT '最近健康时间',
`heartbeat_time` datetime(0) NULL DEFAULT NULL COMMENT '最近心跳监测时间', `heartbeat_time` datetime(0) NULL DEFAULT NULL COMMENT '最近心跳监测时间',
`enabled` tinyint(1) NOT NULL DEFAULT 1 COMMENT '启用', `enabled` tinyint(1) NOT NULL DEFAULT 1 COMMENT '启用',
`create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
`update_time` datetime(0) NULL DEFAULT NULL COMMENT '最近修改时间', `update_time` datetime(0) NULL DEFAULT NULL COMMENT '最近修改时间',
PRIMARY KEY (`id`) USING BTREE, PRIMARY KEY (`id`) USING BTREE,
UNIQUE INDEX `db_index`(`name`) USING BTREE UNIQUE INDEX `db_index`(`name`) USING BTREE
) ENGINE = InnoDB AUTO_INCREMENT = 4 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic; ) ENGINE = InnoDB AUTO_INCREMENT = 4 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic;
-- ---------------------------- -- ----------------------------
...@@ -111,19 +111,19 @@ CREATE TABLE `dlink_database` ( ...@@ -111,19 +111,19 @@ CREATE TABLE `dlink_database` (
-- ---------------------------- -- ----------------------------
DROP TABLE IF EXISTS `dlink_flink_document`; DROP TABLE IF EXISTS `dlink_flink_document`;
CREATE TABLE `dlink_flink_document` ( CREATE TABLE `dlink_flink_document` (
`id` int(11) NOT NULL AUTO_INCREMENT COMMENT '主键', `id` int(11) NOT NULL AUTO_INCREMENT COMMENT '主键',
`category` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '文档类型', `category` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '文档类型',
`type` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '类型', `type` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '类型',
`subtype` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '子类型', `subtype` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '子类型',
`name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '信息', `name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '信息',
`description` LONGTEXT CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '描述', `description` LONGTEXT CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '描述',
`fill_value` LONGTEXT CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '填充值', `fill_value` LONGTEXT CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '填充值',
`version` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '版本号', `version` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '版本号',
`like_num` int(255) NULL DEFAULT 0 COMMENT '喜爱值', `like_num` int(255) NULL DEFAULT 0 COMMENT '喜爱值',
`enabled` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否启用', `enabled` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否启用',
`create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
`update_time` datetime(0) NULL DEFAULT NULL COMMENT '更新时间', `update_time` datetime(0) NULL DEFAULT NULL COMMENT '更新时间',
PRIMARY KEY (`id`) USING BTREE PRIMARY KEY (`id`) USING BTREE
) ENGINE = InnoDB AUTO_INCREMENT = 264 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '文档管理' ROW_FORMAT = Dynamic; ) ENGINE = InnoDB AUTO_INCREMENT = 264 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '文档管理' ROW_FORMAT = Dynamic;
INSERT INTO `dlink_flink_document` VALUES (1, 'Variable', '优化参数', 'Batch/Streaming', 'set table.exec.async-lookup.buffer-capacity', '异步查找连接可以触发的最大异步操作的操作数。 \nThe max number of async i/o operation that the async lookup join can trigger.', 'Set \'table.exec.async-lookup.buffer-capacity\'=\'100\';', '1.14', 0, 1, '2022-01-20 15:00:00', '2022-01-20 15:00:00'); INSERT INTO `dlink_flink_document` VALUES (1, 'Variable', '优化参数', 'Batch/Streaming', 'set table.exec.async-lookup.buffer-capacity', '异步查找连接可以触发的最大异步操作的操作数。 \nThe max number of async i/o operation that the async lookup join can trigger.', 'Set \'table.exec.async-lookup.buffer-capacity\'=\'100\';', '1.14', 0, 1, '2022-01-20 15:00:00', '2022-01-20 15:00:00');
...@@ -153,25 +153,25 @@ INSERT INTO `dlink_flink_document` VALUES (20, 'Module', '建表语句', NULL, ' ...@@ -153,25 +153,25 @@ INSERT INTO `dlink_flink_document` VALUES (20, 'Module', '建表语句', NULL, '
-- ---------------------------- -- ----------------------------
DROP TABLE IF EXISTS `dlink_history`; DROP TABLE IF EXISTS `dlink_history`;
CREATE TABLE `dlink_history` ( CREATE TABLE `dlink_history` (
`id` int(11) NOT NULL AUTO_INCREMENT COMMENT 'ID', `id` int(11) NOT NULL AUTO_INCREMENT COMMENT 'ID',
`cluster_id` int(11) NOT NULL DEFAULT 0 COMMENT '集群ID', `cluster_id` int(11) NOT NULL DEFAULT 0 COMMENT '集群ID',
`cluster_configuration_id` int(11) NULL DEFAULT NULL, `cluster_configuration_id` int(11) NULL DEFAULT NULL,
`session` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '会话', `session` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '会话',
`job_id` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT 'JobID', `job_id` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT 'JobID',
`job_name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '作业名', `job_name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '作业名',
`job_manager_address` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT 'JM地址', `job_manager_address` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT 'JM地址',
`status` int(1) NOT NULL DEFAULT 0 COMMENT '状态', `status` int(1) NOT NULL DEFAULT 0 COMMENT '状态',
`type` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '类型', `type` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '类型',
`statement` text CHARACTER SET utf8 COLLATE utf8_general_ci NULL COMMENT '语句集', `statement` text CHARACTER SET utf8 COLLATE utf8_general_ci NULL COMMENT '语句集',
`error` text CHARACTER SET utf8 COLLATE utf8_general_ci NULL COMMENT '异常信息', `error` text CHARACTER SET utf8 COLLATE utf8_general_ci NULL COMMENT '异常信息',
`result` text CHARACTER SET utf8 COLLATE utf8_general_ci NULL COMMENT '结果集', `result` text CHARACTER SET utf8 COLLATE utf8_general_ci NULL COMMENT '结果集',
`config` text CHARACTER SET utf8 COLLATE utf8_general_ci NULL COMMENT '配置', `config` text CHARACTER SET utf8 COLLATE utf8_general_ci NULL COMMENT '配置',
`start_time` datetime(0) NULL DEFAULT NULL COMMENT '开始时间', `start_time` datetime(0) NULL DEFAULT NULL COMMENT '开始时间',
`end_time` datetime(0) NULL DEFAULT NULL COMMENT '结束时间', `end_time` datetime(0) NULL DEFAULT NULL COMMENT '结束时间',
`task_id` int(11) NULL DEFAULT NULL COMMENT '作业ID', `task_id` int(11) NULL DEFAULT NULL COMMENT '作业ID',
PRIMARY KEY (`id`) USING BTREE, PRIMARY KEY (`id`) USING BTREE,
INDEX `task_index`(`task_id`) USING BTREE, INDEX `task_index`(`task_id`) USING BTREE,
INDEX `cluster_index`(`cluster_id`) USING BTREE INDEX `cluster_index`(`cluster_id`) USING BTREE
) ENGINE = InnoDB AUTO_INCREMENT = 209 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '执行历史' ROW_FORMAT = Dynamic; ) ENGINE = InnoDB AUTO_INCREMENT = 209 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '执行历史' ROW_FORMAT = Dynamic;
-- ---------------------------- -- ----------------------------
...@@ -179,18 +179,18 @@ CREATE TABLE `dlink_history` ( ...@@ -179,18 +179,18 @@ CREATE TABLE `dlink_history` (
-- ---------------------------- -- ----------------------------
DROP TABLE IF EXISTS `dlink_jar`; DROP TABLE IF EXISTS `dlink_jar`;
CREATE TABLE `dlink_jar` ( CREATE TABLE `dlink_jar` (
`id` int(11) NOT NULL AUTO_INCREMENT COMMENT 'ID', `id` int(11) NOT NULL AUTO_INCREMENT COMMENT 'ID',
`name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '名称', `name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '名称',
`alias` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '别名', `alias` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '别名',
`type` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '类型', `type` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '类型',
`path` text CHARACTER SET utf8 COLLATE utf8_general_ci NULL COMMENT '路径', `path` text CHARACTER SET utf8 COLLATE utf8_general_ci NULL COMMENT '路径',
`main_class` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '启动类', `main_class` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '启动类',
`paras` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '启动类入参', `paras` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '启动类入参',
`note` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '注释', `note` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '注释',
`enabled` tinyint(1) NOT NULL DEFAULT 1 COMMENT '是否启用', `enabled` tinyint(1) NOT NULL DEFAULT 1 COMMENT '是否启用',
`create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
`update_time` datetime(0) NULL DEFAULT NULL COMMENT '更新时间', `update_time` datetime(0) NULL DEFAULT NULL COMMENT '更新时间',
PRIMARY KEY (`id`) USING BTREE PRIMARY KEY (`id`) USING BTREE
) ENGINE = InnoDB AUTO_INCREMENT = 2 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic; ) ENGINE = InnoDB AUTO_INCREMENT = 2 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic;
-- ---------------------------- -- ----------------------------
...@@ -198,13 +198,13 @@ CREATE TABLE `dlink_jar` ( ...@@ -198,13 +198,13 @@ CREATE TABLE `dlink_jar` (
-- ---------------------------- -- ----------------------------
DROP TABLE IF EXISTS `dlink_savepoints`; DROP TABLE IF EXISTS `dlink_savepoints`;
CREATE TABLE `dlink_savepoints` ( CREATE TABLE `dlink_savepoints` (
`id` int(11) NOT NULL AUTO_INCREMENT COMMENT 'ID', `id` int(11) NOT NULL AUTO_INCREMENT COMMENT 'ID',
`task_id` int(11) NOT NULL COMMENT '任务ID', `task_id` int(11) NOT NULL COMMENT '任务ID',
`name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '名称', `name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '名称',
`type` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '类型', `type` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '类型',
`path` text CHARACTER SET utf8 COLLATE utf8_general_ci NULL COMMENT '路径', `path` text CHARACTER SET utf8 COLLATE utf8_general_ci NULL COMMENT '路径',
`create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
PRIMARY KEY (`id`) USING BTREE PRIMARY KEY (`id`) USING BTREE
) ENGINE = InnoDB AUTO_INCREMENT = 6 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic; ) ENGINE = InnoDB AUTO_INCREMENT = 6 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic;
-- ---------------------------- -- ----------------------------
...@@ -212,18 +212,18 @@ CREATE TABLE `dlink_savepoints` ( ...@@ -212,18 +212,18 @@ CREATE TABLE `dlink_savepoints` (
-- ---------------------------- -- ----------------------------
DROP TABLE IF EXISTS `dlink_schema_history`; DROP TABLE IF EXISTS `dlink_schema_history`;
CREATE TABLE `dlink_schema_history` ( CREATE TABLE `dlink_schema_history` (
`installed_rank` int(11) NOT NULL, `installed_rank` int(11) NOT NULL,
`version` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, `version` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
`description` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL, `description` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL,
`type` varchar(20) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL, `type` varchar(20) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL,
`script` varchar(1000) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL, `script` varchar(1000) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL,
`checksum` int(11) NULL DEFAULT NULL, `checksum` int(11) NULL DEFAULT NULL,
`installed_by` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL, `installed_by` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL,
`installed_on` timestamp(0) NOT NULL DEFAULT CURRENT_TIMESTAMP, `installed_on` timestamp(0) NOT NULL DEFAULT CURRENT_TIMESTAMP,
`execution_time` int(11) NOT NULL, `execution_time` int(11) NOT NULL,
`success` tinyint(1) NOT NULL, `success` tinyint(1) NOT NULL,
PRIMARY KEY (`installed_rank`) USING BTREE, PRIMARY KEY (`installed_rank`) USING BTREE,
INDEX `dlink_schema_history_s_idx`(`success`) USING BTREE INDEX `dlink_schema_history_s_idx`(`success`) USING BTREE
) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic; ) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic;
-- ---------------------------- -- ----------------------------
...@@ -231,12 +231,12 @@ CREATE TABLE `dlink_schema_history` ( ...@@ -231,12 +231,12 @@ CREATE TABLE `dlink_schema_history` (
-- ---------------------------- -- ----------------------------
DROP TABLE IF EXISTS `dlink_sys_config`; DROP TABLE IF EXISTS `dlink_sys_config`;
CREATE TABLE `dlink_sys_config` ( CREATE TABLE `dlink_sys_config` (
`id` int(11) NOT NULL AUTO_INCREMENT COMMENT 'ID', `id` int(11) NOT NULL AUTO_INCREMENT COMMENT 'ID',
`name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '配置名', `name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '配置名',
`value` text CHARACTER SET utf8 COLLATE utf8_general_ci NULL COMMENT '值', `value` text CHARACTER SET utf8 COLLATE utf8_general_ci NULL COMMENT '值',
`create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
`update_time` datetime(0) NULL DEFAULT NULL COMMENT '更新时间', `update_time` datetime(0) NULL DEFAULT NULL COMMENT '更新时间',
PRIMARY KEY (`id`) USING BTREE PRIMARY KEY (`id`) USING BTREE
) ENGINE = InnoDB AUTO_INCREMENT = 4 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic; ) ENGINE = InnoDB AUTO_INCREMENT = 4 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic;
-- ---------------------------- -- ----------------------------
...@@ -244,31 +244,31 @@ CREATE TABLE `dlink_sys_config` ( ...@@ -244,31 +244,31 @@ CREATE TABLE `dlink_sys_config` (
-- ---------------------------- -- ----------------------------
DROP TABLE IF EXISTS `dlink_task`; DROP TABLE IF EXISTS `dlink_task`;
CREATE TABLE `dlink_task` ( CREATE TABLE `dlink_task` (
`id` int(11) NOT NULL AUTO_INCREMENT COMMENT 'ID', `id` int(11) NOT NULL AUTO_INCREMENT COMMENT 'ID',
`name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '名称', `name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '名称',
`alias` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '别名', `alias` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '别名',
`dialect` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '方言', `dialect` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '方言',
`type` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '类型', `type` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '类型',
`check_point` int(11) NULL DEFAULT NULL COMMENT 'CheckPoint ', `check_point` int(11) NULL DEFAULT NULL COMMENT 'CheckPoint ',
`save_point_strategy` int(1) UNSIGNED ZEROFILL NULL DEFAULT NULL COMMENT 'SavePoint策略', `save_point_strategy` int(1) UNSIGNED ZEROFILL NULL DEFAULT NULL COMMENT 'SavePoint策略',
`save_point_path` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT 'SavePointPath', `save_point_path` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT 'SavePointPath',
`parallelism` int(4) NULL DEFAULT NULL COMMENT 'parallelism', `parallelism` int(4) NULL DEFAULT NULL COMMENT 'parallelism',
`fragment` tinyint(1) NULL DEFAULT NULL COMMENT 'fragment', `fragment` tinyint(1) NULL DEFAULT NULL COMMENT 'fragment',
`statement_set` tinyint(1) NULL DEFAULT NULL COMMENT '启用语句集', `statement_set` tinyint(1) NULL DEFAULT NULL COMMENT '启用语句集',
`batch_model` tinyint(1) NULL DEFAULT 0 COMMENT '使用批模式', `batch_model` tinyint(1) NULL DEFAULT 0 COMMENT '使用批模式',
`cluster_id` int(11) NULL DEFAULT NULL COMMENT 'Flink集群ID', `cluster_id` int(11) NULL DEFAULT NULL COMMENT 'Flink集群ID',
`cluster_configuration_id` int(11) NULL DEFAULT NULL COMMENT '集群配置ID', `cluster_configuration_id` int(11) NULL DEFAULT NULL COMMENT '集群配置ID',
`database_id` int(11) NULL DEFAULT NULL COMMENT '数据源ID', `database_id` int(11) NULL DEFAULT NULL COMMENT '数据源ID',
`jar_id` int(11) NULL DEFAULT NULL COMMENT 'jarID', `jar_id` int(11) NULL DEFAULT NULL COMMENT 'jarID',
`env_id` int(11) NULL DEFAULT NULL COMMENT '环境ID', `env_id` int(11) NULL DEFAULT NULL COMMENT '环境ID',
`config_json` text CHARACTER SET utf8 COLLATE utf8_general_ci NULL COMMENT '配置JSON', `config_json` text CHARACTER SET utf8 COLLATE utf8_general_ci NULL COMMENT '配置JSON',
`note` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '注释', `note` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '注释',
`step` int(11) NULL DEFAULT NULL COMMENT '作业生命周期', `step` int(11) NULL DEFAULT NULL COMMENT '作业生命周期',
`enabled` tinyint(1) NOT NULL DEFAULT 1 COMMENT '是否启用', `enabled` tinyint(1) NOT NULL DEFAULT 1 COMMENT '是否启用',
`create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
`update_time` datetime(0) NULL DEFAULT NULL COMMENT '更新时间', `update_time` datetime(0) NULL DEFAULT NULL COMMENT '更新时间',
PRIMARY KEY (`id`) USING BTREE, PRIMARY KEY (`id`) USING BTREE,
UNIQUE INDEX `idx_name`(`name`) USING BTREE UNIQUE INDEX `idx_name`(`name`) USING BTREE
) ENGINE = InnoDB AUTO_INCREMENT = 33 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '作业' ROW_FORMAT = Dynamic; ) ENGINE = InnoDB AUTO_INCREMENT = 33 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '作业' ROW_FORMAT = Dynamic;
-- ---------------------------- -- ----------------------------
...@@ -276,9 +276,9 @@ CREATE TABLE `dlink_task` ( ...@@ -276,9 +276,9 @@ CREATE TABLE `dlink_task` (
-- ---------------------------- -- ----------------------------
DROP TABLE IF EXISTS `dlink_task_statement`; DROP TABLE IF EXISTS `dlink_task_statement`;
CREATE TABLE `dlink_task_statement` ( CREATE TABLE `dlink_task_statement` (
`id` int(11) NOT NULL COMMENT 'ID', `id` int(11) NOT NULL COMMENT 'ID',
`statement` text CHARACTER SET utf8 COLLATE utf8_general_ci NULL COMMENT '语句', `statement` text CHARACTER SET utf8 COLLATE utf8_general_ci NULL COMMENT '语句',
PRIMARY KEY (`id`) USING BTREE PRIMARY KEY (`id`) USING BTREE
) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '语句' ROW_FORMAT = Dynamic; ) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '语句' ROW_FORMAT = Dynamic;
-- ---------------------------- -- ----------------------------
...@@ -286,18 +286,18 @@ CREATE TABLE `dlink_task_statement` ( ...@@ -286,18 +286,18 @@ CREATE TABLE `dlink_task_statement` (
-- ---------------------------- -- ----------------------------
DROP TABLE IF EXISTS `dlink_user`; DROP TABLE IF EXISTS `dlink_user`;
CREATE TABLE `dlink_user` ( CREATE TABLE `dlink_user` (
`id` int(11) NOT NULL AUTO_INCREMENT COMMENT 'ID', `id` int(11) NOT NULL AUTO_INCREMENT COMMENT 'ID',
`username` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '登录名', `username` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '登录名',
`password` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '密码', `password` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '密码',
`nickname` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '昵称', `nickname` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '昵称',
`worknum` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '工号', `worknum` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '工号',
`avatar` blob NULL COMMENT '头像', `avatar` blob NULL COMMENT '头像',
`mobile` varchar(20) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '手机号', `mobile` varchar(20) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '手机号',
`enabled` tinyint(1) NOT NULL DEFAULT 1 COMMENT '是否启用', `enabled` tinyint(1) NOT NULL DEFAULT 1 COMMENT '是否启用',
`is_delete` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否被删除', `is_delete` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否被删除',
`create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
`update_time` datetime(0) NULL DEFAULT NULL COMMENT '更新时间', `update_time` datetime(0) NULL DEFAULT NULL COMMENT '更新时间',
PRIMARY KEY (`id`) PRIMARY KEY (`id`)
) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic; ) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic;
INSERT INTO `dlink_user`(`id`, `username`, `password`, `nickname`, `worknum`, `avatar`, `mobile`, `enabled`, `is_delete`, `create_time`, `update_time`) VALUES (1, 'admin', '21232f297a57a5a743894a0e4a801fc3', 'Admin', NULL, NULL, NULL, 1, 0, '2021-11-28 17:19:27', '2021-11-28 17:19:31'); INSERT INTO `dlink_user`(`id`, `username`, `password`, `nickname`, `worknum`, `avatar`, `mobile`, `enabled`, `is_delete`, `create_time`, `update_time`) VALUES (1, 'admin', '21232f297a57a5a743894a0e4a801fc3', 'Admin', NULL, NULL, NULL, 1, 0, '2021-11-28 17:19:27', '2021-11-28 17:19:31');
...@@ -313,7 +313,7 @@ create table dlink_job_instance ...@@ -313,7 +313,7 @@ create table dlink_job_instance
task_id int null comment 'taskID', task_id int null comment 'taskID',
cluster_id int null comment '集群ID', cluster_id int null comment '集群ID',
jid varchar(50) null comment 'FlinkJobId', jid varchar(50) null comment 'FlinkJobId',
status int null comment '实例状态', status varchar(50) null comment '实例状态',
history_id int null comment '提交历史ID', history_id int null comment '提交历史ID',
create_time datetime null comment '创建时间', create_time datetime null comment '创建时间',
update_time datetime null comment '更新时间', update_time datetime null comment '更新时间',
......
...@@ -22,17 +22,17 @@ SET FOREIGN_KEY_CHECKS = 0; ...@@ -22,17 +22,17 @@ SET FOREIGN_KEY_CHECKS = 0;
-- ---------------------------- -- ----------------------------
DROP TABLE IF EXISTS `dlink_catalogue`; DROP TABLE IF EXISTS `dlink_catalogue`;
CREATE TABLE `dlink_catalogue` ( CREATE TABLE `dlink_catalogue` (
`id` int(11) NOT NULL AUTO_INCREMENT COMMENT 'ID', `id` int(11) NOT NULL AUTO_INCREMENT COMMENT 'ID',
`task_id` int(11) NULL DEFAULT NULL COMMENT '任务ID', `task_id` int(11) NULL DEFAULT NULL COMMENT '任务ID',
`name` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '名称', `name` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '名称',
`type` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci COMMENT '类型', `type` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci COMMENT '类型',
`parent_id` int(11) NOT NULL DEFAULT 0 COMMENT '父ID', `parent_id` int(11) NOT NULL DEFAULT 0 COMMENT '父ID',
`enabled` tinyint(1) NOT NULL DEFAULT 1 COMMENT '启用', `enabled` tinyint(1) NOT NULL DEFAULT 1 COMMENT '启用',
`is_leaf` tinyint(1) NOT NULL COMMENT '是否为叶子', `is_leaf` tinyint(1) NOT NULL COMMENT '是否为叶子',
`create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
`update_time` datetime(0) NULL DEFAULT NULL COMMENT '最近修改时间', `update_time` datetime(0) NULL DEFAULT NULL COMMENT '最近修改时间',
PRIMARY KEY (`id`) USING BTREE, PRIMARY KEY (`id`) USING BTREE,
UNIQUE INDEX `idx_name`(`name`, `parent_id`) USING BTREE UNIQUE INDEX `idx_name`(`name`, `parent_id`) USING BTREE
) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '目录' ROW_FORMAT = Dynamic; ) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '目录' ROW_FORMAT = Dynamic;
-- ---------------------------- -- ----------------------------
...@@ -40,19 +40,19 @@ CREATE TABLE `dlink_catalogue` ( ...@@ -40,19 +40,19 @@ CREATE TABLE `dlink_catalogue` (
-- ---------------------------- -- ----------------------------
DROP TABLE IF EXISTS `dlink_cluster`; DROP TABLE IF EXISTS `dlink_cluster`;
CREATE TABLE `dlink_cluster` ( CREATE TABLE `dlink_cluster` (
`id` int(11) NOT NULL AUTO_INCREMENT COMMENT 'ID', `id` int(11) NOT NULL AUTO_INCREMENT COMMENT 'ID',
`name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '名称', `name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '名称',
`alias` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '别名', `alias` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '别名',
`type` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '类型', `type` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '类型',
`hosts` text CHARACTER SET utf8 COLLATE utf8_general_ci NULL COMMENT 'HOSTS', `hosts` text CHARACTER SET utf8 COLLATE utf8_general_ci NULL COMMENT 'HOSTS',
`job_manager_host` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT 'JMhost', `job_manager_host` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT 'JMhost',
`status` int(1) NULL DEFAULT NULL COMMENT '状态', `status` int(1) NULL DEFAULT NULL COMMENT '状态',
`note` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '注释', `note` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '注释',
`enabled` tinyint(1) NOT NULL DEFAULT 1 COMMENT '是否启用', `enabled` tinyint(1) NOT NULL DEFAULT 1 COMMENT '是否启用',
`create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
`update_time` datetime(0) NULL DEFAULT NULL COMMENT '更新时间', `update_time` datetime(0) NULL DEFAULT NULL COMMENT '更新时间',
PRIMARY KEY (`id`) USING BTREE, PRIMARY KEY (`id`) USING BTREE,
UNIQUE INDEX `idx_name`(`name`) USING BTREE UNIQUE INDEX `idx_name`(`name`) USING BTREE
) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '集群' ROW_FORMAT = Dynamic; ) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '集群' ROW_FORMAT = Dynamic;
-- ---------------------------- -- ----------------------------
...@@ -60,21 +60,21 @@ CREATE TABLE `dlink_cluster` ( ...@@ -60,21 +60,21 @@ CREATE TABLE `dlink_cluster` (
-- ---------------------------- -- ----------------------------
DROP TABLE IF EXISTS `dlink_task`; DROP TABLE IF EXISTS `dlink_task`;
CREATE TABLE `dlink_task` ( CREATE TABLE `dlink_task` (
`id` int(11) NOT NULL AUTO_INCREMENT COMMENT 'ID', `id` int(11) NOT NULL AUTO_INCREMENT COMMENT 'ID',
`name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '名称', `name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '名称',
`alias` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '别名', `alias` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '别名',
`type` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '类型', `type` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '类型',
`check_point` int(11) NULL DEFAULT NULL COMMENT 'CheckPoint ', `check_point` int(11) NULL DEFAULT NULL COMMENT 'CheckPoint ',
`save_point_path` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT 'SavePointPath', `save_point_path` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT 'SavePointPath',
`parallelism` int(4) NULL DEFAULT NULL COMMENT 'parallelism', `parallelism` int(4) NULL DEFAULT NULL COMMENT 'parallelism',
`fragment` tinyint(1) NULL DEFAULT NULL COMMENT 'fragment', `fragment` tinyint(1) NULL DEFAULT NULL COMMENT 'fragment',
`cluster_id` int(11) NULL DEFAULT NULL COMMENT 'Flink集群ID', `cluster_id` int(11) NULL DEFAULT NULL COMMENT 'Flink集群ID',
`note` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '注释', `note` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '注释',
`enabled` tinyint(1) NOT NULL DEFAULT 1 COMMENT '是否启用', `enabled` tinyint(1) NOT NULL DEFAULT 1 COMMENT '是否启用',
`create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
`update_time` datetime(0) NULL DEFAULT NULL COMMENT '更新时间', `update_time` datetime(0) NULL DEFAULT NULL COMMENT '更新时间',
PRIMARY KEY (`id`) USING BTREE, PRIMARY KEY (`id`) USING BTREE,
UNIQUE INDEX `idx_name`(`name`) USING BTREE UNIQUE INDEX `idx_name`(`name`) USING BTREE
) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '作业' ROW_FORMAT = Dynamic; ) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '作业' ROW_FORMAT = Dynamic;
-- ---------------------------- -- ----------------------------
...@@ -82,9 +82,9 @@ CREATE TABLE `dlink_task` ( ...@@ -82,9 +82,9 @@ CREATE TABLE `dlink_task` (
-- ---------------------------- -- ----------------------------
DROP TABLE IF EXISTS `dlink_task_statement`; DROP TABLE IF EXISTS `dlink_task_statement`;
CREATE TABLE `dlink_task_statement` ( CREATE TABLE `dlink_task_statement` (
`id` int(11) NOT NULL COMMENT 'ID', `id` int(11) NOT NULL COMMENT 'ID',
`statement` text CHARACTER SET utf8 COLLATE utf8_general_ci NULL COMMENT '语句', `statement` text CHARACTER SET utf8 COLLATE utf8_general_ci NULL COMMENT '语句',
PRIMARY KEY (`id`) USING BTREE PRIMARY KEY (`id`) USING BTREE
) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '语句' ROW_FORMAT = Dynamic; ) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '语句' ROW_FORMAT = Dynamic;
-- ---------------------------- -- ----------------------------
...@@ -92,18 +92,18 @@ CREATE TABLE `dlink_task_statement` ( ...@@ -92,18 +92,18 @@ CREATE TABLE `dlink_task_statement` (
-- ---------------------------- -- ----------------------------
DROP TABLE IF EXISTS `dlink_flink_document`; DROP TABLE IF EXISTS `dlink_flink_document`;
CREATE TABLE `dlink_flink_document` ( CREATE TABLE `dlink_flink_document` (
`id` int(11) NOT NULL AUTO_INCREMENT COMMENT '主键', `id` int(11) NOT NULL AUTO_INCREMENT COMMENT '主键',
`category` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '文档类型', `category` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '文档类型',
`type` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '类型', `type` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '类型',
`subtype` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '子类型', `subtype` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '子类型',
`name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '信息', `name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '信息',
`description` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '描述', `description` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '描述',
`version` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '版本号', `version` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '版本号',
`like_num` int(255) NULL DEFAULT 0 COMMENT '喜爱值', `like_num` int(255) NULL DEFAULT 0 COMMENT '喜爱值',
`enabled` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否启用', `enabled` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否启用',
`create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
`update_time` datetime(0) NULL DEFAULT NULL COMMENT '更新时间', `update_time` datetime(0) NULL DEFAULT NULL COMMENT '更新时间',
PRIMARY KEY (`id`) USING BTREE PRIMARY KEY (`id`) USING BTREE
) ENGINE = InnoDB AUTO_INCREMENT = 263 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '文档管理' ROW_FORMAT = Dynamic; ) ENGINE = InnoDB AUTO_INCREMENT = 263 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '文档管理' ROW_FORMAT = Dynamic;
-- ---------------------------- -- ----------------------------
...@@ -308,160 +308,160 @@ INSERT INTO `dlink_flink_document` VALUES (262, 'function', 'UDF', '表值聚合 ...@@ -308,160 +308,160 @@ INSERT INTO `dlink_flink_document` VALUES (262, 'function', 'UDF', '表值聚合
-- ---------------------------- -- ----------------------------
DROP TABLE IF EXISTS `dlink_history`; DROP TABLE IF EXISTS `dlink_history`;
CREATE TABLE `dlink_history` ( CREATE TABLE `dlink_history` (
`id` int(11) NOT NULL AUTO_INCREMENT COMMENT 'ID', `id` int(11) NOT NULL AUTO_INCREMENT COMMENT 'ID',
`cluster_id` int(11) NOT NULL DEFAULT 0 COMMENT '集群ID', `cluster_id` int(11) NOT NULL DEFAULT 0 COMMENT '集群ID',
`session` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '会话', `session` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '会话',
`job_id` varchar(50) NULL DEFAULT NULL COMMENT 'JobID', `job_id` varchar(50) NULL DEFAULT NULL COMMENT 'JobID',
`job_name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '作业名', `job_name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '作业名',
`job_manager_address` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT 'JM地址', `job_manager_address` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT 'JM地址',
`status` int(1) NOT NULL DEFAULT 0 COMMENT '状态', `status` int(1) NOT NULL DEFAULT 0 COMMENT '状态',
`type` varchar(50) NULL DEFAULT NULL COMMENT '类型', `type` varchar(50) NULL DEFAULT NULL COMMENT '类型',
`statement` text CHARACTER SET utf8 COLLATE utf8_general_ci NULL COMMENT '语句集', `statement` text CHARACTER SET utf8 COLLATE utf8_general_ci NULL COMMENT '语句集',
`error` text CHARACTER SET utf8 COLLATE utf8_general_ci NULL COMMENT '异常信息', `error` text CHARACTER SET utf8 COLLATE utf8_general_ci NULL COMMENT '异常信息',
`result` text CHARACTER SET utf8 COLLATE utf8_general_ci NULL COMMENT '结果集', `result` text CHARACTER SET utf8 COLLATE utf8_general_ci NULL COMMENT '结果集',
`config` text CHARACTER SET utf8 COLLATE utf8_general_ci NULL COMMENT '配置', `config` text CHARACTER SET utf8 COLLATE utf8_general_ci NULL COMMENT '配置',
`start_time` datetime(0) NULL DEFAULT NULL COMMENT '开始时间', `start_time` datetime(0) NULL DEFAULT NULL COMMENT '开始时间',
`end_time` datetime(0) NULL DEFAULT NULL COMMENT '结束时间', `end_time` datetime(0) NULL DEFAULT NULL COMMENT '结束时间',
`task_id` int(11) NULL DEFAULT NULL COMMENT '作业ID', `task_id` int(11) NULL DEFAULT NULL COMMENT '作业ID',
PRIMARY KEY (`id`) USING BTREE, PRIMARY KEY (`id`) USING BTREE,
INDEX `task_index`(`task_id`) USING BTREE, INDEX `task_index`(`task_id`) USING BTREE,
INDEX `cluster_index`(`cluster_id`) USING BTREE INDEX `cluster_index`(`cluster_id`) USING BTREE
) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '执行历史' ROW_FORMAT = Dynamic; ) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '执行历史' ROW_FORMAT = Dynamic;
ALTER TABLE `dlink_task` ALTER TABLE `dlink_task`
ADD COLUMN `config` text NULL COMMENT '配置' AFTER `cluster_id`; ADD COLUMN `config` text NULL COMMENT '配置' AFTER `cluster_id`;
-- ---------------------------- -- ----------------------------
-- Table structure for dlink_database -- Table structure for dlink_database
-- ---------------------------- -- ----------------------------
DROP TABLE IF EXISTS `dlink_database`; DROP TABLE IF EXISTS `dlink_database`;
CREATE TABLE `dlink_database` ( CREATE TABLE `dlink_database` (
`id` int(11) NOT NULL AUTO_INCREMENT COMMENT 'ID', `id` int(11) NOT NULL AUTO_INCREMENT COMMENT 'ID',
`name` varchar(30) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '数据源名', `name` varchar(30) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '数据源名',
`alias` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '数据源标题', `alias` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '数据源标题',
`group_name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT 'Default' COMMENT '数据源分组', `group_name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT 'Default' COMMENT '数据源分组',
`type` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '类型', `type` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '类型',
`ip` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT 'IP', `ip` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT 'IP',
`port` int(11) NULL DEFAULT NULL COMMENT '端口号', `port` int(11) NULL DEFAULT NULL COMMENT '端口号',
`url` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT 'url', `url` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT 'url',
`username` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '用户名', `username` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '用户名',
`password` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '密码', `password` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '密码',
`note` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '注释', `note` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '注释',
`db_version` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '版本,如oracle的11g,hbase的2.2.3', `db_version` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '版本,如oracle的11g,hbase的2.2.3',
`status` tinyint(1) NULL COMMENT '状态', `status` tinyint(1) NULL COMMENT '状态',
`health_time` datetime(0) NULL DEFAULT NULL COMMENT '最近健康时间', `health_time` datetime(0) NULL DEFAULT NULL COMMENT '最近健康时间',
`heartbeat_time` datetime(0) NULL DEFAULT NULL COMMENT '最近心跳检测时间', `heartbeat_time` datetime(0) NULL DEFAULT NULL COMMENT '最近心跳检测时间',
`enabled` tinyint(1) NOT NULL DEFAULT 1 COMMENT '启用', `enabled` tinyint(1) NOT NULL DEFAULT 1 COMMENT '启用',
`create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
`update_time` datetime(0) NULL DEFAULT NULL COMMENT '最近修改时间', `update_time` datetime(0) NULL DEFAULT NULL COMMENT '最近修改时间',
PRIMARY KEY (`id`) USING BTREE, PRIMARY KEY (`id`) USING BTREE,
UNIQUE INDEX `db_index`(`name`) USING BTREE UNIQUE INDEX `db_index`(`name`) USING BTREE
) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic; ) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic;
ALTER TABLE `dlink_cluster` ALTER TABLE `dlink_cluster`
ADD COLUMN `version` varchar(20) NULL COMMENT '版本' AFTER `job_manager_host`; ADD COLUMN `version` varchar(20) NULL COMMENT '版本' AFTER `job_manager_host`;
ALTER TABLE `dlink_flink_document` ALTER TABLE `dlink_flink_document`
ADD COLUMN `fill_value` varchar(255) NULL COMMENT '填充值' AFTER `description`; ADD COLUMN `fill_value` varchar(255) NULL COMMENT '填充值' AFTER `description`;
update dlink_flink_document set fill_value=name; update dlink_flink_document set fill_value=name;
update dlink_flink_document set category='Function' where category='function' ; update dlink_flink_document set category='Function' where category='function' ;
CREATE TABLE `dlink_cluster_configuration` ( CREATE TABLE `dlink_cluster_configuration` (
`id` int(11) NOT NULL AUTO_INCREMENT COMMENT 'ID', `id` int(11) NOT NULL AUTO_INCREMENT COMMENT 'ID',
`name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '名称', `name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '名称',
`alias` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '别名', `alias` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '别名',
`type` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '类型', `type` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '类型',
`config_json` text CHARACTER SET utf8 COLLATE utf8_general_ci COMMENT '配置JSON', `config_json` text CHARACTER SET utf8 COLLATE utf8_general_ci COMMENT '配置JSON',
`is_available` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '是否可用', `is_available` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '是否可用',
`note` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '注释', `note` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '注释',
`enabled` tinyint(1) NOT NULL DEFAULT '1' COMMENT '是否启用', `enabled` tinyint(1) NOT NULL DEFAULT '1' COMMENT '是否启用',
`create_time` datetime DEFAULT NULL COMMENT '创建时间', `create_time` datetime DEFAULT NULL COMMENT '创建时间',
`update_time` datetime DEFAULT NULL COMMENT '更新时间', `update_time` datetime DEFAULT NULL COMMENT '更新时间',
PRIMARY KEY (`id`) PRIMARY KEY (`id`)
) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic; ) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic;
CREATE TABLE `dlink_jar` ( CREATE TABLE `dlink_jar` (
`id` int(11) NOT NULL AUTO_INCREMENT COMMENT 'ID', `id` int(11) NOT NULL AUTO_INCREMENT COMMENT 'ID',
`name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '名称', `name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '名称',
`alias` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '别名', `alias` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '别名',
`type` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '类型', `type` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '类型',
`path` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '文件路径', `path` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '文件路径',
`main_class` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '启动类', `main_class` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '启动类',
`paras` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '启动类入参', `paras` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '启动类入参',
`note` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '注释', `note` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '注释',
`enabled` tinyint(1) NOT NULL DEFAULT '1' COMMENT '是否启用', `enabled` tinyint(1) NOT NULL DEFAULT '1' COMMENT '是否启用',
`create_time` datetime DEFAULT NULL COMMENT '创建时间', `create_time` datetime DEFAULT NULL COMMENT '创建时间',
`update_time` datetime DEFAULT NULL COMMENT '更新时间', `update_time` datetime DEFAULT NULL COMMENT '更新时间',
PRIMARY KEY (`id`) PRIMARY KEY (`id`)
) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic; ) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic;
ALTER TABLE `dlink_task` ALTER TABLE `dlink_task`
ADD COLUMN `cluster_configuration_id` int(11) NULL COMMENT '集群配置ID' AFTER `cluster_id`; ADD COLUMN `cluster_configuration_id` int(11) NULL COMMENT '集群配置ID' AFTER `cluster_id`;
ALTER TABLE `dlink_task` ALTER TABLE `dlink_task`
ADD COLUMN `statement_set` tinyint(1) NULL COMMENT '启用语句集' AFTER `fragment`; ADD COLUMN `statement_set` tinyint(1) NULL COMMENT '启用语句集' AFTER `fragment`;
alter table dlink_history alter table dlink_history
add cluster_configuration_id int(11) null COMMENT '集群配置ID' after cluster_id; add cluster_configuration_id int(11) null COMMENT '集群配置ID' after cluster_id;
CREATE TABLE `dlink_sys_config` ( CREATE TABLE `dlink_sys_config` (
`id` int(11) NOT NULL AUTO_INCREMENT COMMENT 'ID', `id` int(11) NOT NULL AUTO_INCREMENT COMMENT 'ID',
`name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '配置名', `name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '配置名',
`value` text CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '值', `value` text CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '值',
`create_time` datetime DEFAULT NULL COMMENT '创建时间', `create_time` datetime DEFAULT NULL COMMENT '创建时间',
`update_time` datetime DEFAULT NULL COMMENT '更新时间', `update_time` datetime DEFAULT NULL COMMENT '更新时间',
PRIMARY KEY (`id`) PRIMARY KEY (`id`)
) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic; ) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic;
alter table dlink_cluster alter table dlink_cluster
add auto_registers tinyint(1) default 0 null comment '是否自动注册' after note; add auto_registers tinyint(1) default 0 null comment '是否自动注册' after note;
update dlink_cluster set type ='yarn-session' where type ='Yarn'; update dlink_cluster set type ='yarn-session' where type ='Yarn';
update dlink_cluster set type ='standalone' where type ='Standalone'; update dlink_cluster set type ='standalone' where type ='Standalone';
ALTER TABLE `dlink_cluster` ALTER TABLE `dlink_cluster`
ADD COLUMN `cluster_configuration_id` int(11) NULL COMMENT '集群配置ID' AFTER `auto_registers`; ADD COLUMN `cluster_configuration_id` int(11) NULL COMMENT '集群配置ID' AFTER `auto_registers`;
ALTER TABLE `dlink_cluster` ALTER TABLE `dlink_cluster`
ADD COLUMN `task_id` int(11) NULL COMMENT '任务ID' AFTER `cluster_configuration_id`; ADD COLUMN `task_id` int(11) NULL COMMENT '任务ID' AFTER `cluster_configuration_id`;
CREATE TABLE `dlink_savepoints` ( CREATE TABLE `dlink_savepoints` (
`id` int(11) NOT NULL AUTO_INCREMENT COMMENT 'ID', `id` int(11) NOT NULL AUTO_INCREMENT COMMENT 'ID',
`task_id` int(11) NOT NULL COMMENT '任务ID', `task_id` int(11) NOT NULL COMMENT '任务ID',
`name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '名称', `name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '名称',
`type` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '类型', `type` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '类型',
`path` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '路径', `path` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '路径',
`create_time` datetime DEFAULT NULL COMMENT '创建时间', `create_time` datetime DEFAULT NULL COMMENT '创建时间',
PRIMARY KEY (`id`) PRIMARY KEY (`id`)
) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic; ) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic;
ALTER TABLE `dlink_task` ALTER TABLE `dlink_task`
ADD COLUMN `save_point_strategy` int(1) NULL COMMENT 'SavePoint策略' AFTER `check_point`; ADD COLUMN `save_point_strategy` int(1) NULL COMMENT 'SavePoint策略' AFTER `check_point`;
-- ---------------------------- -- ----------------------------
-- 0.4.0-SNAPSHOT 2021-11-24 -- 0.4.0-SNAPSHOT 2021-11-24
-- ---------------------------- -- ----------------------------
ALTER TABLE `dlink_task` ALTER TABLE `dlink_task`
ADD COLUMN `jar_id` int(11) NULL COMMENT 'JarID' AFTER `cluster_configuration_id`; ADD COLUMN `jar_id` int(11) NULL COMMENT 'JarID' AFTER `cluster_configuration_id`;
-- ---------------------------- -- ----------------------------
-- 0.4.0-SNAPSHOT 2021-11-28 -- 0.4.0-SNAPSHOT 2021-11-28
-- ---------------------------- -- ----------------------------
CREATE TABLE `dlink_user` ( CREATE TABLE `dlink_user` (
`id` int(11) NOT NULL AUTO_INCREMENT COMMENT 'ID', `id` int(11) NOT NULL AUTO_INCREMENT COMMENT 'ID',
`username` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '登录名', `username` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '登录名',
`password` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '密码', `password` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '密码',
`nickname` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '昵称', `nickname` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '昵称',
`worknum` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '工号', `worknum` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '工号',
`avatar` blob NULL COMMENT '头像', `avatar` blob NULL COMMENT '头像',
`mobile` varchar(20) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '手机号', `mobile` varchar(20) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '手机号',
`enabled` tinyint(1) NOT NULL DEFAULT 1 COMMENT '是否启用', `enabled` tinyint(1) NOT NULL DEFAULT 1 COMMENT '是否启用',
`is_delete` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否被删除', `is_delete` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否被删除',
`create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
`update_time` datetime(0) NULL DEFAULT NULL COMMENT '更新时间', `update_time` datetime(0) NULL DEFAULT NULL COMMENT '更新时间',
PRIMARY KEY (`id`) PRIMARY KEY (`id`)
) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic; ) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic;
INSERT INTO `dlink_user`(`id`, `username`, `password`, `nickname`, `worknum`, `avatar`, `mobile`, `enabled`, `is_delete`, `create_time`, `update_time`) VALUES (1, 'admin', '21232f297a57a5a743894a0e4a801fc3', 'Admin', NULL, NULL, NULL, 1, 0, '2021-11-28 17:19:27', '2021-11-28 17:19:31'); INSERT INTO `dlink_user`(`id`, `username`, `password`, `nickname`, `worknum`, `avatar`, `mobile`, `enabled`, `is_delete`, `create_time`, `update_time`) VALUES (1, 'admin', '21232f297a57a5a743894a0e4a801fc3', 'Admin', NULL, NULL, NULL, 1, 0, '2021-11-28 17:19:27', '2021-11-28 17:19:31');
...@@ -469,27 +469,27 @@ INSERT INTO `dlink_user`(`id`, `username`, `password`, `nickname`, `worknum`, `a ...@@ -469,27 +469,27 @@ INSERT INTO `dlink_user`(`id`, `username`, `password`, `nickname`, `worknum`, `a
-- 0.4.0 2021-11-29 -- 0.4.0 2021-11-29
-- ---------------------------- -- ----------------------------
ALTER TABLE `dlink_task` ALTER TABLE `dlink_task`
CHANGE COLUMN `config` `config_json` text CHARACTER SET utf8 COLLATE utf8_general_ci NULL COMMENT '配置JSON' AFTER `jar_id`; CHANGE COLUMN `config` `config_json` text CHARACTER SET utf8 COLLATE utf8_general_ci NULL COMMENT '配置JSON' AFTER `jar_id`;
-- ---------------------------- -- ----------------------------
-- 0.5.0-SNAPSHOT 2021-12-13 -- 0.5.0-SNAPSHOT 2021-12-13
-- ---------------------------- -- ----------------------------
ALTER TABLE `dlink_task` ALTER TABLE `dlink_task`
ADD COLUMN `dialect` varchar(50) NULL COMMENT '方言' AFTER `alias`; ADD COLUMN `dialect` varchar(50) NULL COMMENT '方言' AFTER `alias`;
ALTER TABLE `dlink_task` ALTER TABLE `dlink_task`
ADD COLUMN `database_id` int(11) NULL COMMENT '数据源ID' AFTER `cluster_configuration_id`; ADD COLUMN `database_id` int(11) NULL COMMENT '数据源ID' AFTER `cluster_configuration_id`;
-- ---------------------------- -- ----------------------------
-- 0.5.0-SNAPSHOT 2021-12-29 -- 0.5.0-SNAPSHOT 2021-12-29
-- ---------------------------- -- ----------------------------
ALTER TABLE `dlink_task` ALTER TABLE `dlink_task`
ADD COLUMN `env_id` int(11) NULL COMMENT '环境ID' AFTER `jar_id`; ADD COLUMN `env_id` int(11) NULL COMMENT '环境ID' AFTER `jar_id`;
-- ---------------------------- -- ----------------------------
-- 0.6.0-SNAPSHOT 2022-01-28 -- 0.6.0-SNAPSHOT 2022-01-28
-- ---------------------------- -- ----------------------------
ALTER TABLE `dlink_database` ALTER TABLE `dlink_database`
ADD COLUMN `flink_config` text CHARACTER SET utf8 COLLATE utf8_general_ci NULL COMMENT 'Flink配置' AFTER `note`; ADD COLUMN `flink_config` text CHARACTER SET utf8 COLLATE utf8_general_ci NULL COMMENT 'Flink配置' AFTER `note`;
-- ---------------------------- -- ----------------------------
-- 0.6.0-SNAPSHOT 2022-02-02 -- 0.6.0-SNAPSHOT 2022-02-02
...@@ -533,6 +533,11 @@ ALTER TABLE `dlink_task` ...@@ -533,6 +533,11 @@ ALTER TABLE `dlink_task`
-- 0.6.0-SNAPSHOT 2022-02-18 -- 0.6.0-SNAPSHOT 2022-02-18
-- ---------------------------- -- ----------------------------
ALTER TABLE `dlink_database` ALTER TABLE `dlink_database`
ADD COLUMN `flink_template` text CHARACTER SET utf8 COLLATE utf8_general_ci NULL COMMENT 'Flink模板' AFTER `flink_config`; ADD COLUMN `flink_template` text CHARACTER SET utf8 COLLATE utf8_general_ci NULL COMMENT 'Flink模板' AFTER `flink_config`;
-- ----------------------------
-- 0.6.0-SNAPSHOT 2022-02-22
-- ----------------------------
ALTER TABLE `dlink_job_instance` MODIFY COLUMN status varchar(50) NULL COMMENT '实例状态';
SET FOREIGN_KEY_CHECKS = 1; SET FOREIGN_KEY_CHECKS = 1;
...@@ -6,7 +6,7 @@ package com.dlink.parser; ...@@ -6,7 +6,7 @@ package com.dlink.parser;
* @author wenmo * @author wenmo
* @since 2021/7/3 11:11 * @since 2021/7/3 11:11
*/ */
public enum SqlType { public enum SqlType {
SELECT("SELECT"), SELECT("SELECT"),
CREATE("CREATE"), CREATE("CREATE"),
DROP("DROP"), DROP("DROP"),
...@@ -39,7 +39,15 @@ public enum SqlType { ...@@ -39,7 +39,15 @@ public enum SqlType {
return type; return type;
} }
public boolean equalsValue(String value){ public boolean equalsValue(String value) {
return type.equalsIgnoreCase(value); return type.equalsIgnoreCase(value);
} }
public boolean isInsert() {
if (type.equals("INSERT")) {
return true;
}
return false;
}
} }
...@@ -10,15 +10,14 @@ import com.dlink.assertion.Asserts; ...@@ -10,15 +10,14 @@ import com.dlink.assertion.Asserts;
**/ **/
public enum GatewayType { public enum GatewayType {
LOCAL("l","local"),STANDALONE("s","standalone"), LOCAL("l", "local"), STANDALONE("s", "standalone"),
YARN_SESSION("ys","yarn-session"),YARN_APPLICATION("ya","yarn-application"), YARN_SESSION("ys", "yarn-session"), YARN_APPLICATION("ya", "yarn-application"),
YARN_PER_JOB("ypj","yarn-per-job"),KUBERNETES_SESSION("ks","kubernetes-session") YARN_PER_JOB("ypj", "yarn-per-job"), KUBERNETES_SESSION("ks", "kubernetes-session"), KUBERNETES_APPLICATION("ka", "kubernetes-application");
,KUBERNETES_APPLICATION("ka","kubernetes-application");
private String value; private String value;
private String longValue; private String longValue;
GatewayType(String value, String longValue){ GatewayType(String value, String longValue) {
this.value = value; this.value = value;
this.longValue = longValue; this.longValue = longValue;
} }
...@@ -31,24 +30,24 @@ public enum GatewayType { ...@@ -31,24 +30,24 @@ public enum GatewayType {
return longValue; return longValue;
} }
public static GatewayType get(String value){ public static GatewayType get(String value) {
for (GatewayType type : GatewayType.values()) { for (GatewayType type : GatewayType.values()) {
if(Asserts.isEquals(type.getValue(),value)||Asserts.isEquals(type.getLongValue(),value)){ if (Asserts.isEquals(type.getValue(), value) || Asserts.isEquals(type.getLongValue(), value)) {
return type; return type;
} }
} }
return GatewayType.YARN_APPLICATION; return GatewayType.YARN_APPLICATION;
} }
public boolean equalsValue(String type){ public boolean equalsValue(String type) {
if(Asserts.isEquals(value,type)||Asserts.isEquals(longValue,type)){ if (Asserts.isEquals(value, type) || Asserts.isEquals(longValue, type)) {
return true; return true;
} }
return false; return false;
} }
public static boolean isDeployCluster(String type){ public static boolean isDeployCluster(String type) {
switch (get(type)){ switch (get(type)) {
case YARN_APPLICATION: case YARN_APPLICATION:
case YARN_PER_JOB: case YARN_PER_JOB:
case KUBERNETES_APPLICATION: case KUBERNETES_APPLICATION:
...@@ -58,8 +57,8 @@ public enum GatewayType { ...@@ -58,8 +57,8 @@ public enum GatewayType {
} }
} }
public boolean isDeployCluster(){ public boolean isDeployCluster() {
switch (value){ switch (value) {
case "ya": case "ya":
case "ypj": case "ypj":
case "ka": case "ka":
...@@ -68,4 +67,14 @@ public enum GatewayType { ...@@ -68,4 +67,14 @@ public enum GatewayType {
return false; return false;
} }
} }
public boolean isApplicationMode() {
switch (value) {
case "ya":
case "ka":
return true;
default:
return false;
}
}
} }
...@@ -13,9 +13,13 @@ import org.apache.flink.client.program.ClusterClient; ...@@ -13,9 +13,13 @@ import org.apache.flink.client.program.ClusterClient;
import org.apache.flink.client.program.ClusterClientProvider; import org.apache.flink.client.program.ClusterClientProvider;
import org.apache.flink.configuration.PipelineOptions; import org.apache.flink.configuration.PipelineOptions;
import org.apache.flink.kubernetes.KubernetesClusterDescriptor; import org.apache.flink.kubernetes.KubernetesClusterDescriptor;
import org.apache.flink.runtime.client.JobStatusMessage;
import org.apache.flink.runtime.jobgraph.JobGraph; import org.apache.flink.runtime.jobgraph.JobGraph;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections; import java.util.Collections;
import java.util.List;
/** /**
* KubernetesApplicationGateway * KubernetesApplicationGateway
...@@ -36,7 +40,7 @@ public class KubernetesApplicationGateway extends KubernetesGateway { ...@@ -36,7 +40,7 @@ public class KubernetesApplicationGateway extends KubernetesGateway {
@Override @Override
public GatewayResult submitJar() { public GatewayResult submitJar() {
if(Asserts.isNull(client)){ if (Asserts.isNull(client)) {
init(); init();
} }
KubernetesResult result = KubernetesResult.build(getType()); KubernetesResult result = KubernetesResult.build(getType());
...@@ -45,16 +49,24 @@ public class KubernetesApplicationGateway extends KubernetesGateway { ...@@ -45,16 +49,24 @@ public class KubernetesApplicationGateway extends KubernetesGateway {
ClusterSpecification clusterSpecification = new ClusterSpecification.ClusterSpecificationBuilder().createClusterSpecification(); ClusterSpecification clusterSpecification = new ClusterSpecification.ClusterSpecificationBuilder().createClusterSpecification();
ApplicationConfiguration applicationConfiguration = new ApplicationConfiguration(appConfig.getUserJarParas(), appConfig.getUserJarMainAppClass()); ApplicationConfiguration applicationConfiguration = new ApplicationConfiguration(appConfig.getUserJarParas(), appConfig.getUserJarMainAppClass());
KubernetesClusterDescriptor kubernetesClusterDescriptor = new KubernetesClusterDescriptor(configuration, client); KubernetesClusterDescriptor kubernetesClusterDescriptor = new KubernetesClusterDescriptor(configuration, client);
try{ try {
ClusterClientProvider<String> clusterClientProvider = kubernetesClusterDescriptor.deployApplicationCluster(clusterSpecification, applicationConfiguration); ClusterClientProvider<String> clusterClientProvider = kubernetesClusterDescriptor.deployApplicationCluster(clusterSpecification, applicationConfiguration);
ClusterClient<String> clusterClient = clusterClientProvider.getClusterClient(); ClusterClient<String> clusterClient = clusterClientProvider.getClusterClient();
Collection<JobStatusMessage> jobStatusMessages = clusterClient.listJobs().get();
if (jobStatusMessages.size() > 0) {
List<String> jids = new ArrayList<>();
for (JobStatusMessage jobStatusMessage : jobStatusMessages) {
jids.add(jobStatusMessage.getJobId().toHexString());
}
result.setJids(jids);
}
String clusterId = clusterClient.getClusterId(); String clusterId = clusterClient.getClusterId();
result.setClusterId(clusterId); result.setClusterId(clusterId);
result.setWebURL(clusterClient.getWebInterfaceURL()); result.setWebURL(clusterClient.getWebInterfaceURL());
result.success(); result.success();
}catch (Exception e){ } catch (Exception e) {
result.fail(LogUtil.getError(e)); result.fail(LogUtil.getError(e));
}finally { } finally {
kubernetesClusterDescriptor.close(); kubernetesClusterDescriptor.close();
} }
return result; return result;
......
package com.dlink.gateway.result; package com.dlink.gateway.result;
import java.util.List;
/** /**
* GatewayResult * GatewayResult
* *
...@@ -11,4 +13,6 @@ public interface GatewayResult { ...@@ -11,4 +13,6 @@ public interface GatewayResult {
String getAppId(); String getAppId();
String getWebURL(); String getWebURL();
List<String> getJids();
} }
...@@ -3,6 +3,7 @@ package com.dlink.gateway.result; ...@@ -3,6 +3,7 @@ package com.dlink.gateway.result;
import com.dlink.gateway.GatewayType; import com.dlink.gateway.GatewayType;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.util.List;
/** /**
* KubernetesResult * KubernetesResult
...@@ -13,6 +14,7 @@ import java.time.LocalDateTime; ...@@ -13,6 +14,7 @@ import java.time.LocalDateTime;
public class KubernetesResult extends AbstractGatewayResult { public class KubernetesResult extends AbstractGatewayResult {
private String clusterId; private String clusterId;
private String webURL; private String webURL;
private List<String> jids;
public KubernetesResult(GatewayType type, LocalDateTime startTime) { public KubernetesResult(GatewayType type, LocalDateTime startTime) {
super(type, startTime); super(type, startTime);
...@@ -44,6 +46,15 @@ public class KubernetesResult extends AbstractGatewayResult { ...@@ -44,6 +46,15 @@ public class KubernetesResult extends AbstractGatewayResult {
return webURL; return webURL;
} }
@Override
public List<String> getJids() {
return jids;
}
public void setJids(List<String> jids) {
this.jids = jids;
}
public static KubernetesResult build(GatewayType type){ public static KubernetesResult build(GatewayType type){
return new KubernetesResult(type,LocalDateTime.now()); return new KubernetesResult(type,LocalDateTime.now());
} }
......
...@@ -38,6 +38,11 @@ public class SavePointResult extends AbstractGatewayResult { ...@@ -38,6 +38,11 @@ public class SavePointResult extends AbstractGatewayResult {
return null; return null;
} }
@Override
public List<String> getJids() {
return null;
}
public static SavePointResult build(GatewayType type){ public static SavePointResult build(GatewayType type){
return new SavePointResult(type,LocalDateTime.now()); return new SavePointResult(type,LocalDateTime.now());
} }
......
...@@ -5,6 +5,7 @@ import lombok.Getter; ...@@ -5,6 +5,7 @@ import lombok.Getter;
import lombok.Setter; import lombok.Setter;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.util.List;
/** /**
* YarnResult * YarnResult
...@@ -16,6 +17,7 @@ public class YarnResult extends AbstractGatewayResult { ...@@ -16,6 +17,7 @@ public class YarnResult extends AbstractGatewayResult {
private String appId; private String appId;
private String webURL; private String webURL;
private List<String> jids;
public YarnResult(GatewayType type, LocalDateTime startTime) { public YarnResult(GatewayType type, LocalDateTime startTime) {
super(type, startTime); super(type, startTime);
...@@ -42,6 +44,14 @@ public class YarnResult extends AbstractGatewayResult { ...@@ -42,6 +44,14 @@ public class YarnResult extends AbstractGatewayResult {
this.webURL = webURL; this.webURL = webURL;
} }
public List<String> getJids() {
return jids;
}
public void setJids(List<String> jids) {
this.jids = jids;
}
public static YarnResult build(GatewayType type){ public static YarnResult build(GatewayType type){
return new YarnResult(type,LocalDateTime.now()); return new YarnResult(type,LocalDateTime.now());
} }
......
...@@ -13,12 +13,16 @@ import org.apache.flink.client.deployment.application.ApplicationConfiguration; ...@@ -13,12 +13,16 @@ import org.apache.flink.client.deployment.application.ApplicationConfiguration;
import org.apache.flink.client.program.ClusterClient; import org.apache.flink.client.program.ClusterClient;
import org.apache.flink.client.program.ClusterClientProvider; import org.apache.flink.client.program.ClusterClientProvider;
import org.apache.flink.configuration.PipelineOptions; import org.apache.flink.configuration.PipelineOptions;
import org.apache.flink.runtime.client.JobStatusMessage;
import org.apache.flink.runtime.jobgraph.JobGraph; import org.apache.flink.runtime.jobgraph.JobGraph;
import org.apache.flink.yarn.YarnClientYarnClusterInformationRetriever; import org.apache.flink.yarn.YarnClientYarnClusterInformationRetriever;
import org.apache.flink.yarn.YarnClusterDescriptor; import org.apache.flink.yarn.YarnClusterDescriptor;
import org.apache.hadoop.yarn.api.records.ApplicationId; import org.apache.hadoop.yarn.api.records.ApplicationId;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections; import java.util.Collections;
import java.util.List;
/** /**
* YarnApplicationGateway * YarnApplicationGateway
...@@ -44,10 +48,10 @@ public class YarnApplicationGateway extends YarnGateway { ...@@ -44,10 +48,10 @@ public class YarnApplicationGateway extends YarnGateway {
public GatewayResult submitJobGraph(JobGraph jobGraph) { public GatewayResult submitJobGraph(JobGraph jobGraph) {
throw new GatewayException("Couldn't deploy Yarn Application Cluster with job graph."); throw new GatewayException("Couldn't deploy Yarn Application Cluster with job graph.");
} }
@Override @Override
public GatewayResult submitJar() { public GatewayResult submitJar() {
if(Asserts.isNull(yarnClient)){ if (Asserts.isNull(yarnClient)) {
init(); init();
} }
YarnResult result = YarnResult.build(getType()); YarnResult result = YarnResult.build(getType());
...@@ -62,13 +66,21 @@ public class YarnApplicationGateway extends YarnGateway { ...@@ -62,13 +66,21 @@ public class YarnApplicationGateway extends YarnGateway {
clusterSpecification, clusterSpecification,
applicationConfiguration); applicationConfiguration);
ClusterClient<ApplicationId> clusterClient = clusterClientProvider.getClusterClient(); ClusterClient<ApplicationId> clusterClient = clusterClientProvider.getClusterClient();
Collection<JobStatusMessage> jobStatusMessages = clusterClient.listJobs().get();
if (jobStatusMessages.size() > 0) {
List<String> jids = new ArrayList<>();
for (JobStatusMessage jobStatusMessage : jobStatusMessages) {
jids.add(jobStatusMessage.getJobId().toHexString());
}
result.setJids(jids);
}
ApplicationId applicationId = clusterClient.getClusterId(); ApplicationId applicationId = clusterClient.getClusterId();
result.setAppId(applicationId.toString()); result.setAppId(applicationId.toString());
result.setWebURL(clusterClient.getWebInterfaceURL()); result.setWebURL(clusterClient.getWebInterfaceURL());
result.success(); result.success();
}catch (Exception e){ } catch (Exception e) {
result.fail(LogUtil.getError(e)); result.fail(LogUtil.getError(e));
}finally { } finally {
yarnClusterDescriptor.close(); yarnClusterDescriptor.close();
} }
return result; return result;
......
package com.dlink.gateway.yarn; package com.dlink.gateway.yarn;
import com.dlink.assertion.Asserts; import com.dlink.assertion.Asserts;
import com.dlink.gateway.config.GatewayConfig;
import com.dlink.gateway.GatewayType; import com.dlink.gateway.GatewayType;
import com.dlink.gateway.config.GatewayConfig;
import com.dlink.gateway.exception.GatewayException; import com.dlink.gateway.exception.GatewayException;
import com.dlink.gateway.result.GatewayResult; import com.dlink.gateway.result.GatewayResult;
import com.dlink.gateway.result.YarnResult; import com.dlink.gateway.result.YarnResult;
...@@ -10,11 +10,16 @@ import com.dlink.utils.LogUtil; ...@@ -10,11 +10,16 @@ import com.dlink.utils.LogUtil;
import org.apache.flink.client.deployment.ClusterSpecification; import org.apache.flink.client.deployment.ClusterSpecification;
import org.apache.flink.client.program.ClusterClient; import org.apache.flink.client.program.ClusterClient;
import org.apache.flink.client.program.ClusterClientProvider; import org.apache.flink.client.program.ClusterClientProvider;
import org.apache.flink.runtime.client.JobStatusMessage;
import org.apache.flink.runtime.jobgraph.JobGraph; import org.apache.flink.runtime.jobgraph.JobGraph;
import org.apache.flink.yarn.YarnClientYarnClusterInformationRetriever; import org.apache.flink.yarn.YarnClientYarnClusterInformationRetriever;
import org.apache.flink.yarn.YarnClusterDescriptor; import org.apache.flink.yarn.YarnClusterDescriptor;
import org.apache.hadoop.yarn.api.records.ApplicationId; import org.apache.hadoop.yarn.api.records.ApplicationId;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
/** /**
* YarnApplicationGateway * YarnApplicationGateway
* *
...@@ -37,7 +42,7 @@ public class YarnPerJobGateway extends YarnGateway { ...@@ -37,7 +42,7 @@ public class YarnPerJobGateway extends YarnGateway {
@Override @Override
public GatewayResult submitJobGraph(JobGraph jobGraph) { public GatewayResult submitJobGraph(JobGraph jobGraph) {
if(Asserts.isNull(yarnClient)){ if (Asserts.isNull(yarnClient)) {
init(); init();
} }
YarnResult result = YarnResult.build(getType()); YarnResult result = YarnResult.build(getType());
...@@ -45,15 +50,23 @@ public class YarnPerJobGateway extends YarnGateway { ...@@ -45,15 +50,23 @@ public class YarnPerJobGateway extends YarnGateway {
YarnClusterDescriptor yarnClusterDescriptor = new YarnClusterDescriptor( YarnClusterDescriptor yarnClusterDescriptor = new YarnClusterDescriptor(
configuration, yarnConfiguration, yarnClient, YarnClientYarnClusterInformationRetriever.create(yarnClient), true); configuration, yarnConfiguration, yarnClient, YarnClientYarnClusterInformationRetriever.create(yarnClient), true);
try { try {
ClusterClientProvider<ApplicationId> clusterClientProvider = yarnClusterDescriptor.deployJobCluster(clusterSpecification,jobGraph,false); ClusterClientProvider<ApplicationId> clusterClientProvider = yarnClusterDescriptor.deployJobCluster(clusterSpecification, jobGraph, false);
ClusterClient<ApplicationId> clusterClient = clusterClientProvider.getClusterClient(); ClusterClient<ApplicationId> clusterClient = clusterClientProvider.getClusterClient();
ApplicationId applicationId = clusterClient.getClusterId(); ApplicationId applicationId = clusterClient.getClusterId();
result.setAppId(applicationId.toString()); result.setAppId(applicationId.toString());
result.setWebURL(clusterClient.getWebInterfaceURL()); result.setWebURL(clusterClient.getWebInterfaceURL());
Collection<JobStatusMessage> jobStatusMessages = clusterClient.listJobs().get();
if (jobStatusMessages.size() > 0) {
List<String> jids = new ArrayList<>();
for (JobStatusMessage jobStatusMessage : jobStatusMessages) {
jids.add(jobStatusMessage.getJobId().toHexString());
}
result.setJids(jids);
}
result.success(); result.success();
}catch (Exception e){ } catch (Exception e) {
result.fail(LogUtil.getError(e)); result.fail(LogUtil.getError(e));
}finally { } finally {
yarnClusterDescriptor.close(); yarnClusterDescriptor.close();
} }
return result; return result;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment