fix bug apache#3487 Create folder duplicate name under multithreading

sql/upgrade/1.3.3_schema/mysql/dolphinscheduler_ddl.sql

@@ -15,5 +15,101 @@
  * limitations under the License.
 */
 
--- add t_ds_resources_un
-ALTER TABLE t_ds_resources ADD CONSTRAINT t_ds_resources_un UNIQUE KEY (full_name,`type`);
+SET sql_mode=(SELECT REPLACE(@@sql_mode,'ONLY_FULL_GROUP_BY',''));
+-- uc_dolphin_T_t_ds_task_instance_A_first_submit_time
+drop PROCEDURE if EXISTS uc_dolphin_T_t_ds_task_instance_A_first_submit_time;
+delimiter d//
+CREATE PROCEDURE uc_dolphin_T_t_ds_task_instance_A_first_submit_time()
+ BEGIN
+ IF NOT EXISTS (SELECT 1 FROM information_schema.COLUMNS
+ WHERE TABLE_NAME='t_ds_task_instance'
+ AND TABLE_SCHEMA=(SELECT DATABASE())
+ AND COLUMN_NAME ='first_submit_time')
+ THEN
+ ALTER TABLE t_ds_task_instance ADD `first_submit_time` datetime DEFAULT NULL COMMENT 'task first submit time';
+ END IF;
+ END;
+
+d//
+
+delimiter ;
+CALL uc_dolphin_T_t_ds_task_instance_A_first_submit_time();
+DROP PROCEDURE uc_dolphin_T_t_ds_task_instance_A_first_submit_time;
+
+-- uc_dolphin_T_t_ds_task_instance_A_delay_time
+drop PROCEDURE if EXISTS uc_dolphin_T_t_ds_task_instance_A_delay_time;
+delimiter d//
+CREATE PROCEDURE uc_dolphin_T_t_ds_task_instance_A_delay_time()
+ BEGIN
+ IF NOT EXISTS (SELECT 1 FROM information_schema.COLUMNS
+ WHERE TABLE_NAME='t_ds_task_instance'
+ AND TABLE_SCHEMA=(SELECT DATABASE())
+ AND COLUMN_NAME ='delay_time')
+ THEN
+ ALTER TABLE t_ds_task_instance ADD `delay_time` int(4) DEFAULT '0' COMMENT 'task delay execution time';
+ END IF;
+ END;
+
+d//
+
+delimiter ;
+CALL uc_dolphin_T_t_ds_task_instance_A_delay_time();
+DROP PROCEDURE uc_dolphin_T_t_ds_task_instance_A_delay_time;
+
+-- uc_dolphin_T_t_ds_process_definition_A_modify_by
+drop PROCEDURE if EXISTS ct_dolphin_T_t_ds_process_definition_version;
+delimiter d//
+CREATE PROCEDURE ct_dolphin_T_t_ds_process_definition_version()
+BEGIN
+ CREATE TABLE `t_ds_process_definition_version` (
+ `id` int(11) NOT NULL AUTO_INCREMENT COMMENT 'key',
+ `process_definition_id` int(11) NOT NULL COMMENT 'process definition id',
+ `version` int(11) DEFAULT NULL COMMENT 'process definition version',
+ `process_definition_json` longtext COMMENT 'process definition json content',
+ `description` text,
+ `global_params` text COMMENT 'global parameters',
+ `locations` text COMMENT 'Node location information',
+ `connects` text COMMENT 'Node connection information',
+ `receivers` text COMMENT 'receivers',
+ `receivers_cc` text COMMENT 'cc',
+ `create_time` datetime DEFAULT NULL COMMENT 'create time',
+ `timeout` int(11) DEFAULT '0' COMMENT 'time out',
+ `resource_ids` varchar(255) DEFAULT NULL COMMENT 'resource ids',
+ PRIMARY KEY (`id`),
+ UNIQUE KEY `process_definition_id_and_version` (`process_definition_id`,`version`) USING BTREE,
+ KEY `process_definition_index` (`id`) USING BTREE
+ ) ENGINE=InnoDB AUTO_INCREMENT=84 DEFAULT CHARSET=utf8;
+END;
+
+d//
+
+delimiter ;
+CALL ct_dolphin_T_t_ds_process_definition_version;
+DROP PROCEDURE ct_dolphin_T_t_ds_process_definition_version;
+
+
+
+-- add t_ds_resources_un
+DROP PROCEDURE IF EXISTS uc_dolphin_T_t_ds_resources_un;
+delimiter d//
+CREATE PROCEDURE uc_dolphin_T_t_ds_resources_un()
+BEGIN
+ IF NOT EXISTS (
+ SELECT * FROM information_schema.KEY_COLUMN_USAGE
+ WHERE TABLE_NAME = 't_ds_resources'
+ AND CONSTRAINT_NAME = 't_ds_resources_un'
+ )
+ THEN
+ ALTER TABLE t_ds_resources ADD CONSTRAINT t_ds_resources_un UNIQUE KEY (full_name,`type`);
+ END IF;
+END;
+
+d//
+
+delimiter ;
+CALL uc_dolphin_T_t_ds_resources_un();
+DROP PROCEDURE IF EXISTS uc_dolphin_T_t_ds_resources_un;
+
+
+
+

