Skip to content

Commit 8dfa854

Browse files
SunPengWanSunPengWan
committed
update from_v112_to_122.sql
1 parent 8a62d8c commit 8dfa854

File tree

1 file changed

+25
-113
lines changed

1 file changed

+25
-113
lines changed

‎db/version_update/from_v112_to_v122.sql‎

Lines changed: 25 additions & 113 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,3 @@
1-
-- 1.1.12 sql
2-
-- 表dss_orchestrator_job_info添加instance_name,status和error_msg字段
3-
ALTER TABLE `dss_orchestrator_job_info` ADD `instance_name` varchar(128) DEFAULT NULL COMMENT '执行任务的实例';
4-
ALTER TABLE `dss_orchestrator_job_info` ADD `status` varchar(128) DEFAULT NULL COMMENT '转换任务状态';
5-
ALTER TABLE `dss_orchestrator_job_info` ADD `error_msg` varchar(2048) DEFAULT NULL COMMENT '转换任务异常信息';
6-
ALTER TABLE `dss_orchestrator_job_info` CHANGE `updated_time` `update_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP;
7-
ALTER TABLE `dss_orchestrator_job_info` MODIFY `job_id` varchar(64) DEFAULT NULL COMMENT '任务id';
8-
-- 表dss_release_task添加instance_name字段
9-
ALTER TABLE `dss_release_task` ADD `instance_name` varchar(128) DEFAULT NULL COMMENT '执行任务的实例' AFTER `status`;
10-
-- 表dss_workflow_task添加instance_name字段
11-
ALTER TABLE `dss_workflow_task` ADD `instance_name` varchar(128) DEFAULT NULL COMMENT '执行任务的实例' AFTER `status`;
12-
-- 表dss_orchestrator_copy_info添加instance_name字段
13-
ALTER TABLE `dss_orchestrator_copy_info` ADD `instance_name` varchar(128) DEFAULT NULL COMMENT '执行任务的实例' AFTER `status`;
14-
-- 表dss_project_copy_task添加instance_name和error_orc字段
15-
ALTER TABLE `dss_project_copy_task` ADD `instance_name` varchar(128) DEFAULT NULL COMMENT '执行任务的实例' AFTER `status`;
16-
ALTER TABLE `dss_project_copy_task` ADD `error_orc` varchar(2048) DEFAULT '' COMMENT '拷贝异常编排' AFTER `error_msg`;
17-
ALTER TABLE `dss_project_copy_task` MODIFY `error_msg` text COMMENT '拷贝异常信息';
18-
-- 表dss_project_operate_record添加instance_name字段
19-
ALTER TABLE `dss_project_operate_record` ADD `instance_name` varchar(128) DEFAULT NULL COMMENT '执行任务的实例' AFTER `status`;
20-
-- 表dss_workspace_user_role添加update_user和update_time字段
21-
ALTER TABLE `dss_workspace_user_role` add `update_user` varchar(32) DEFAULT NULL COMMENT '更新人';
22-
ALTER TABLE `dss_workspace_user_role` add `update_time` datetime DEFAULT NULL COMMENT '更新时间';
23-
241
-- 1.1.13 sql
252
-- 参数模板表
263
CREATE TABLE `dss_ec_config_template`
@@ -157,40 +134,21 @@ values
157134
('wds.linkis.engineconn.java.driver.memory','hive引擎内存，默认值：1G','hive driver memory, default：1G','wds.linkis.engineconn.java.driver.memory','wds-linkis-engineconn.java.driver.memory','Input',0,NULL,'1G',0,NULL,0,1,1,0,'runtime');
158135

159136
-- 建立hive关联关系
160-
INSERT INTO `dss_workflow_node_to_ui` (`workflow_node_id`, `ui_id`)
161-
VALUES (
162-
(SELECT id FROM `dss_workflow_node` WHERE name = 'hql'),
163-
(SELECT id FROM `dss_workflow_node_ui` WHERE `key` = 'wds.linkis.engineconn.java.driver.memory')
164-
);
137+
INSERT INTO `dss_workflow_node_to_ui` (`workflow_node_id`, `ui_id`) VALUES ((SELECT id FROM `dss_workflow_node` WHERE name = 'hql'),(SELECT id FROM `dss_workflow_node_ui` WHERE `key` = 'wds.linkis.engineconn.java.driver.memory'));
165138

166139
-- 增加校验
167-
insert into `dss_workflow_node_ui_validate` (`validate_type`, `validate_range`, `error_msg`, `error_msg_en`, `trigger`)
168-
values('Regex', '^([1-9]|10|[1-9])(g|G){0,1}$', '设置范围为[1,10],设置超出限制', 'hive memory limit 1,10', 'blur');
140+
insert into `dss_workflow_node_ui_validate` (`validate_type`, `validate_range`, `error_msg`, `error_msg_en`, `trigger`) values('Regex', '^([1-9]|10|[1-9])(g|G){0,1}$', '设置范围为[1,10],设置超出限制', 'hive memory limit 1,10', 'blur');
169141

170-
insert into `dss_workflow_node_ui_validate` (`validate_type`, `validate_range`, `error_msg`, `error_msg_en`, `trigger`)
171-
values('Regex', '^((source.type|check.object).\\w+=(\\w(\\.)*(\\{(.+?)\\})*)+[;\n]*)+$', '请正确填写多源配置', 'params config error, please make sure!', 'blur');
142+
insert into `dss_workflow_node_ui_validate` (`validate_type`, `validate_range`, `error_msg`, `error_msg_en`, `trigger`) values('Regex', '^((source.type|check.object).\\w+=(\\w(\\.)*(\\{(.+?)\\})*)+[;\n]*)+$', '请正确填写多源配置', 'params config error, please make sure!', 'blur');
172143

173-
insert into `dss_workflow_node_ui_validate` (`validate_type`, `validate_range`, `error_msg`, `error_msg_en`, `trigger`)
174-
values('Function', 'validateJobDesc', 'check.object配置重复,请检查', 'exist check.object repeat please check!', 'blur');
144+
insert into `dss_workflow_node_ui_validate` (`validate_type`, `validate_range`, `error_msg`, `error_msg_en`, `trigger`) values('Function', 'validateJobDesc', 'check.object配置重复,请检查', 'exist check.object repeat please check!', 'blur');
175145

176146
-- 关联校验
177-
INSERT INTO `dss_workflow_node_ui_to_validate` (`ui_id`, `validate_id`)
178-
VALUES (
179-
(SELECT id FROM `dss_workflow_node_ui` WHERE `key` = 'wds.linkis.engineconn.java.driver.memory'),
180-
(SELECT id FROM `dss_workflow_node_ui_validate` WHERE error_msg = '设置范围为[1,10],设置超出限制' AND error_msg_en = 'hive memory limit 1,10')
181-
);
147+
INSERT INTO `dss_workflow_node_ui_to_validate` (`ui_id`, `validate_id`) VALUES ((SELECT id FROM `dss_workflow_node_ui` WHERE `key` = 'wds.linkis.engineconn.java.driver.memory'),(SELECT id FROM `dss_workflow_node_ui_validate` WHERE error_msg = '设置范围为[1,10],设置超出限制' AND error_msg_en = 'hive memory limit 1,10'));
182148

183-
INSERT INTO `dss_workflow_node_ui_to_validate` (`ui_id`, `validate_id`)
184-
VALUES (
185-
(SELECT id FROM `dss_workflow_node_ui` WHERE `key` = 'job.desc'),
186-
(SELECT id FROM `dss_workflow_node_ui_validate` WHERE error_msg = '请正确填写多源配置' AND error_msg_en = 'params config error, please make sure!')
187-
);
149+
INSERT INTO `dss_workflow_node_ui_to_validate` (`ui_id`, `validate_id`) VALUES ((SELECT id FROM `dss_workflow_node_ui` WHERE `key` = 'job.desc'),(SELECT id FROM `dss_workflow_node_ui_validate` WHERE error_msg = '请正确填写多源配置' AND error_msg_en = 'params config error, please make sure!'));
188150

189-
INSERT INTO `dss_workflow_node_ui_to_validate` (`ui_id`, `validate_id`)
190-
VALUES (
191-
(SELECT id FROM `dss_workflow_node_ui` WHERE `key` = 'job.desc'),
192-
(SELECT id FROM `dss_workflow_node_ui_validate` WHERE error_msg = 'check.object配置重复,请检查' AND error_msg_en = 'exist check.object repeat please check!')
193-
);
151+
INSERT INTO `dss_workflow_node_ui_to_validate` (`ui_id`, `validate_id`) VALUES ((SELECT id FROM `dss_workflow_node_ui` WHERE `key` = 'job.desc'),(SELECT id FROM `dss_workflow_node_ui_validate` WHERE error_msg = 'check.object配置重复,请检查' AND error_msg_en = 'exist check.object repeat please check!'));
194152

195153
-- job.desc描述文案修改
196154
update
@@ -289,7 +247,6 @@ WHERE
289247

290248

291249
-- 1.1.20 sql
292-
ALTER TABLE event_queue ADD COLUMN run_date VARCHAR(8) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL COMMENT '信号的run_date' AFTER send_ip;
293250
ALTER TABLE dss_ec_release_strategy ADD COLUMN cross_cluster tinyint(1) DEFAULT 0 COMMENT '是否跨集群,0为否，1为是' AFTER queue;
294251
ALTER TABLE dss_queue_in_workspace ADD COLUMN cross_cluster tinyint(1) DEFAULT 0 COMMENT '是否跨集群,0为否，1为是' AFTER queue;
295252
-- 新增历史查询字段
@@ -318,33 +275,20 @@ INSERT INTO `dss_workflow_node_ui` (`key`,`description`,`description_en`,`lable
318275
INSERT INTO `dss_workflow_node_ui` (`key`,`description`,`description_en`,`lable_name`,`lable_name_en`,`ui_type`,`required`,`value`,`default_value`,`is_hidden`,`condition`,`is_advanced`,`order`,`node_menu_type`,`is_base_info`,`position`) values ('mapreduce.job.running.reduce.limit','请填写reduce任务数限制','please reduce task limit','mapreduce.job.running.reduce.limit','mapreduce.job.running.reduce.limit','Input',0,NULL,'999',0,"!${params.configuration.startup['ec.conf.templateId']}",0,1,1,0,'startup');
319276

