Skip to content

Commit b6b7eaf

Browse files
committed
fixed bug and update jpb.desc validate to limit 5000
1 parent c49baeb commit b6b7eaf

File tree

2 files changed

+10
-5
lines changed

2 files changed

+10
-5
lines changed

db/dss_ddl.sql

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -311,10 +311,10 @@ CREATE TABLE `dss_workspace_download_audit` (
311311
DROP TABLE IF EXISTS `dss_workflow`;
312312
CREATE TABLE `dss_workflow` (
313313
`id` bigint(20) NOT NULL AUTO_INCREMENT,
314-
`name` varchar(128) DEFAULT NULL,
314+
`name` varchar(255) DEFAULT NULL,
315315
`state` tinyint(1) DEFAULT NULL,
316316
`source` varchar(255) DEFAULT NULL,
317-
`description` varchar(255) DEFAULT NULL,
317+
`description` varchar(1024) DEFAULT NULL,
318318
`create_time` datetime DEFAULT NULL,
319319
`creator` varchar(32) DEFAULT NULL,
320320
`is_root_flow` tinyint(1) DEFAULT NULL,

db/dss_dml.sql

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -308,6 +308,9 @@ insert into `dss_workflow_node_ui_validate` (`id`, `validate_type`, `validate_ra
308308
insert into `dss_workflow_node_ui_validate` (`id`, `validate_type`, `validate_range`, `error_msg`, `error_msg_en`, `trigger`) values('57','Regex','^[a-zA-Z][a-zA-Z0-9_.-]*$','必须以字母开头,且只支持字母、数字、下划线、点!','It must start with a letter and only supports letters, numbers, underscores and dots!','blur');
309309
insert into `dss_workflow_node_ui_validate` (`id`, `validate_type`, `validate_range`, `error_msg`, `error_msg_en`, `trigger`) values('58','Regex','(.+)@(.+)@(.+)','此格式错误,例如:ProjectName@WFName@jobName','Invalid format,example:ProjectName@WFName@jobName','blur');
310310
INSERT INTO `dss_workflow_node_ui_validate` (`id`, `validate_type`, `validate_range`, `error_msg`, `error_msg_en`, `trigger`) values('59','OFT','["true","false"]','请填写是否复用引擎,false:不复用,true:复用','Please fill in whether or not to reuse engine, true: reuse, false: not reuse','blur');
311+
insert into `dss_workflow_node_ui_validate` (`id`, `validate_type`, `validate_range`, `error_msg`, `error_msg_en`, `trigger`) values('60', 'Regex', '^[0-9.]*g{0,1}$', 'Spark内存设置如2g', 'Drive memory size, default value: 2', 'blur');
312+
insert into `dss_workflow_node_ui_validate` (`id`, `validate_type`, `validate_range`, `error_msg`, `error_msg_en`, `trigger`) values('61','Regex','^.{1,5000}$','长度在1到5000个字符','The length is between 1 and 5000 characters','blur');
313+
insert into `dss_workflow_node_ui_validate` (`id`, `validate_type`, `validate_range`, `error_msg`, `error_msg_en`, `trigger`) values('62','Regex','^.{1,150}$','长度在1到150个字符','The length is between 1 and 150 characters','blur');
311314

312315
DELETE FROM dss_workflow_node_ui_to_validate;
313316
insert into `dss_workflow_node_ui_to_validate`(`ui_id`,`validate_id`) values (@node_ui_source_type,31);
@@ -346,7 +349,7 @@ insert into `dss_workflow_node_ui_to_validate`(`ui_id`,`validate_id`) values (@
346349
insert into `dss_workflow_node_ui_to_validate`(`ui_id`,`validate_id`) values (@node_ui_wds_linkis_rm_yarnqueue,41);
347350
insert into `dss_workflow_node_ui_to_validate`(`ui_id`,`validate_id`) values (@node_ui_wds_linkis_rm_yarnqueue,57);
348351
insert into `dss_workflow_node_ui_to_validate`(`ui_id`,`validate_id`) values (@node_ui_title,48);
349-
insert into `dss_workflow_node_ui_to_validate`(`ui_id`,`validate_id`) values (@node_ui_title,47);
352+
insert into `dss_workflow_node_ui_to_validate`(`ui_id`,`validate_id`) values (@node_ui_title,62);
350353
insert into `dss_workflow_node_ui_to_validate`(`ui_id`,`validate_id`) values (@node_ui_title,55);
351354
insert into `dss_workflow_node_ui_to_validate`(`ui_id`,`validate_id`) values (@node_ui_title,56);
352355
insert into `dss_workflow_node_ui_to_validate`(`ui_id`,`validate_id`) values (@node_ui_category,13);
@@ -365,7 +368,6 @@ insert into `dss_workflow_node_ui_to_validate`(`ui_id`,`validate_id`) values (@
365368
insert into `dss_workflow_node_ui_to_validate`(`ui_id`,`validate_id`) values (@node_ui_max_check_hours,54);
366369
insert into `dss_workflow_node_ui_to_validate`(`ui_id`,`validate_id`) values (@node_ui_job_desc,32);
367370
insert into `dss_workflow_node_ui_to_validate`(`ui_id`,`validate_id`) values (35,52);
368-
insert into `dss_workflow_node_ui_to_validate`(`ui_id`,`validate_id`) values (@node_ui_job_desc,41);
369371
insert into `dss_workflow_node_ui_to_validate`(`ui_id`,`validate_id`) values (@node_ui_msg_sender,55);
370372
insert into `dss_workflow_node_ui_to_validate`(`ui_id`,`validate_id`) values (@node_ui_category,55);
371373
insert into `dss_workflow_node_ui_to_validate`(`ui_id`,`validate_id`) values (@node_ui_to,55);
@@ -383,7 +385,10 @@ insert into `dss_workflow_node_ui_to_validate`(`ui_id`,`validate_id`) values (@
383385
insert into `dss_workflow_node_ui_to_validate`(`ui_id`,`validate_id`) values (@node_ui_msg_sender,58);
384386
insert into `dss_workflow_node_ui_to_validate`(`ui_id`,`validate_id`) values (@node_ui_executeUser,55);
385387
insert into `dss_workflow_node_ui_to_validate`(`ui_id`,`validate_id`) values (42,52);
386-
INSERT INTO `dss_workflow_node_ui_to_validate`(`ui_id`,`validate_id`) VALUES (@node_ui_ReuseEngine,59);
388+
insert into `dss_workflow_node_ui_to_validate`(`ui_id`,`validate_id`) values (@node_ui_ReuseEngine,59);
389+
insert into `dss_workflow_node_ui_to_validate`(`ui_id`,`validate_id`) values (@node_ui_spark_driver_memory,60);
390+
insert into `dss_workflow_node_ui_to_validate`(`ui_id`,`validate_id`) values (@node_ui_spark_executor_memory,60);
391+
insert into `dss_workflow_node_ui_to_validate`(`ui_id`,`validata_id`) values (@node_ui_job_desc,61);
387392

388393

389394
DELETE FROM dss_workspace_appconn_role;

0 commit comments

Comments
 (0)