This is an automated email from the ASF dual-hosted git repository.
kerwin pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler.git
The following commit(s) were added to refs/heads/dev by this push:
new ba4cb9d [Fix-5876][SQL] Support more resources files in the task
(#6457)
ba4cb9d is described below
commit ba4cb9d22ad02ba4927fd23ea811c82639261e69
Author: Hua Jiang <[email protected]>
AuthorDate: Thu Oct 14 15:31:06 2021 +0800
[Fix-5876][SQL] Support more resources files in the task (#6457)
* change the type of resource_ids from varchar to text
---
sql/dolphinscheduler_h2.sql | 4 ++--
sql/dolphinscheduler_mysql.sql | 4 ++--
sql/dolphinscheduler_postgre.sql | 4 ++--
sql/upgrade/1.4.0_schema/mysql/dolphinscheduler_ddl.sql | 7 +++++--
sql/upgrade/1.4.0_schema/postgresql/dolphinscheduler_ddl.sql | 4 ++++
5 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/sql/dolphinscheduler_h2.sql b/sql/dolphinscheduler_h2.sql
index ccd900e..172686f 100644
--- a/sql/dolphinscheduler_h2.sql
+++ b/sql/dolphinscheduler_h2.sql
@@ -475,7 +475,7 @@ CREATE TABLE t_ds_task_definition
timeout_notify_strategy tinyint(4) DEFAULT NULL,
timeout int(11) DEFAULT '0',
delay_time int(11) DEFAULT '0',
- resource_ids varchar(255) DEFAULT NULL,
+ resource_ids text,
create_time datetime NOT NULL,
update_time datetime DEFAULT NULL,
PRIMARY KEY (id, code)
@@ -506,7 +506,7 @@ CREATE TABLE t_ds_task_definition_log
timeout_notify_strategy tinyint(4) DEFAULT NULL,
timeout int(11) DEFAULT '0',
delay_time int(11) DEFAULT '0',
- resource_ids varchar(255) DEFAULT NULL,
+ resource_ids text,
operator int(11) DEFAULT NULL,
operate_time datetime DEFAULT NULL,
create_time datetime NOT NULL,
diff --git a/sql/dolphinscheduler_mysql.sql b/sql/dolphinscheduler_mysql.sql
index 82ed90f..9e37b2e 100644
--- a/sql/dolphinscheduler_mysql.sql
+++ b/sql/dolphinscheduler_mysql.sql
@@ -474,7 +474,7 @@ CREATE TABLE `t_ds_task_definition` (
`timeout_notify_strategy` tinyint(4) DEFAULT NULL COMMENT 'timeout
notification policy: 0 warning, 1 fail',
`timeout` int(11) DEFAULT '0' COMMENT 'timeout length,unit: minute',
`delay_time` int(11) DEFAULT '0' COMMENT 'delay execution time,unit: minute',
- `resource_ids` varchar(255) DEFAULT NULL COMMENT 'resource id, separated by
comma',
+ `resource_ids` text COMMENT 'resource id, separated by comma',
`create_time` datetime NOT NULL COMMENT 'create time',
`update_time` datetime DEFAULT NULL COMMENT 'update time',
PRIMARY KEY (`id`,`code`)
@@ -504,7 +504,7 @@ CREATE TABLE `t_ds_task_definition_log` (
`timeout_notify_strategy` tinyint(4) DEFAULT NULL COMMENT 'timeout
notification policy: 0 warning, 1 fail',
`timeout` int(11) DEFAULT '0' COMMENT 'timeout length,unit: minute',
`delay_time` int(11) DEFAULT '0' COMMENT 'delay execution time,unit: minute',
- `resource_ids` varchar(255) DEFAULT NULL COMMENT 'resource id, separated by
comma',
+ `resource_ids` text DEFAULT NULL COMMENT 'resource id, separated by comma',
`operator` int(11) DEFAULT NULL COMMENT 'operator user id',
`operate_time` datetime DEFAULT NULL COMMENT 'operate time',
`create_time` datetime NOT NULL COMMENT 'create time',
diff --git a/sql/dolphinscheduler_postgre.sql b/sql/dolphinscheduler_postgre.sql
index 5d33d03..3190337 100644
--- a/sql/dolphinscheduler_postgre.sql
+++ b/sql/dolphinscheduler_postgre.sql
@@ -382,7 +382,7 @@ CREATE TABLE t_ds_task_definition (
timeout_notify_strategy int DEFAULT NULL ,
timeout int DEFAULT '0' ,
delay_time int DEFAULT '0' ,
- resource_ids varchar(255) DEFAULT NULL ,
+ resource_ids text ,
create_time timestamp DEFAULT NULL ,
update_time timestamp DEFAULT NULL ,
PRIMARY KEY (id)
@@ -411,7 +411,7 @@ CREATE TABLE t_ds_task_definition_log (
timeout_notify_strategy int DEFAULT NULL ,
timeout int DEFAULT '0' ,
delay_time int DEFAULT '0' ,
- resource_ids varchar(255) DEFAULT NULL ,
+ resource_ids text ,
operator int DEFAULT NULL ,
operate_time timestamp DEFAULT NULL ,
create_time timestamp DEFAULT NULL ,
diff --git a/sql/upgrade/1.4.0_schema/mysql/dolphinscheduler_ddl.sql
b/sql/upgrade/1.4.0_schema/mysql/dolphinscheduler_ddl.sql
index 5034ffe..3dc764d 100644
--- a/sql/upgrade/1.4.0_schema/mysql/dolphinscheduler_ddl.sql
+++ b/sql/upgrade/1.4.0_schema/mysql/dolphinscheduler_ddl.sql
@@ -398,7 +398,7 @@ CREATE TABLE `t_ds_task_definition` (
`timeout_notify_strategy` tinyint(4) DEFAULT NULL COMMENT 'timeout
notification policy: 0 warning, 1 fail',
`timeout` int(11) DEFAULT '0' COMMENT 'timeout length,unit: minute',
`delay_time` int(11) DEFAULT '0' COMMENT 'delay execution time,unit: minute',
- `resource_ids` varchar(255) DEFAULT NULL COMMENT 'resource id, separated by
comma',
+ `resource_ids` text COMMENT 'resource id, separated by comma',
`create_time` datetime NOT NULL COMMENT 'create time',
`update_time` datetime DEFAULT NULL COMMENT 'update time',
PRIMARY KEY (`id`,`code`)
@@ -428,7 +428,7 @@ CREATE TABLE `t_ds_task_definition_log` (
`timeout_notify_strategy` tinyint(4) DEFAULT NULL COMMENT 'timeout
notification policy: 0 warning, 1 fail',
`timeout` int(11) DEFAULT '0' COMMENT 'timeout length,unit: minute',
`delay_time` int(11) DEFAULT '0' COMMENT 'delay execution time,unit: minute',
- `resource_ids` varchar(255) DEFAULT NULL COMMENT 'resource id, separated by
comma',
+ `resource_ids` text COMMENT 'resource id, separated by comma',
`operator` int(11) DEFAULT NULL COMMENT 'operator user id',
`operate_time` datetime DEFAULT NULL COMMENT 'operate time',
`create_time` datetime NOT NULL COMMENT 'create time',
@@ -443,6 +443,9 @@ ALTER TABLE t_ds_process_instance ADD COLUMN
`environment_code` bigint(20) defau
ALTER TABLE t_ds_task_instance ADD COLUMN `environment_code` bigint(20)
default '-1' COMMENT 'environment code' AFTER `worker_group`;
ALTER TABLE t_ds_task_instance ADD COLUMN `environment_config` text COMMENT
'environment config' AFTER `environment_code`;
+ALTER TABLE t_ds_task_definition MODIFY COLUMN `resource_ids` text;
+ALTER TABLE t_ds_task_definition_log MODIFY COLUMN `resource_ids` text;
+
-- ----------------------------
-- Table structure for t_ds_environment_worker_group_relation
-- ----------------------------
diff --git a/sql/upgrade/1.4.0_schema/postgresql/dolphinscheduler_ddl.sql
b/sql/upgrade/1.4.0_schema/postgresql/dolphinscheduler_ddl.sql
index 4296e2b..e85e008 100644
--- a/sql/upgrade/1.4.0_schema/postgresql/dolphinscheduler_ddl.sql
+++ b/sql/upgrade/1.4.0_schema/postgresql/dolphinscheduler_ddl.sql
@@ -396,6 +396,10 @@ delimiter ;
SELECT uc_dolphin_T_t_ds_task_definition_A_drop_UN_taskName();
DROP FUNCTION IF EXISTS uc_dolphin_T_t_ds_task_definition_A_drop_UN_taskName();
+
+ALTER TABLE t_ds_task_definition ALTER COLUMN resource_ids TYPE text;
+ALTER TABLE t_ds_task_definition_log ALTER COLUMN resource_ids TYPE text;
+
-- ----------------------------
-- These columns will not be used in the new version,if you determine that the
historical data is useless, you can delete it using the sql below
-- ----------------------------