320277
-- 添加 dss_workflow_node主键ID和dss_workflow_node_ui主键ID 关联信息至节点ui中间表 dss_workflow_node_to_ui
321-
INSERT INTO `dss_workflow_node_to_ui` (`workflow_node_id`, `ui_id`) VALUES (
322-
(SELECT id FROM `dss_workflow_node` WHERE name = 'hql'),
323-
(SELECT id FROM `dss_workflow_node_ui` WHERE `key` = 'mapreduce.job.running.map.limit')
324-
);
278+
INSERT INTO `dss_workflow_node_to_ui` (`workflow_node_id`, `ui_id`) VALUES ((SELECT id FROM `dss_workflow_node` WHERE name = 'hql'),(SELECT id FROM `dss_workflow_node_ui` WHERE `key` = 'mapreduce.job.running.map.limit'));
325279

326-
INSERT INTO `dss_workflow_node_to_ui` (`workflow_node_id`, `ui_id`) VALUES (
327-
(SELECT id FROM `dss_workflow_node` WHERE name = 'hql'),
328-
(SELECT id FROM `dss_workflow_node_ui` WHERE `key` = 'mapreduce.job.running.reduce.limit')
329-
);
280+
INSERT INTO `dss_workflow_node_to_ui` (`workflow_node_id`, `ui_id`) VALUES ((SELECT id FROM `dss_workflow_node` WHERE name = 'hql'),(SELECT id FROM `dss_workflow_node_ui` WHERE `key` = 'mapreduce.job.running.reduce.limit'));
330281

