Skip to content

Commit d7e0d0b

Browse files
author
v_xiangbiaowu
committed
Merge remote-tracking branch 'origin/dev-0.2.0-webank' into dev-0.2.0-webank
2 parents 87c369e + c4d932a commit d7e0d0b

File tree

3 files changed

+62
-71
lines changed

3 files changed

+62
-71
lines changed

‎db/streamis_ddl.sql‎

Lines changed: 39 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -2,51 +2,47 @@
22
SET NAMES utf8mb4;
33
SET FOREIGN_KEY_CHECKS = 0;
44

5-
-- ----------------------------
6-
-- Table structure for linkis_stream_configuration_config_key
7-
-- ----------------------------
8-
DROP TABLE IF EXISTS `linkis_stream_configuration_config_key`;
9-
CREATE TABLE `linkis_stream_configuration_config_key` (
10-
`id` bigint(20) NOT NULL,
11-
`key` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
12-
`name` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
13-
`description` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
14-
`default_value` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
15-
`validate_type` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
16-
`validate_range` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
17-
`is_hidden` tinyint(1) NULL DEFAULT NULL,
18-
`is_advanced` tinyint(1) NULL DEFAULT NULL,
19-
`level` tinyint(1) NULL DEFAULT NULL,
20-
`treename` varchar(20) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
21-
`type` int(10) NULL DEFAULT NULL,
22-
`sort` int(10) NULL DEFAULT NULL,
23-
`status` tinyint(10) NULL DEFAULT NULL COMMENT '1 custom , 2 selected ',
24-
PRIMARY KEY (`id`) USING BTREE,
25-
UNIQUE INDEX `key_index`(`key`) USING BTREE
26-
) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '配置信息' ROW_FORMAT = Compact;
5+
--
6+
-- Table structure for table `linkis_stream_job_config_def`
7+
--
278