sql/upgrade/1.3.3_schema/postgresql/dolphinscheduler_ddl.sql

@@ -14,5 +14,90 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
 */
+
+-- uc_dolphin_T_t_ds_task_instance_A_first_submit_time
+CREATE OR REPLACE FUNCTION uc_dolphin_T_t_ds_task_instance_A_first_submit_time() RETURNS void AS $$
+BEGIN
+ IF NOT EXISTS (SELECT 1 FROM information_schema.COLUMNS
+ WHERE TABLE_NAME='t_ds_task_instance'
+ AND COLUMN_NAME ='first_submit_time')
+ THEN
+ ALTER TABLE t_ds_task_instance ADD COLUMN first_submit_time timestamp DEFAULT NULL;
+ END IF;
+END;
+$$ LANGUAGE plpgsql;
+
+SELECT uc_dolphin_T_t_ds_task_instance_A_first_submit_time();
+DROP FUNCTION IF EXISTS uc_dolphin_T_t_ds_task_instance_A_first_submit_time();
+
+
+-- uc_dolphin_T_t_ds_task_instance_A_delay_time
+CREATE OR REPLACE FUNCTION uc_dolphin_T_t_ds_task_instance_A_delay_time() RETURNS void AS $$
+BEGIN
+ IF NOT EXISTS (SELECT 1 FROM information_schema.COLUMNS
+ WHERE TABLE_NAME='t_ds_task_instance'
+ AND COLUMN_NAME ='delay_time')
+ THEN
+ ALTER TABLE t_ds_task_instance ADD COLUMN delay_time int DEFAULT '0';
+ END IF;
+END;
+$$ LANGUAGE plpgsql;
+
+SELECT uc_dolphin_T_t_ds_task_instance_A_delay_time();
+DROP FUNCTION IF EXISTS uc_dolphin_T_t_ds_task_instance_A_delay_time();
+
 -- uc_dolphin_T_t_ds_process_definition_A_modify_by
+CREATE OR REPLACE FUNCTION ct_dolphin_T_t_ds_process_definition_version() RETURNS void AS $$
+BEGIN
+CREATE TABLE t_ds_process_definition_version (
+ id int NOT NULL ,
+ process_definition_id int NOT NULL ,
+ version int DEFAULT NULL ,
+ process_definition_json text ,
+ description text ,
+ global_params text ,
+ locations text ,
+ connects text ,
+ receivers text ,
+ receivers_cc text ,
+ create_time timestamp DEFAULT NULL ,
+ timeout int DEFAULT '0' ,
+ resource_ids varchar(64),
+ PRIMARY KEY (id)
+) ;
+create index process_definition_id_and_version on t_ds_process_definition_version (process_definition_id,version);
+
+END;
+$$ LANGUAGE plpgsql;
+
+SELECT ct_dolphin_T_t_ds_process_definition_version();
+DROP FUNCTION IF EXISTS ct_dolphin_T_t_ds_process_definition_version();
+
+
+
+-- add t_ds_resources_un
+CREATE OR REPLACE FUNCTION uc_dolphin_T_t_ds_resources_un() RETURNS void AS $$
+BEGIN
+ IF NOT EXISTS (
+ SELECT 1 FROM information_schema.KEY_COLUMN_USAGE
+ WHERE TABLE_NAME = 't_ds_resources'
+ AND CONSTRAINT_NAME = 't_ds_resources_un'
+ )
+ THEN
 ALTER TABLE t_ds_resources ADD CONSTRAINT t_ds_resources_un UNIQUE (full_name,"type");
+END IF;
+END;
+$$ LANGUAGE plpgsql;
+
+SELECT uc_dolphin_T_t_ds_resources_un();
+DROP FUNCTION IF EXISTS uc_dolphin_T_t_ds_resources_un();
+
+
+
+
+
+
+
+
+
+