331282
-- 添加规则校验
332-
insert into `dss_workflow_node_ui_validate` (`validate_type`, `validate_range`, `error_msg`, `error_msg_en`, `trigger`)
333-
values('Regex', '^(1[0-9]{1,5}|200000|[1-9][0-9]{1,4})$', '设置范围为[10,200000],设置超出限制', 'map task limit 10,200000', 'blur');
283+
insert into `dss_workflow_node_ui_validate` (`validate_type`, `validate_range`, `error_msg`, `error_msg_en`, `trigger`) values('Regex', '^(1[0-9]{1,5}|200000|[1-9][0-9]{1,4})$', '设置范围为[10,200000],设置超出限制', 'map task limit 10,200000', 'blur');
334284

335-
insert into `dss_workflow_node_ui_validate` (`validate_type`, `validate_range`, `error_msg`, `error_msg_en`, `trigger`)
336-
values('Regex', '^([1-9][0-9]{1,2}|999|)$', '设置范围为[10,999],设置超出限制', 'reduce task limit 10,999', 'blur');
285+
insert into `dss_workflow_node_ui_validate` (`validate_type`, `validate_range`, `error_msg`, `error_msg_en`, `trigger`) values('Regex', '^([1-9][0-9]{1,2}|999|)$', '设置范围为[10,999],设置超出限制', 'reduce task limit 10,999', 'blur');
337286