28-
29-
-- ----------------------------
30-
-- Table structure for linkis_stream_configuration_config_value
31-
-- ----------------------------
32-
DROP TABLE IF EXISTS `linkis_stream_configuration_config_value`;
33-
CREATE TABLE `linkis_stream_configuration_config_value` (
9+
DROP TABLE IF EXISTS `linkis_stream_job_config_def`;
10+
CREATE TABLE `linkis_stream_job_config_def` (
3411
`id` bigint(20) NOT NULL AUTO_INCREMENT,
35-
`configkey_id` bigint(20) NULL DEFAULT NULL,
36-
`config_value` varchar(500) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
37-
`type` int(10) NULL DEFAULT NULL,
38-
`job_id` bigint(20) NULL DEFAULT NULL,
39-
`job_name` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
40-
`config_key` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
41-
PRIMARY KEY (`id`) USING BTREE,
42-
INDEX `key`(`config_key`) USING BTREE,
43-
INDEX `keyid`(`configkey_id`) USING BTREE
44-
) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '配置信息' ROW_FORMAT = Compact;
45-
46-
-- ----------------------------
47-
-- Records of linkis_stream_configuration_config_value
48-
-- ----------------------------
49-
12+
`key` varchar(100) COLLATE utf8_bin NOT NULL,
13+
`name` varchar(100) COLLATE utf8_bin DEFAULT NULL COMMENT 'Equals option',
14+
`type` varchar(50) COLLATE utf8_bin NOT NULL DEFAULT 'NONE' COMMENT 'def type, NONE: 0, INPUT: 1, SELECT: 2',
15+
`sort` int(10) DEFAULT '0' COMMENT 'In order to sort the configurations that have the same level',
16+
`description` varchar(200) COLLATE utf8_bin DEFAULT NULL COMMENT 'Description of configuration',
17+
`validate_type` varchar(50) COLLATE utf8_bin DEFAULT NULL COMMENT 'Method the validate the configuration',
18+
`validate_rule` varchar(100) COLLATE utf8_bin DEFAULT NULL COMMENT 'Value of validation rule',
19+
`style` varchar(200) COLLATE utf8_bin DEFAULT '' COMMENT 'Display style',
20+
`visiable` tinyint(1) NOT NULL DEFAULT '1' COMMENT '0: hidden, 1: display',
21+
`level` tinyint(1) NOT NULL DEFAULT '1' COMMENT '0: root, 1: leaf',
22+
`unit` varchar(25) COLLATE utf8_bin DEFAULT NULL COMMENT 'Unit symbol',
23+
`default_value` varchar(200) COLLATE utf8_bin DEFAULT NULL COMMENT 'Default value',
24+
`ref_values` varchar(200) COLLATE utf8_bin DEFAULT '',
25+
`parent_ref` bigint(20) DEFAULT NULL COMMENT 'Parent key of configuration def',
26+
`required` tinyint(1) NOT NULL DEFAULT '0' COMMENT 'If the value of configuration is necessary',
27+
`is_temp` tinyint(1) DEFAULT '0' COMMENT 'Temp configuration',
28+
PRIMARY KEY (`id`),
29+
UNIQUE KEY `config_def_key` (`key`)
30+
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin;
31+
32+
--
33+
-- Table structure for table `linkis_stream_job_config`
34+
--
35+
36+
DROP TABLE IF EXISTS `linkis_stream_job_config`;
37+
CREATE TABLE `linkis_stream_job_config` (
38+
`job_id` bigint(20) NOT NULL,
39+
`job_name` varchar(200) COLLATE utf8_bin NOT NULL COMMENT 'Just store the job name',
40+
`key` varchar(100) COLLATE utf8_bin NOT NULL,
41+
`value` varchar(500) COLLATE utf8_bin NOT NULL,
42+
`ref_def_id` bigint(20) DEFAULT NULL COMMENT 'Refer to id in config_def table',
43+
PRIMARY KEY (`job_id`,`key`),
44+
KEY `config_def_id` (`ref_def_id`)
45+
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin;
5046

5147
-- ----------------------------
5248
-- Table structure for linkis_stream_job_alarm_send_history

‎db/streamis_dml.sql‎

Lines changed: 23 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,25 @@
11
-- ----------------------------
2-
-- Records of linkis_stream_configuration_config_key
2+
-- Records of linkis_stream_job_config_def
33
-- ----------------------------
4-
INSERT INTO `linkis_stream_configuration_config_key` VALUES (1, 'wds.linkis.flink.resource', '资源配置', '资源配置', NULL, 'None', NULL, 0, 0, 1, '资源配置', 1, 0, 1);
5-
INSERT INTO `linkis_stream_configuration_config_key` VALUES (2, 'wds.linkis.flink.taskmanager.num', 'Task Managers数量', 'Task Managers数量', '4', 'Regex', '^(?:[1-9]\\d?|[1234]\\d{2}|128)$', 0, 0, 2, '资源配置', 1, 1, 1);
6-
INSERT INTO `linkis_stream_configuration_config_key` VALUES (3, 'wds.linkis.flink.jobmanager.memory', 'JobManager Memory', 'JobManager Memory', '1.5', 'Regex', '^([1-9]\\d{0,2}|1000)(G|g)$', 0, 0, 2, '资源配置', 1, 2, 1);
7-
INSERT INTO `linkis_stream_configuration_config_key` VALUES (4, 'wds.linkis.flink.taskmanager.memory', 'TaskManager Memory', 'TaskManager Memory', '1.5', 'Regex', '^([1-9]\\d{0,2}|1000)(G|g)$', 0, 0, 2, '资源配置', 1, 3, 1);
8-
INSERT INTO `linkis_stream_configuration_config_key` VALUES (5, 'wds.linkis.flink.jobmanager.cpus', 'JobManager CPUs', 'JobManager CPUs', '1', 'Regex', '^(?:[1-9]\\d?|[1234]\\d{2}|128)$', 0, 0, 2, '资源配置', 1, 4, 1);
9-
INSERT INTO `linkis_stream_configuration_config_key` VALUES (6, 'wds.linkis.flink.taskManager.cpus', 'TaskManager CPUs', 'TaskManager CPUs', '1', 'Regex', '^(?:[1-9]\\d?|[1234]\\d{2}|128)$', 0, 0, 2, '资源配置', 1, 5, 1);
10-
INSERT INTO `linkis_stream_configuration_config_key` VALUES (7, 'wds.linkis.flink.custom', '自定义参数', '自定义参数', NULL, 'None', NULL, 0, 0, 1, '自定义参数', 2, 0, 1);
11-
INSERT INTO `linkis_stream_configuration_config_key` VALUES (8, 'wds.linkis.flink.produce', '生产配置', '生产配置', NULL, 'None', NULL, 0, 0, 1, '生产配置', 3, 0, 1);
12-
INSERT INTO `linkis_stream_configuration_config_key` VALUES (9, 'wds.linkis.flink.checkpoint.interval', 'Checkpoint间隔', 'Checkpoint间隔', NULL, NULL, NULL, 0, 0, 2, '生产配置', 3, 1, 1);
13-
INSERT INTO `linkis_stream_configuration_config_key` VALUES (10, 'wds.linkis.flink.reboot.strategy', '重启策略', '重启策略', '不重启,基于Checkpoint自动重启,无Checkpoint不重启', 'None', NULL, 0, 0, 2, '重启策略', 3, 2, 2);
14-
INSERT INTO `linkis_stream_configuration_config_key` VALUES (11, 'wds.linkis.flink.alert', '告警设置', '告警设置', NULL, 'None', NULL, 0, 0, 1, '告警设置', 4, 0, 1);
15-
INSERT INTO `linkis_stream_configuration_config_key` VALUES (12, 'wds.linkis.flink.alert.rule', '告警规则', '告警规则', '任务日志中出现ERROR/EXCEPTION,任务核心指标出现异常', 'None', NULL, 0, 0, 2, '告警规则', 4, 1, 2);
16-
INSERT INTO `linkis_stream_configuration_config_key` VALUES (13, 'wds.linkis.flink.alert.user', '告警用户', '告警用户', NULL, NULL, NULL, 0, 0, 2, '告警用户', 4, 3, 1);
17-
INSERT INTO `linkis_stream_configuration_config_key` VALUES (14, 'wds.linkis.flink.alert.leve', '告警级别', '告警级别', 'CLEARED,INDETERMINATE,WARNING,MINOR,MAJOR,CRITICAL', 'None', NULL, 0, 0, 2, '告警级别', 4, 2, 2);
18-
INSERT INTO `linkis_stream_configuration_config_key` VALUES (15, 'wds.linkis.flink.alert.failure.level', '失败时告警级别', '失败时告警级别', 'CLEARED,INDETERMINATE,WARNING,MINOR,MAJOR,CRITICAL', 'None', NULL, 0, 0, 2, '失败时告警级别', 4, 4, 2);
19-
INSERT INTO `linkis_stream_configuration_config_key` VALUES (16, 'wds.linkis.flink.alert.failure.user', '失败时告警用户', '失败时告警用户', NULL, 'None', NULL, 0, 0, 2, '失败时告警用户', 4, 5, 1);
20-
INSERT INTO `linkis_stream_configuration_config_key` VALUES (17, 'wds.linkis.flink.authority', '权限设置', '权限设置', NULL, 'None', NULL, 0, 0, 1, '权限设置', 5, 0, 1);
21-
INSERT INTO `linkis_stream_configuration_config_key` VALUES (18, 'wds.linkis.flink.authority.author', '授权模式', '授权模式', '私密,指定全员可见,指定人员可见', 'None', NULL, 0, 0, 2, '授权模式', 5, 1, 2);
22-
INSERT INTO `linkis_stream_configuration_config_key` VALUES (19, 'wds.linkis.flink.authority.visible', '可见人员', '可见人员', NULL, 'None', NULL, 0, 0, 2, '可见人员', 5, 2, 1);
4+
5+
INSERT INTO `linkis_stream_job_config_def` VALUES (1,'wds.linkis.flink.resource','资源配置','NONE',0,'资源配置','None',NULL,'',1,0,NULL,NULL,'',NULL,0,0);
6+
INSERT INTO `linkis_stream_job_config_def` VALUES (2,'wds.linkis.flink.app.parallelism','Parallelism并行度','NUMBER',0,'Parallelism并行度','Regex','^([1-9]\\d{0,1}|100)$','',1,1,NULL,'4','',1,1,0);
7+
INSERT INTO `linkis_stream_job_config_def` VALUES (3,'wds.linkis.flink.jobmanager.memory','JobManager Memory (M)','NUMBER',0,'JobManager Memory (M)','Regex','^([1-9]\\d{0,4}|100000)$','',1,1,'M','1024','',1,1,0);
8+
INSERT INTO `linkis_stream_job_config_def` VALUES (4,'wds.linkis.flink.taskmanager.memory','TaskManager Memory (M)','NUMBER',0,'JobManager Memory (M)','Regex','^([1-9]\\d{0,4}|100000)$','',1,1,'M','4096','',1,1,0);
9+
INSERT INTO `linkis_stream_job_config_def` VALUES (5,'wds.linkis.flink.taskmanager.numberOfTaskSlots','TaskManager Slot数量','NUMBER',0,'TaskManager Slot数量','Regex','^([1-9]\\d{0,1}|100)$','',1,1,NULL,'2','',1,1,0);
10+
INSERT INTO `linkis_stream_job_config_def` VALUES (6,'wds.linkis.flink.taskmanager.cpus','TaskManager CPUs','NUMBER',0,'TaskManager CPUs','Regex','^([1-9]\\d{0,1}|100)$','',1,1,NULL,'2','',1,1,0);
11+
INSERT INTO `linkis_stream_job_config_def` VALUES (7,'wds.linkis.flink.custom','Flink参数','NONE',0,'Flink自定义参数','None',NULL,'',1,0,NULL,NULL,'',NULL,0,0);
12+
INSERT INTO `linkis_stream_job_config_def` VALUES (8,'wds.linkis.flink.produce','生产配置','NONE',0,'生产配置','None',NULL,'',1,0,NULL,NULL,'',NULL,0,0);
13+
INSERT INTO `linkis_stream_job_config_def` VALUES (9,'wds.linkis.flink.checkpoint.switch','Checkpoint开关','SELECT',0,'Checkpoint开关',NULL,NULL,'',1,1,'','OFF','ON,OFF',8,0,0);
14+
INSERT INTO `linkis_stream_job_config_def` VALUES (10,'wds.linkis.flink.savepoint.path','快照(Savepoint)文件位置【仅需恢复任务时指定】','INPUT',4,'快照(Savepoint)文件位置','None',NULL,'',1,1,NULL,NULL,'',8,0,1);
15+
INSERT INTO `linkis_stream_job_config_def` VALUES (11,'wds.linkis.flink.alert','告警设置','NONE',0,'告警设置','None',NULL,'',1,1,NULL,NULL,'',NULL,0,0);
16+
INSERT INTO `linkis_stream_job_config_def` VALUES (12,'wds.linkis.flink.alert.rule','告警规则','NONE',0,'告警规则','None',NULL,'',1,1,NULL,NULL,'',NULL,0,0);
17+
INSERT INTO `linkis_stream_job_config_def` VALUES (13,'wds.linkis.flink.alert.user','告警用户','NONE',0,'告警用户',NULL,NULL,'',1,1,NULL,NULL,'',NULL,0,0);
18+
INSERT INTO `linkis_stream_job_config_def` VALUES (14,'wds.linkis.flink.alert.level','告警级别','NONE',0,'告警级别','None',NULL,'',1,1,NULL,NULL,'',NULL,0,0);
19+
INSERT INTO `linkis_stream_job_config_def` VALUES (15,'wds.linkis.flink.alert.failure.level','失败时告警级别','NONE',0,'失败时告警级别','None',NULL,'',1,1,NULL,NULL,'',NULL,0,0);
20+
INSERT INTO `linkis_stream_job_config_def` VALUES (16,'wds.linkis.flink.alert.failure.user','失败时告警用户','NONE',0,'失败时告警用户','None',NULL,'',1,1,NULL,NULL,'',NULL,0,0);
21+
INSERT INTO `linkis_stream_job_config_def` VALUES (32,'wds.linkis.flink.authority','权限设置','NONE',0,'权限设置','None',NULL,'',1,0,NULL,NULL,'',NULL,0,0);
22+
INSERT INTO `linkis_stream_job_config_def` VALUES (33,'wds.linkis.flink.authority.visible','可见人员','INPUT',0,'可见人员','None',NULL,'',1,1,NULL,NULL,'',32,0,0);
23+
INSERT INTO `linkis_stream_job_config_def` VALUES (34,'wds.linkis.rm.yarnqueue','使用Yarn队列','INPUT',0,'使用Yarn队列','None',NULL,'',1,1,NULL,NULL,'',1,0,0);
24+
INSERT INTO `linkis_stream_job_config_def` VALUES (35,'wds.linkis.flink.app.fail-restart.switch','作业失败自动拉起开关','SELECT',1,'作业失败自动拉起开关','None',NULL,'',1,1,NULL,'OFF','ON,OFF',8,0,0);
25+
INSERT INTO `linkis_stream_job_config_def` VALUES (36,'wds.linkis.flink.app.start-auto-restore.switch','作业启动状态自恢复','SELECT',2,'作业启动状态自恢复','None',NULL,'',1,1,NULL,'ON','ON,OFF',8,0,0);

‎streamis-server/src/main/resources/linkis.properties‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -31,17 +31,14 @@ wds.linkis.server.version=v1
3131

3232
##restful
3333
wds.linkis.server.restful.scan.packages=com.webank.wedatasphere.streamis.datasource.server.restful.api,\
34-
com.webank.wedatasphere.streamis.workflow.server.restful,\
3534
com.webank.wedatasphere.streamis.project.server.restful,\
3635
com.webank.wedatasphere.streamis.jobmanager.restful.api,\
3736
com.webank.wedatasphere.streamis.datasource.execute.rest,\
3837
com.webank.wedatasphere.streamis.projectmanager.restful.api
3938
##mybatis
4039
wds.linkis.server.mybatis.mapperLocations=\
4140
classpath*:com/webank/wedatasphere/streamis/datasource/manager/dao/impl/*.xml,\
42-
classpath*:com/webank/wedatasphere/dss/workflow/dao/impl/*.xml,\
4341
classpath*:com/webank/wedatasphere/streamis/project/server/dao/impl/*.xml,\
44-
classpath*:com/webank/wedatasphere/dss/framework/appconn/dao/impl/*.xml,\
4542
classpath*:com/webank/wedatasphere/streamis/jobmanager/launcher/dao/impl/*.xml,\
4643
classpath*:com/webank/wedatasphere/streamis/jobmanager/manager/dao/impl/*.xml,\
4744
classpath*:com/webank/wedatasphere/streamis/projectmanager/dao/impl/*.xml
@@ -51,17 +48,12 @@ wds.linkis.server.mybatis.typeAliasesPackage=com.webank.wedatasphere.streamis.da
5148
com.webank.wedatasphere.streamis.jobmanager.manager.entity,\
5249
com.webank.wedatasphere.streamis.jobmanager.manager.entity.vo,\
5350
com.webank.wedatasphere.streamis.jobmanager.launcher.entity.vo,\
54-
com.webank.wedatasphere.dss.workflow.common.entity,\
55-
com.webank.wedatasphere.dss.framework.appconn.entity,\
56-
com.webank.wedatasphere.streamis.jobmanager.launcher.entity.dto,\
5751
com.webank.wedatasphere.streamis.projectmanager.entity
5852

5953

6054
wds.linkis.server.mybatis.BasePackage=com.webank.wedatasphere.streamis.datasource.manager.dao,\
6155
org.apache.linkis.bml.dao,\
6256
com.webank.wedatasphere.streamis.project.server.dao,\
63-
com.webank.wedatasphere.dss.workflow.dao,\
64-
com.webank.wedatasphere.dss.framework.appconn.dao,\
6557
com.webank.wedatasphere.streamis.jobmanager.launcher.dao,\
6658
com.webank.wedatasphere.streamis.jobmanager.manager.dao,\
6759
com.webank.wedatasphere.streamis.projectmanager.dao

0 commit comments

Comments
 (0)