Skip to content

Commit 5b22627

Browse files
committed
Optimize init sql to adapt all version mysql.
1 parent 999ecd2 commit 5b22627

File tree

5 files changed

+27
-57
lines changed

5 files changed

+27
-57
lines changed

db/dss_ddl.sql

Lines changed: 8 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,11 @@ CREATE TABLE `dss_appconn_instance` (
2525
PRIMARY KEY (`id`)
2626
) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4 COMMENT='dss instance的实例表';
2727

28-
28+
/*
2929
---------------------------------------------------------------------
3030
------------------- DSS Orchestrator Framework ---------------------
3131
---------------------------------------------------------------------
32+
*/
3233

3334
DROP TABLE IF EXISTS `dss_orchestrator_info`;
3435
CREATE TABLE `dss_orchestrator_info` (
@@ -81,10 +82,11 @@ CREATE TABLE `dss_orchestrator_ref_orchestration_relation` (
8182
PRIMARY KEY (`id`)
8283
) ENGINE=InnoDB AUTO_INCREMENT=326 DEFAULT CHARSET=utf8mb4 ROW_FORMAT=COMPACT;
8384

84-
85+
/*
8586
---------------------------------------------------------------------
8687
------------------- DSS Project Framework ---------------------
8788
---------------------------------------------------------------------
89+
*/
8890

8991
DROP TABLE IF EXISTS `dss_project`;
9092
CREATE TABLE `dss_project` (
@@ -139,9 +141,11 @@ CREATE TABLE `dss_appconn_project_relation` (
139141
PRIMARY KEY (`id`) USING BTREE
140142
) ENGINE=InnoDB AUTO_INCREMENT=90 DEFAULT CHARSET=utf8mb4 ROW_FORMAT=COMPACT;
141143

144+
/*
142145
---------------------------------------------------------------------
143146
--------------------- DSS Workspace Framework ----------------------
144147
---------------------------------------------------------------------
148+
*/
145149

146150
DROP TABLE IF EXISTS `dss_workspace`;
147151
CREATE TABLE `dss_workspace` (
@@ -304,9 +308,11 @@ CREATE TABLE `dss_workspace_download_audit` (
304308
PRIMARY KEY (`id`)
305309
) ENGINE = INNODB DEFAULT CHARSET = utf8 COMMENT = '文件下载审计';
306310

311+
/*
307312
---------------------------------------------------------------------
308313
--------------------------- DSS Workflow ---------------------------
309314
---------------------------------------------------------------------
315+
*/
310316

311317
DROP TABLE IF EXISTS `dss_workflow`;
312318
CREATE TABLE `dss_workflow` (
@@ -558,17 +564,6 @@ CREATE TABLE `dss_workspace_menu_appconn` (
558564
PRIMARY KEY (`id`)
559565
) ENGINE=InnoDB AUTO_INCREMENT=14 DEFAULT CHARSET=utf8;
560566

561-
--DROP TABLE IF EXISTS `dss_workspace_user`; -- delete this table
562-
--CREATE TABLE `dss_workspace_user` (
563-
-- `id` bigint(20) NOT NULL AUTO_INCREMENT,
564-
-- `workspace_id` bigint(20) DEFAULT NULL,
565-
-- `username` varchar(32) DEFAULT NULL,
566-
-- `join_time` datetime DEFAULT NULL,
567-
-- `created_by` varchar(255) DEFAULT NULL,
568-
-- `user_id` bigint(20) DEFAULT NULL,
569-
-- PRIMARY KEY (`id`),
570-
-- UNIQUE KEY `workspace_id` (`workspace_id`,`username`)
571-
--) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 comment '空间用户表';
572567

573568
DROP TABLE IF EXISTS `dss_workspace_user_role`; -- use this table
574569
CREATE TABLE `dss_workspace_user_role` (
@@ -583,29 +578,6 @@ CREATE TABLE `dss_workspace_user_role` (
583578
) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 comment '空间用户角色关系表';
584579

585580

586-
587-
--DROP TABLE IF EXISTS `event_queue`;
588-
--CREATE TABLE `event_queue` (
589-
-- `msg_id` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT '消息ID号',
590-
-- `sender` varchar(45) NOT NULL COMMENT '消息发送者',
591-
-- `send_time` datetime NOT NULL COMMENT '消息发送时间',
592-
-- `topic` varchar(45) NOT NULL COMMENT '消息主题',
593-
-- `msg_name` varchar(45) NOT NULL COMMENT '消息名称',
594-
-- `msg` varchar(250) DEFAULT NULL COMMENT '消息内容',
595-
-- `send_ip` varchar(45) NOT NULL,
596-
-- PRIMARY KEY (`msg_id`)
597-
--) ENGINE=InnoDB AUTO_INCREMENT=21068 DEFAULT CHARSET=utf8 COMMENT='azkaban调取系统消息队列表';
598-
--
599-
--DROP TABLE IF EXISTS `event_status`;
600-
--CREATE TABLE `event_status` (
601-
-- `receiver` varchar(45) NOT NULL COMMENT '消息接收者',
602-
-- `receive_time` datetime NOT NULL COMMENT '消息接收时间',
603-
-- `topic` varchar(45) NOT NULL COMMENT '消息主题',
604-
-- `msg_name` varchar(45) NOT NULL COMMENT '消息名称',
605-
-- `msg_id` int(11) NOT NULL COMMENT '消息的最大消费id',
606-
-- PRIMARY KEY (`receiver`,`topic`,`msg_name`)
607-
--) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='消息消费状态表';
608-
609581
DROP TABLE IF EXISTS `dss_proxy_user`;
610582
CREATE TABLE `dss_proxy_user` (
611583
`id` int(11) NOT NULL AUTO_INCREMENT,

db/dss_dml.sql

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -42,16 +42,16 @@ insert into `dss_workspace_dictionary`(`workspace_id`, `parent_key`, `dic_name`,
4242

4343
DELETE FROM dss_sidebar;
4444
insert into `dss_sidebar`(`id`,`workspace_id`,`name`,`name_en`,`title`,`title_en`,`type`,`order_num`,`remark`,`create_user`,`create_time`,`update_user`,`update_time`) values (2,0,'菜单','Menu','菜单','Menu',1,1,NULL,'SYSTEM','2020-12-15 13:21:06',NULL,'2021-02-23 09:45:50');
45-
--insert into `dss_sidebar`(`id`,`workspace_id`,`name`,`name_en`,`title`,`title_en`,`type`,`order_num`,`remark`,`create_user`,`create_time`,`update_user`,`update_time`) values (3,0,'常见问题','Common problem','常见问题','Common problem',1,1,NULL,'SYSTEM','2020-12-15 13:21:06',NULL,'2021-02-23 09:46:18');
45+
-- insert into `dss_sidebar`(`id`,`workspace_id`,`name`,`name_en`,`title`,`title_en`,`type`,`order_num`,`remark`,`create_user`,`create_time`,`update_user`,`update_time`) values (3,0,'常见问题','Common problem','常见问题','Common problem',1,1,NULL,'SYSTEM','2020-12-15 13:21:06',NULL,'2021-02-23 09:46:18');
4646

4747
DELETE FROM dss_sidebar_content;
4848
insert into `dss_sidebar_content`(`id`,`workspace_id`,`sidebar_id`,`name`,`name_en`,`title`,`title_en`,`url`,`url_type`,`icon`,`order_num`,`remark`,`create_user`,`create_time`,`update_user`,`update_time`) values (3,0,2,NULL,NULL,'工作空间管理','Workspace management','/workspaceManagement/productsettings',0,'menuIcon',1,NULL,'SYSTEM','2020-12-15 13:21:07',NULL,'2021-02-23 09:47:49');
4949
insert into `dss_sidebar_content`(`id`,`workspace_id`,`sidebar_id`,`name`,`name_en`,`title`,`title_en`,`url`,`url_type`,`icon`,`order_num`,`remark`,`create_user`,`create_time`,`update_user`,`update_time`) values (4,0,2,NULL,NULL,'UDF管理','UDF management','dss/linkis/?noHeader=1&noFooter=1#/urm/udfManagement',1,'menuIcon',1,NULL,'SYSTEM','2020-12-15 13:21:07',NULL,'2021-02-23 09:47:11');
50-
--insert into `dss_sidebar_content`(`id`,`workspace_id`,`sidebar_id`,`name`,`name_en`,`title`,`title_en`,`url`,`url_type`,`icon`,`order_num`,`remark`,`create_user`,`create_time`,`update_user`,`update_time`) values (5,0,3,NULL,NULL,'资源配置说明',NULL,'http://127.0.0.1:8088/kn/d/38',1,'fi-warn',1,NULL,'SYSTEM','2020-12-15 13:21:07',NULL,'2021-01-12 17:16:52');
51-
--insert into `dss_sidebar_content`(`id`,`workspace_id`,`sidebar_id`,`name`,`name_en`,`title`,`title_en`,`url`,`url_type`,`icon`,`order_num`,`remark`,`create_user`,`create_time`,`update_user`,`update_time`) values (6,0,3,NULL,NULL,'Spark使用指南','[Discussion on error code 22223]','http://127.0.0.1:8088/kn/d/40',1,'fi-warn',1,NULL,'SYSTEM','2020-12-15 13:21:07',NULL,'2021-02-23 09:48:28');
52-
--insert into `dss_sidebar_content`(`id`,`workspace_id`,`sidebar_id`,`name`,`name_en`,`title`,`title_en`,`url`,`url_type`,`icon`,`order_num`,`remark`,`create_user`,`create_time`,`update_user`,`update_time`) values (7,0,3,NULL,NULL,'Hive语法介绍',NULL,'http://127.0.0.1:8088/kn/d/34',1,'fi-warn',1,NULL,'SYSTEM','2020-12-15 13:21:07',NULL,'2021-01-12 17:17:00');
53-
--insert into `dss_sidebar_content`(`id`,`workspace_id`,`sidebar_id`,`name`,`name_en`,`title`,`title_en`,`url`,`url_type`,`icon`,`order_num`,`remark`,`create_user`,`create_time`,`update_user`,`update_time`) values (8,0,3,NULL,NULL,'工作流使用介绍',NULL,'http://127.0.0.1:8088/kn/d/42',1,'fi-warn',1,NULL,'SYSTEM','2020-12-15 13:21:07',NULL,'2021-01-12 17:17:01');
54-
--insert into `dss_sidebar_content`(`id`,`workspace_id`,`sidebar_id`,`name`,`name_en`,`title`,`title_en`,`url`,`url_type`,`icon`,`order_num`,`remark`,`create_user`,`create_time`,`update_user`,`update_time`) values (9,0,3,NULL,NULL,'数据服务使用介绍','Discussion on error code 22223','http://127.0.0.1:8088/kn/d/32',1,'fi-warn',1,NULL,'SYSTEM','2020-12-15 13:21:07',NULL,'2021-02-23 09:48:19');
50+
-- insert into `dss_sidebar_content`(`id`,`workspace_id`,`sidebar_id`,`name`,`name_en`,`title`,`title_en`,`url`,`url_type`,`icon`,`order_num`,`remark`,`create_user`,`create_time`,`update_user`,`update_time`) values (5,0,3,NULL,NULL,'资源配置说明',NULL,'http://127.0.0.1:8088/kn/d/38',1,'fi-warn',1,NULL,'SYSTEM','2020-12-15 13:21:07',NULL,'2021-01-12 17:16:52');
51+
-- insert into `dss_sidebar_content`(`id`,`workspace_id`,`sidebar_id`,`name`,`name_en`,`title`,`title_en`,`url`,`url_type`,`icon`,`order_num`,`remark`,`create_user`,`create_time`,`update_user`,`update_time`) values (6,0,3,NULL,NULL,'Spark使用指南','[Discussion on error code 22223]','http://127.0.0.1:8088/kn/d/40',1,'fi-warn',1,NULL,'SYSTEM','2020-12-15 13:21:07',NULL,'2021-02-23 09:48:28');
52+
-- insert into `dss_sidebar_content`(`id`,`workspace_id`,`sidebar_id`,`name`,`name_en`,`title`,`title_en`,`url`,`url_type`,`icon`,`order_num`,`remark`,`create_user`,`create_time`,`update_user`,`update_time`) values (7,0,3,NULL,NULL,'Hive语法介绍',NULL,'http://127.0.0.1:8088/kn/d/34',1,'fi-warn',1,NULL,'SYSTEM','2020-12-15 13:21:07',NULL,'2021-01-12 17:17:00');
53+
-- insert into `dss_sidebar_content`(`id`,`workspace_id`,`sidebar_id`,`name`,`name_en`,`title`,`title_en`,`url`,`url_type`,`icon`,`order_num`,`remark`,`create_user`,`create_time`,`update_user`,`update_time`) values (8,0,3,NULL,NULL,'工作流使用介绍',NULL,'http://127.0.0.1:8088/kn/d/42',1,'fi-warn',1,NULL,'SYSTEM','2020-12-15 13:21:07',NULL,'2021-01-12 17:17:01');
54+
-- insert into `dss_sidebar_content`(`id`,`workspace_id`,`sidebar_id`,`name`,`name_en`,`title`,`title_en`,`url`,`url_type`,`icon`,`order_num`,`remark`,`create_user`,`create_time`,`update_user`,`update_time`) values (9,0,3,NULL,NULL,'数据服务使用介绍','Discussion on error code 22223','http://127.0.0.1:8088/kn/d/32',1,'fi-warn',1,NULL,'SYSTEM','2020-12-15 13:21:07',NULL,'2021-02-23 09:48:19');
5555

5656
DELETE FROM dss_workspace_menu;
5757
INSERT INTO `dss_workspace_menu` (`id`, `name`, `title_en`, `title_cn`, `description`, `is_active`, `icon`, `order`, `create_by`, `create_time`, `last_update_time`, `last_update_user`) VALUES('1','数据交换','data exchange','数据交换','数据交换描述','1',NULL,NULL,NULL,NULL,NULL,NULL);

db/version_update/from_v101_to_v110.sql

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ CREATE TABLE `dss_workflow_execute_info` (
1515
PRIMARY KEY (`id`)
1616
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
1717

18-
--需要先添加一条记录,先删除原来spark节点内存校验的关联关系
18+
-- 需要先添加一条记录,先删除原来spark节点内存校验的关联关系
1919
INSERT INTO `dss_workflow_node_ui_validate` (`validate_type`, `validate_range`, `error_msg`, `error_msg_en`, `trigger`) VALUES ('Regex', '^[0-9.]*g{0,1}$', 'Spark内存设置如2g', 'Drive memory size, default value: 2', 'blur');
2020

2121
CREATE TABLE `dss_orchestrator_job_info` (
@@ -27,7 +27,7 @@ INSERT INTO `dss_workflow_node_ui_validate` (`validate_type`, `validate_range`,
2727
PRIMARY KEY (`id`)
2828
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='dss_orchestrator_job_info表';
2929

30-
--------------------v1.1.2
30+
-------------------- v1.1.2
3131

3232
DROP TABLE IF EXISTS `dss_admin_dept`;
3333
CREATE TABLE `dss_admin_dept` (

db/wait_for_change/changing_to_dss_ddl.sql

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
--√√
1+
22
DROP TABLE IF EXISTS `dss_workspace_appconn_role`; -- changed
33
CREATE TABLE `dss_workspace_appconn_role` ( -- changed
44
`id` bigint(20) NOT NULL AUTO_INCREMENT,
@@ -11,7 +11,7 @@ CREATE TABLE `dss_workspace_appconn_role` ( -- changed
1111
PRIMARY KEY (`id`)
1212
) ENGINE=InnoDB AUTO_INCREMENT=5103 DEFAULT CHARSET=utf8;
1313

14-
--
14+
1515
DROP TABLE IF EXISTS `dss_workflow_edit_lock`; -- changed
1616
CREATE TABLE `dss_workflow_edit_lock` ( -- changed
1717
`id` int(11) NOT NULL AUTO_INCREMENT COMMENT '',
@@ -28,7 +28,7 @@ CREATE TABLE `dss_workflow_edit_lock` ( -- changed
2828
UNIQUE KEY `dss_flow_edit_lock_flow_id_IDX` (`flow_id`) USING BTREE
2929
) ENGINE=InnoDB AUTO_INCREMENT=571 DEFAULT CHARSET=utf8;
3030

31-
--√√
31+
3232
DROP TABLE IF EXISTS `dss_workspace_menu`; -- changed
3333
CREATE TABLE `dss_workspace_menu` ( -- changed
3434
`id` int(20) NOT NULL AUTO_INCREMENT,
@@ -46,7 +46,7 @@ CREATE TABLE `dss_workspace_menu` ( -- changed
4646
PRIMARY KEY (`id`)
4747
) ENGINE=InnoDB AUTO_INCREMENT=6 DEFAULT CHARSET=utf8;
4848

49-
--√√
49+
5050
DROP TABLE IF EXISTS `dss_workspace_menu_role`; -- changed
5151
CREATE TABLE `dss_workspace_menu_role` ( -- changed
5252
`id` int(20) NOT NULL AUTO_INCREMENT,
@@ -59,7 +59,7 @@ CREATE TABLE `dss_workspace_menu_role` ( -- changed
5959
PRIMARY KEY (`id`)
6060
) ENGINE=InnoDB AUTO_INCREMENT=5263 DEFAULT CHARSET=utf8;
6161

62-
--√√
62+
6363
DROP TABLE IF EXISTS `dss_workspace_menu_appconn`; -- changed
6464
CREATE TABLE `dss_workspace_menu_appconn` ( -- changed
6565
`id` int(20) NOT NULL AUTO_INCREMENT,
@@ -87,7 +87,7 @@ CREATE TABLE `dss_workspace_menu_appconn` ( -- changed
8787
PRIMARY KEY (`id`)
8888
) ENGINE=InnoDB AUTO_INCREMENT=14 DEFAULT CHARSET=utf8;
8989

90-
--√√
90+
9191
DROP TABLE IF EXISTS `dss_workspace_user_favorites_appconn`; -- changed
9292
CREATE TABLE `dss_workspace_user_favorites_appconn` ( -- changed
9393
`id` int(20) NOT NULL AUTO_INCREMENT,
@@ -103,7 +103,7 @@ CREATE TABLE `dss_workspace_user_favorites_appconn` ( -- changed
103103
PRIMARY KEY (`id`)
104104
) ENGINE=InnoDB AUTO_INCREMENT=94 DEFAULT CHARSET=utf8;
105105

106-
--√√
106+
107107
DROP TABLE IF EXISTS `dss_workspace_role`; -- changed
108108
CREATE TABLE `dss_workspace_role` ( -- changed
109109
`id` int(20) NOT NULL AUTO_INCREMENT,
@@ -116,7 +116,7 @@ CREATE TABLE `dss_workspace_role` ( -- changed
116116
UNIQUE KEY `workspace_id` (`workspace_id`,`name`)
117117
) ENGINE=InnoDB AUTO_INCREMENT=10 DEFAULT CHARSET=utf8 CHECKSUM=1 DELAY_KEY_WRITE=1 ROW_FORMAT=DYNAMIC;
118118

119-
--√√
119+
120120
DROP TABLE IF EXISTS `dss_workflow_relation`; -- changed
121121
CREATE TABLE `dss_workflow_relation` ( -- changed
122122
`id` bigint(20) NOT NULL AUTO_INCREMENT,
@@ -126,8 +126,6 @@ CREATE TABLE `dss_workflow_relation` ( -- changed
126126
) ENGINE=InnoDB AUTO_INCREMENT=78 DEFAULT CHARSET=utf8mb4 ROW_FORMAT=COMPACT;
127127

128128

129-
130-
--√√
131129
DROP TABLE IF EXISTS `dss_workspace_admin_dept`; -- changed
132130
CREATE TABLE `dss_workspace_admin_dept` ( -- changed
133131
`id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '部门id',
@@ -172,7 +170,7 @@ CREATE TABLE `dss_workspace_user_role` (
172170
PRIMARY KEY (`id`)
173171
) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 comment '空间用户角色关系表';
174172

175-
--√√
173+
176174
DROP TABLE IF EXISTS `dss_workspace_download_audit`; -- changed
177175
CREATE TABLE `dss_workspace_download_audit` ( -- changed
178176
`id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键',
@@ -185,7 +183,7 @@ CREATE TABLE `dss_workspace_download_audit` ( -- changed
185183
PRIMARY KEY (`id`)
186184
) ENGINE = INNODB DEFAULT CHARSET = utf8 COMMENT = '文件下载审计';
187185

188-
--use√√
186+
189187
DROP TABLE IF EXISTS `dss_workspace_dictionary`; -- changed
190188
CREATE TABLE `dss_workspace_dictionary` ( -- changed
191189
`id` int(11) NOT NULL AUTO_INCREMENT COMMENT '主键ID',

dss-apps/dss-apiservice-server/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@
7474
<dependency>
7575
<groupId>com.alibaba</groupId>
7676
<artifactId>fastjson</artifactId>
77-
<version>1.2.70</version>
77+
<version>1.2.83</version>
7878
</dependency>
7979
<!--jersey bean validation-->
8080
<dependency>

0 commit comments

Comments
 (0)