338287
-- 关联校验
339288

340-
insert into dss_workflow_node_ui_to_validate (ui_id,validate_id) values (
341-
(select id from `dss_workflow_node_ui` WHERE `key` = 'mapreduce.job.running.map.limit'),
342-
(select id from dss_workflow_node_ui_validate where error_msg_en = 'map task limit 10,200000')
343-
);
289+
insert into dss_workflow_node_ui_to_validate (ui_id,validate_id) values ((select id from `dss_workflow_node_ui` WHERE `key` = 'mapreduce.job.running.map.limit'),(select id from dss_workflow_node_ui_validate where error_msg_en = 'map task limit 10,200000'));
344290

345-
insert into dss_workflow_node_ui_to_validate (ui_id,validate_id) values (
346-
(select id from `dss_workflow_node_ui` WHERE `key` = 'mapreduce.job.running.reduce.limit'),
347-
(select id from dss_workflow_node_ui_validate where error_msg_en = 'reduce task limit 10,999');
291+
insert into dss_workflow_node_ui_to_validate (ui_id,validate_id) values ((select id from `dss_workflow_node_ui` WHERE `key` = 'mapreduce.job.running.reduce.limit'),(select id from dss_workflow_node_ui_validate where error_msg_en = 'reduce task limit 10,999'));
348292

349293

350294
update dss_workflow_node_ui_validate set error_msg = '设置范围为[1,10],设置超出限制',error_msg_en = 'must be between 1 and 10' where id = (select t2.validate_id from dss_workflow_node_ui t1
@@ -378,10 +322,7 @@ ALTER TABLE dss_ec_release_ims_record MODIFY COLUMN content text CHARACTER SET u
378322
INSERT INTO dss_workflow_node_ui (`key`,description,description_en,lable_name,lable_name_en,ui_type,required,value,default_value,is_hidden,`condition`,is_advanced,`order`,node_menu_type,is_base_info,`position`) VALUES
379323
('auto.disabled','默认为false，若禁用，工作流执行和调度会跳过该节点','default false','是否禁用节点','auto.disabled','Select',1,'["true","false"]',NULL,0,NULL,0,1,1,0,'special');
380324

381-
insert into dss_workflow_node_ui_to_validate (ui_id,validate_id) values (
382-
(select id from `dss_workflow_node_ui` WHERE `key` = 'auto.disabled' limit 1),
383-
(select id from dss_workflow_node_ui_validate where validate_type='None' limit 1)
384-
);
325+
insert into dss_workflow_node_ui_to_validate (ui_id,validate_id) values ((select id from `dss_workflow_node_ui` WHERE `key` = 'auto.disabled' limit 1),(select id from dss_workflow_node_ui_validate where validate_type='None' limit 1));
385326

386327
INSERT INTO dss_workflow_node_to_ui (workflow_node_id, ui_id)
387328
SELECT id, (SELECT id FROM `dss_workflow_node_ui` WHERE `key` = 'auto.disabled' limit 1) FROM dss_workflow_node;
@@ -518,29 +459,10 @@ INSERT INTO dss_workflow_node_ui_to_validate (ui_id,validate_id) VALUES
518459
(
519460
(SELECT id FROM dss_workflow_node_ui where `key`='msg.channel.type')
520461
,
521-
(SELECT id FROM dss_workflow_node_ui_validate where validate_type='None' limit 1)
522-
)
523-
;
462+
(SELECT id FROM dss_workflow_node_ui_validate where validate_type='None' limit 1));
524463

525464

526465

527-
528-
529-
INSERT INTO dss_workflow_node_to_ui (workflow_node_id,ui_id) VALUES
530-
(
531-
(SELECT id from dss_workflow_node where node_type ='linkis.appconn.eventchecker.eventsender')
532-
,
533-
(SELECT id FROM dss_workflow_node_ui where `key`='msg.channel.type')
534-
)
535-
,
536-
(
537-
(SELECT id from dss_workflow_node where node_type ='linkis.appconn.eventchecker.eventreceiver')
538-
,
539-
(SELECT id FROM dss_workflow_node_ui where `key`='msg.channel.type')
540-
)
541-
;
542-
543-
544466
-- 1.8.0 sql
545467

546468
ALTER TABLE dss_workflow_node_content_to_ui ADD node_type VARCHAR(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin COMMENT '节点类型，用于分区';
@@ -595,24 +517,16 @@ INSERT INTO dss_workflow_node_ui_to_validate (ui_id ,validate_id ) VALUES
595517

596518
UPDATE dss_workflow_node_ui_validate set error_msg='请严格按照dbname.tablename{ds=partitionname}格式填写，中间不允许有空格' ,validate_range='^\\s*[a-zA-Z]([^.]*\\.[^.]*){1,}\\s*$' where error_msg ='需要检查的数据源dbname.tablename{partition}' ;
597519

598-
INSERT INTO dss_workflow_node (name,appconn_name,node_type,jump_type,support_jump,submit_to_scheduler,enable_copy,should_creation_before_node,icon_path)
599-
VALUES ('nebula','scriptis','linkis.nebula.nebula',2,1,1,1,0,'svgs/nebula-graph.svg');
520+
INSERT INTO dss_workflow_node (name,appconn_name,node_type,jump_type,support_jump,submit_to_scheduler,enable_copy,should_creation_before_node,icon_path) VALUES ('nebula','scriptis','linkis.nebula.nebula',2,1,1,1,0,'svgs/nebula-graph.svg');
600521

601-
INSERT INTO dss_workflow_node_to_group (node_id,group_id)
602-
VALUES ((select id from dss_workflow_node where node_type = 'linkis.nebula.nebula') ,(select id from dss_workflow_node_group where name_en = 'Data development'));
522+
INSERT INTO dss_workflow_node_to_group (node_id,group_id) VALUES ((select id from dss_workflow_node where node_type = 'linkis.nebula.nebula') ,(select id from dss_workflow_node_group where name_en = 'Data development'));
603523

604-
INSERT INTO dss_workflow_node_to_ui (workflow_node_id,ui_id)
605-
VALUES ((select id from dss_workflow_node where node_type = 'linkis.nebula.nebula'),(select id from dss_workflow_node_ui where `key` = 'title' and node_menu_type = '1' ));
606-
INSERT INTO dss_workflow_node_to_ui (workflow_node_id,ui_id)
607-
VALUES ((select id from dss_workflow_node where node_type = 'linkis.nebula.nebula'),(select id from dss_workflow_node_ui where `key` = 'desc' and node_menu_type = '1' ));
608-
INSERT INTO dss_workflow_node_to_ui (workflow_node_id,ui_id)
609-
VALUES ((select id from dss_workflow_node where node_type = 'linkis.nebula.nebula'),(select id from dss_workflow_node_ui where `key` = 'businessTag'));
610-
INSERT INTO dss_workflow_node_to_ui (workflow_node_id,ui_id)
611-
VALUES ((select id from dss_workflow_node where node_type = 'linkis.nebula.nebula'),(select id from dss_workflow_node_ui where `key` = 'appTag'));
612-
INSERT INTO dss_workflow_node_to_ui (workflow_node_id,ui_id)
613-
VALUES ((select id from dss_workflow_node where node_type = 'linkis.nebula.nebula'),(select id from dss_workflow_node_ui where `key` = 'ReuseEngine'));
614-
INSERT INTO dss_workflow_node_to_ui (workflow_node_id,ui_id)
615-
VALUES ((select id from dss_workflow_node where node_type = 'linkis.nebula.nebula'),(select id from dss_workflow_node_ui where `key` = 'auto.disabled'));
524+
INSERT INTO dss_workflow_node_to_ui (workflow_node_id,ui_id) VALUES ((select id from dss_workflow_node where node_type = 'linkis.nebula.nebula'),(select id from dss_workflow_node_ui where `key` = 'title' and node_menu_type = '1' ));
525+
INSERT INTO dss_workflow_node_to_ui (workflow_node_id,ui_id) VALUES ((select id from dss_workflow_node where node_type = 'linkis.nebula.nebula'),(select id from dss_workflow_node_ui where `key` = 'desc' and node_menu_type = '1' ));
526+
INSERT INTO dss_workflow_node_to_ui (workflow_node_id,ui_id) VALUES ((select id from dss_workflow_node where node_type = 'linkis.nebula.nebula'),(select id from dss_workflow_node_ui where `key` = 'businessTag'));
527+
INSERT INTO dss_workflow_node_to_ui (workflow_node_id,ui_id) VALUES ((select id from dss_workflow_node where node_type = 'linkis.nebula.nebula'),(select id from dss_workflow_node_ui where `key` = 'appTag'));
528+
INSERT INTO dss_workflow_node_to_ui (workflow_node_id,ui_id) VALUES ((select id from dss_workflow_node where node_type = 'linkis.nebula.nebula'),(select id from dss_workflow_node_ui where `key` = 'ReuseEngine'));
529+
INSERT INTO dss_workflow_node_to_ui (workflow_node_id,ui_id) VALUES ((select id from dss_workflow_node where node_type = 'linkis.nebula.nebula'),(select id from dss_workflow_node_ui where `key` = 'auto.disabled'));
616530

617531

618532

@@ -645,8 +559,7 @@ CREATE TABLE `dss_dataset_user_usage_cache` (
645559

646560
alter table dss_workflow_node_content_to_ui add PARTITION(
647561
PARTITION eventsenderWTSS VALUES IN ('wtss.eventchecker.sender'),
648-
PARTITION eventreceiverWTSS VALUES IN ('wtss.eventchecker.receiver')
649-
);
562+
PARTITION eventreceiverWTSS VALUES IN ('wtss.eventchecker.receiver'));
650563

651564

652565

@@ -673,5 +586,4 @@ alter table dss_workspace add enabled_flow_keywords_check tinyint DEFAULT '0' CO
673586

674587
alter table dss_workspace add is_default_reference tinyint DEFAULT '0' COMMENT '是否默认引用资源参数模板,1、是 0、否';
675588

676-
alter table dss_orchestrator_info add not_contains_keywords_node longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_bin COMMENT '不包含关键字的节点信息';
677-
589+
alter table dss_orchestrator_info add not_contains_keywords_node longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_bin COMMENT '不包含关键字的节点信息';

0 commit comments

Comments
 (0)