mysql and postgresql checkpoint full scale table modify

sql/dolphinscheduler-postgre.sql

@@ -283,18 +283,6 @@ CREATE TABLE t_ds_error_command (
 -- Table structure for table t_ds_master_server
 --
 
-DROP TABLE IF EXISTS t_ds_master_server;
-CREATE TABLE t_ds_master_server (
-  id int NOT NULL  ,
-  host varchar(45) DEFAULT NULL ,
-  port int DEFAULT NULL ,
-  zk_directory varchar(64) DEFAULT NULL ,
-  res_info varchar(256) DEFAULT NULL ,
-  create_time timestamp DEFAULT NULL ,
-  last_heartbeat_time timestamp DEFAULT NULL ,
-  PRIMARY KEY (id)
-) ;
-
 --
 -- Table structure for table t_ds_process_definition
 --
@@ -320,6 +308,7 @@ CREATE TABLE t_ds_process_definition (
   tenant_id int NOT NULL DEFAULT '-1' ,
   update_time timestamp DEFAULT NULL ,
   modify_by varchar(36) DEFAULT '' ,
+  resource_ids varchar(64)
   PRIMARY KEY (id)
 ) ;
 
@@ -360,7 +349,7 @@ CREATE TABLE t_ds_process_instance (
   history_cmd text ,
   dependence_schedule_times text ,
   process_instance_priority int DEFAULT NULL ,
-  worker_group_id int DEFAULT '-1' ,
+  worker_group varchar(64) ,
   timeout int DEFAULT '0' ,
   tenant_id int NOT NULL DEFAULT '-1' ,
   PRIMARY KEY (id)
@@ -506,6 +495,9 @@ CREATE TABLE t_ds_resources (
   size bigint DEFAULT NULL ,
   create_time timestamp DEFAULT NULL ,
   update_time timestamp DEFAULT NULL ,
+  pid int,
+  full_name varchar(64),
+  is_directory int
   PRIMARY KEY (id)
 ) ;
 ;
@@ -527,7 +519,7 @@ CREATE TABLE t_ds_schedules (
   warning_type int NOT NULL ,
   warning_group_id int DEFAULT NULL ,
   process_instance_priority int DEFAULT NULL ,
-  worker_group_id int DEFAULT '-1' ,
+  worker_group varchar(64),
   create_time timestamp NOT NULL ,
   update_time timestamp NOT NULL ,
   PRIMARY KEY (id)
@@ -573,7 +565,7 @@ CREATE TABLE t_ds_task_instance (
   retry_interval int DEFAULT NULL ,
   max_retry_times int DEFAULT NULL ,
   task_instance_priority int DEFAULT NULL ,
-  worker_group_id int DEFAULT '-1' ,
+   worker_group varchar(64),
   executor_id int DEFAULT NULL ,
   PRIMARY KEY (id)
 ) ;

sql/upgrade/1.2.2_schema/mysql/dolphinscheduler_ddl.sql

@@ -36,19 +36,6 @@ delimiter ;
 CALL uc_dolphin_T_t_ds_process_definition_A_modify_by;
 DROP PROCEDURE uc_dolphin_T_t_ds_process_definition_A_modify_by;
 
-<<<<<<< HEAD
--- ac_dolphin_T_t_ds_process_instance_A_worker_group
-drop PROCEDURE if EXISTS ac_dolphin_T_t_ds_process_instance_A_worker_group;
-delimiter d//
-CREATE PROCEDURE ac_dolphin_T_t_ds_process_instance_A_worker_group()
-   BEGIN
-       IF NOT EXISTS (SELECT 1 FROM information_schema.COLUMNS
-           WHERE TABLE_NAME='t_ds_process_instance'
-           AND TABLE_SCHEMA=(SELECT DATABASE())
-           AND COLUMN_NAME ='worker_group')
-   THEN
-         ALTER TABLE t_ds_process_instance ADD `worker_group` varchar(255) DEFAULT '' COMMENT 'worker group';
-=======
 -- uc_dolphin_T_t_ds_task_instance_A_executor_id
 drop PROCEDURE if EXISTS uc_dolphin_T_t_ds_task_instance_A_executor_id;
 delimiter d//
@@ -60,29 +47,12 @@ CREATE PROCEDURE uc_dolphin_T_t_ds_task_instance_A_executor_id()
            AND COLUMN_NAME ='executor_id')
    THEN
          ALTER TABLE t_ds_task_instance ADD `executor_id` int(11) DEFAULT NULL COMMENT 'executor id';
->>>>>>> remotes/upstream/dev
        END IF;
  END;
 
 d//
 
 delimiter ;
-<<<<<<< HEAD
-CALL ac_dolphin_T_t_ds_process_instance_A_worker_group;
-DROP PROCEDURE ac_dolphin_T_t_ds_process_instance_A_worker_group;
-
--- dc_dolphin_T_t_ds_process_instance_D_worker_group_id
-drop PROCEDURE if EXISTS dc_dolphin_T_t_ds_process_instance_D_worker_group_id;
-delimiter d//
-CREATE PROCEDURE dc_dolphin_T_t_ds_process_instance_D_worker_group_id()
-   BEGIN
-       IF EXISTS (SELECT 1 FROM information_schema.COLUMNS
-           WHERE TABLE_NAME='t_ds_process_instance'
-           AND TABLE_SCHEMA=(SELECT DATABASE())
-           AND COLUMN_NAME ='worker_group_id')
-   THEN
-         ALTER TABLE t_ds_process_instance DROP COLUMN worker_group_id;
-=======
 CALL uc_dolphin_T_t_ds_task_instance_A_executor_id;
 DROP PROCEDURE uc_dolphin_T_t_ds_task_instance_A_executor_id;
 
@@ -97,29 +67,12 @@ CREATE PROCEDURE uc_dolphin_T_t_ds_task_instance_C_app_link()
            AND COLUMN_NAME ='app_link')
    THEN
          ALTER TABLE t_ds_task_instance CHANGE COLUMN app_link app_link text COMMENT 'yarn app id';
->>>>>>> remotes/upstream/dev
        END IF;
  END;
 
 d//
 
 delimiter ;
-<<<<<<< HEAD
-CALL dc_dolphin_T_t_ds_process_instance_D_worker_group_id;
-DROP PROCEDURE dc_dolphin_T_t_ds_process_instance_D_worker_group_id;
-
--- ac_dolphin_T_t_ds_task_instance_A_worker_group
-drop PROCEDURE if EXISTS ac_dolphin_T_t_ds_task_instance_A_worker_group;
-delimiter d//
-CREATE PROCEDURE ac_dolphin_T_t_ds_task_instance_A_worker_group()
-   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 ='worker_group')
-   THEN
-         ALTER TABLE t_ds_task_instance ADD `worker_group` varchar(255) DEFAULT '' COMMENT 'worker group';
-=======
 CALL uc_dolphin_T_t_ds_task_instance_C_app_link;
 DROP PROCEDURE uc_dolphin_T_t_ds_task_instance_C_app_link;
 
@@ -134,29 +87,12 @@ CREATE PROCEDURE ac_dolphin_T_t_ds_resources_A_pid()
            AND COLUMN_NAME ='pid')
    THEN
          ALTER TABLE t_ds_resources ADD `pid` int(11) DEFAULT -1 COMMENT 'parent id';
->>>>>>> remotes/upstream/dev
        END IF;
  END;
 
 d//
 
 delimiter ;
-<<<<<<< HEAD
-CALL ac_dolphin_T_t_ds_task_instance_A_worker_group;
-DROP PROCEDURE ac_dolphin_T_t_ds_task_instance_A_worker_group;
-
--- dc_dolphin_T_t_ds_task_instance_D_worker_group_id
-drop PROCEDURE if EXISTS dc_dolphin_T_t_ds_task_instance_D_worker_group_id;
-delimiter d//
-CREATE PROCEDURE dc_dolphin_T_t_ds_task_instance_D_worker_group_id()
-   BEGIN
-       IF EXISTS (SELECT 1 FROM information_schema.COLUMNS
-           WHERE TABLE_NAME='t_ds_task_instance'
-           AND TABLE_SCHEMA=(SELECT DATABASE())
-           AND COLUMN_NAME ='worker_group_id')
-   THEN
-         ALTER TABLE t_ds_task_instance DROP COLUMN worker_group_id;
-=======
 CALL ac_dolphin_T_t_ds_resources_A_pid;
 DROP PROCEDURE ac_dolphin_T_t_ds_resources_A_pid;
 
@@ -171,29 +107,12 @@ CREATE PROCEDURE ac_dolphin_T_t_ds_resources_A_full_name()
            AND COLUMN_NAME ='full_name')
    THEN
          ALTER TABLE t_ds_resources ADD `full_name` varchar(255) DEFAULT NULL COMMENT 'full name';
->>>>>>> remotes/upstream/dev
        END IF;
  END;
 
 d//
 
 delimiter ;
-<<<<<<< HEAD
-CALL dc_dolphin_T_t_ds_task_instance_D_worker_group_id;
-DROP PROCEDURE dc_dolphin_T_t_ds_task_instance_D_worker_group_id;
-
--- ac_dolphin_T_t_ds_schedules_A_worker_group
-drop PROCEDURE if EXISTS ac_dolphin_T_t_ds_schedules_A_worker_group;
-delimiter d//
-CREATE PROCEDURE ac_dolphin_T_t_ds_schedules_A_worker_group()
-   BEGIN
-       IF NOT EXISTS (SELECT 1 FROM information_schema.COLUMNS
-           WHERE TABLE_NAME='t_ds_schedules'
-           AND TABLE_SCHEMA=(SELECT DATABASE())
-           AND COLUMN_NAME ='worker_group')
-   THEN
-         ALTER TABLE t_ds_schedules ADD `worker_group` varchar(255) DEFAULT '' COMMENT 'worker group';
-=======
 CALL ac_dolphin_T_t_ds_resources_A_full_name;
 DROP PROCEDURE ac_dolphin_T_t_ds_resources_A_full_name;
 
@@ -208,29 +127,12 @@ CREATE PROCEDURE ac_dolphin_T_t_ds_resources_is_directory()
            AND COLUMN_NAME ='is_directory')
    THEN
          ALTER TABLE t_ds_resources ADD `is_directory` tinyint(1) DEFAULT 0 COMMENT 'is directory';
->>>>>>> remotes/upstream/dev
        END IF;
  END;
 
 d//
 
 delimiter ;
-<<<<<<< HEAD
-CALL ac_dolphin_T_t_ds_schedules_A_worker_group;
-DROP PROCEDURE ac_dolphin_T_t_ds_schedules_A_worker_group;
-
--- dc_dolphin_T_t_ds_schedules_D_worker_group_id
-drop PROCEDURE if EXISTS dc_dolphin_T_t_ds_schedules_D_worker_group_id;
-delimiter d//
-CREATE PROCEDURE dc_dolphin_T_t_ds_schedules_D_worker_group_id()
-   BEGIN
-       IF EXISTS (SELECT 1 FROM information_schema.COLUMNS
-           WHERE TABLE_NAME='t_ds_schedules'
-           AND TABLE_SCHEMA=(SELECT DATABASE())
-           AND COLUMN_NAME ='worker_group_id')
-   THEN
-         ALTER TABLE t_ds_schedules DROP COLUMN worker_group_id;
-=======
 CALL ac_dolphin_T_t_ds_resources_is_directory;
 DROP PROCEDURE ac_dolphin_T_t_ds_resources_is_directory;
 
@@ -245,17 +147,134 @@ CREATE PROCEDURE ac_dolphin_T_t_ds_process_definition_A_resource_ids()
            AND COLUMN_NAME ='resource_ids')
    THEN
          ALTER TABLE t_ds_process_definition ADD `resource_ids` varchar(255) DEFAULT NULL COMMENT 'resource ids';
->>>>>>> remotes/upstream/dev
        END IF;
  END;
 
 d//
 
 delimiter ;
-<<<<<<< HEAD
-CALL dc_dolphin_T_t_ds_schedules_D_worker_group_id;
-DROP PROCEDURE dc_dolphin_T_t_ds_schedules_D_worker_group_id;
-=======
 CALL ac_dolphin_T_t_ds_process_definition_A_resource_ids;
 DROP PROCEDURE ac_dolphin_T_t_ds_process_definition_A_resource_ids;
->>>>>>> remotes/upstream/dev
+
+
+-- ac_dolphin_T_t_ds_process_instance_A_worker_group
+drop PROCEDURE if EXISTS ac_dolphin_T_t_ds_process_instance_A_worker_group;
+delimiter d//
+CREATE PROCEDURE ac_dolphin_T_t_ds_process_instance_A_worker_group()
+   BEGIN
+       IF NOT EXISTS (SELECT 1 FROM information_schema.COLUMNS
+           WHERE TABLE_NAME='t_ds_process_instance'
+           AND TABLE_SCHEMA=(SELECT DATABASE())
+           AND COLUMN_NAME ='worker_group')
+   THEN
+         ALTER TABLE t_ds_process_instance ADD `worker_group` varchar(255) DEFAULT '' COMMENT 'worker group';
+       END IF;
+ END;
+
+d//
+
+delimiter ;
+CALL ac_dolphin_T_t_ds_process_instance_A_worker_group;
+DROP PROCEDURE ac_dolphin_T_t_ds_process_instance_A_worker_group;
+
+-- dc_dolphin_T_t_ds_process_instance_D_worker_group_id
+drop PROCEDURE if EXISTS dc_dolphin_T_t_ds_process_instance_D_worker_group_id;
+delimiter d//
+CREATE PROCEDURE dc_dolphin_T_t_ds_process_instance_D_worker_group_id()
+   BEGIN
+       IF EXISTS (SELECT 1 FROM information_schema.COLUMNS
+           WHERE TABLE_NAME='t_ds_process_instance'
+           AND TABLE_SCHEMA=(SELECT DATABASE())
+           AND COLUMN_NAME ='worker_group_id')
+   THEN
+         ALTER TABLE t_ds_process_instance DROP COLUMN worker_group_id;
+       END IF;
+ END;
+
+d//
+
+delimiter ;
+CALL dc_dolphin_T_t_ds_process_instance_D_worker_group_id;
+DROP PROCEDURE dc_dolphin_T_t_ds_process_instance_D_worker_group_id;
+
+-- ac_dolphin_T_t_ds_task_instance_A_worker_group
+drop PROCEDURE if EXISTS ac_dolphin_T_t_ds_task_instance_A_worker_group;
+delimiter d//
+CREATE PROCEDURE ac_dolphin_T_t_ds_task_instance_A_worker_group()
+   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 ='worker_group')
+   THEN
+         ALTER TABLE t_ds_task_instance ADD `worker_group` varchar(255) DEFAULT '' COMMENT 'worker group';
+       END IF;
+ END;
+
+d//
+
+delimiter ;
+CALL ac_dolphin_T_t_ds_task_instance_A_worker_group;
+DROP PROCEDURE ac_dolphin_T_t_ds_task_instance_A_worker_group;
+
+-- dc_dolphin_T_t_ds_task_instance_D_worker_group_id
+drop PROCEDURE if EXISTS dc_dolphin_T_t_ds_task_instance_D_worker_group_id;
+delimiter d//
+CREATE PROCEDURE dc_dolphin_T_t_ds_task_instance_D_worker_group_id()
+   BEGIN
+       IF EXISTS (SELECT 1 FROM information_schema.COLUMNS
+           WHERE TABLE_NAME='t_ds_task_instance'
+           AND TABLE_SCHEMA=(SELECT DATABASE())
+           AND COLUMN_NAME ='worker_group_id')
+   THEN
+         ALTER TABLE t_ds_task_instance DROP COLUMN worker_group_id;
+       END IF;
+ END;
+
+d//
+
+delimiter ;
+CALL dc_dolphin_T_t_ds_task_instance_D_worker_group_id;
+DROP PROCEDURE dc_dolphin_T_t_ds_task_instance_D_worker_group_id;
+
+-- ac_dolphin_T_t_ds_schedules_A_worker_group
+drop PROCEDURE if EXISTS ac_dolphin_T_t_ds_schedules_A_worker_group;
+delimiter d//
+CREATE PROCEDURE ac_dolphin_T_t_ds_schedules_A_worker_group()
+   BEGIN
+       IF NOT EXISTS (SELECT 1 FROM information_schema.COLUMNS
+           WHERE TABLE_NAME='t_ds_schedules'
+           AND TABLE_SCHEMA=(SELECT DATABASE())
+           AND COLUMN_NAME ='worker_group')
+   THEN
+         ALTER TABLE t_ds_schedules ADD `worker_group` varchar(255) DEFAULT '' COMMENT 'worker group';
+       END IF;
+ END;
+
+d//
+
+delimiter ;
+CALL ac_dolphin_T_t_ds_schedules_A_worker_group;
+DROP PROCEDURE ac_dolphin_T_t_ds_schedules_A_worker_group;
+
+-- dc_dolphin_T_t_ds_schedules_D_worker_group_id
+drop PROCEDURE if EXISTS dc_dolphin_T_t_ds_schedules_D_worker_group_id;
+delimiter d//
+CREATE PROCEDURE dc_dolphin_T_t_ds_schedules_D_worker_group_id()
+   BEGIN
+       IF EXISTS (SELECT 1 FROM information_schema.COLUMNS
+           WHERE TABLE_NAME='t_ds_schedules'
+           AND TABLE_SCHEMA=(SELECT DATABASE())
+           AND COLUMN_NAME ='worker_group_id')
+   THEN
+         ALTER TABLE t_ds_schedules DROP COLUMN worker_group_id;
+       END IF;
+ END;
+
+d//
+
+delimiter ;
+CALL dc_dolphin_T_t_ds_schedules_D_worker_group_id;
+DROP PROCEDURE dc_dolphin_T_t_ds_schedules_D_worker_group_id;
+
+

sql/upgrade/1.2.2_schema/postgresql/dolphinscheduler_ddl.sql

@@ -32,7 +32,126 @@ delimiter ;
 SELECT uc_dolphin_T_t_ds_process_definition_A_modify_by();
 DROP FUNCTION IF EXISTS uc_dolphin_T_t_ds_process_definition_A_modify_by();
 
-<<<<<<< HEAD
+-- uc_dolphin_T_t_ds_task_instance_A_executor_id
+delimiter d//
+CREATE OR REPLACE FUNCTION uc_dolphin_T_t_ds_task_instance_A_executor_id() RETURNS void AS $$
+BEGIN
+       IF NOT EXISTS (SELECT 1 FROM information_schema.COLUMNS
+          WHERE TABLE_NAME='t_ds_task_instance'
+                            AND COLUMN_NAME ='executor_id')
+      THEN
+         ALTER TABLE t_ds_task_instance ADD COLUMN executor_id int DEFAULT NULL;
+       END IF;
+END;
+$$ LANGUAGE plpgsql;
+d//
+
+delimiter ;
+SELECT uc_dolphin_T_t_ds_task_instance_A_executor_id();
+DROP FUNCTION IF EXISTS uc_dolphin_T_t_ds_task_instance_A_executor_id();
+
+-- uc_dolphin_T_t_ds_task_instance_C_app_link
+delimiter d//
+CREATE OR REPLACE FUNCTION uc_dolphin_T_t_ds_task_instance_C_app_link() RETURNS void AS $$
+BEGIN
+       IF NOT EXISTS (SELECT 1 FROM information_schema.COLUMNS
+          WHERE TABLE_NAME='t_ds_task_instance'
+                            AND COLUMN_NAME ='app_link')
+      THEN
+         ALTER TABLE t_ds_task_instance ALTER COLUMN app_link type text;
+       END IF;
+END;
+$$ LANGUAGE plpgsql;
+d//
+
+delimiter ;
+SELECT uc_dolphin_T_t_ds_task_instance_C_app_link();
+DROP FUNCTION IF EXISTS uc_dolphin_T_t_ds_task_instance_C_app_link();
+
+
+-- ac_dolphin_T_t_ds_resources_A_pid
+delimiter d//
+CREATE FUNCTION ac_dolphin_T_t_ds_resources_A_pid() RETURNS void AS $$
+BEGIN
+       IF NOT EXISTS (SELECT 1 FROM information_schema.COLUMNS
+          WHERE TABLE_CATALOG=current_database()
+          AND TABLE_SCHEMA=current_schema()
+          AND TABLE_NAME='t_ds_resources'
+          AND COLUMN_NAME ='pid')
+      THEN
+         ALTER TABLE t_ds_resources ADD COLUMN pid int DEFAULT -1;
+       END IF;
+END;
+$$ LANGUAGE plpgsql;
+d//
+delimiter ;
+select ac_dolphin_T_t_ds_resources_A_pid();
+DROP FUNCTION ac_dolphin_T_t_ds_resources_A_pid();
+
+-- ac_dolphin_T_t_ds_resources_A_full_name
+delimiter ;
+DROP FUNCTION IF EXISTS ac_dolphin_T_t_ds_resources_A_full_name();
+delimiter d//
+CREATE FUNCTION ac_dolphin_T_t_ds_resources_A_full_name() RETURNS void AS $$
+BEGIN
+       IF NOT EXISTS (SELECT 1 FROM information_schema.COLUMNS
+          WHERE TABLE_CATALOG=current_database()
+          AND TABLE_SCHEMA=current_schema()
+          AND TABLE_NAME='t_ds_resources'
+          AND COLUMN_NAME ='full_name')
+      THEN
+         ALTER TABLE t_ds_resources ADD COLUMN full_name varchar(255) DEFAULT null;
+       END IF;
+END;
+$$ LANGUAGE plpgsql;
+d//
+delimiter ;
+select ac_dolphin_T_t_ds_resources_A_full_name();
+DROP FUNCTION ac_dolphin_T_t_ds_resources_A_full_name();
+
+-- ac_dolphin_T_t_ds_resources_A_is_directory
+delimiter ;
+DROP FUNCTION IF EXISTS ac_dolphin_T_t_ds_resources_A_is_directory();
+delimiter d//
+CREATE FUNCTION ac_dolphin_T_t_ds_resources_A_is_directory() RETURNS void AS $$
+BEGIN
+       IF NOT EXISTS (SELECT 1 FROM information_schema.COLUMNS
+          WHERE TABLE_CATALOG=current_database()
+          AND TABLE_SCHEMA=current_schema()
+          AND TABLE_NAME='t_ds_resources'
+          AND COLUMN_NAME ='is_directory')
+      THEN
+         ALTER TABLE t_ds_resources ADD COLUMN is_directory boolean DEFAULT false;
+       END IF;
+END;
+$$ LANGUAGE plpgsql;
+d//
+delimiter ;
+select ac_dolphin_T_t_ds_resources_A_is_directory();
+DROP FUNCTION ac_dolphin_T_t_ds_resources_A_is_directory();
+
+-- ac_dolphin_T_t_ds_process_definition_A_resource_ids
+delimiter ;
+DROP FUNCTION IF EXISTS ac_dolphin_T_t_ds_process_definition_A_resource_ids();
+delimiter d//
+CREATE FUNCTION ac_dolphin_T_t_ds_process_definition_A_resource_ids() RETURNS void AS $$
+BEGIN
+       IF NOT EXISTS (SELECT 1 FROM information_schema.COLUMNS
+          WHERE TABLE_CATALOG=current_database()
+          AND TABLE_SCHEMA=current_schema()
+          AND TABLE_NAME='t_ds_process_definition'
+          AND COLUMN_NAME ='resource_ids')
+      THEN
+         ALTER TABLE t_ds_process_definition ADD COLUMN resource_ids varchar(255) DEFAULT null;
+       END IF;
+END;
+$$ LANGUAGE plpgsql;
+d//
+delimiter ;
+select ac_dolphin_T_t_ds_process_definition_A_resource_ids();
+DROP FUNCTION ac_dolphin_T_t_ds_process_definition_A_resource_ids();
+
+
 -- ac_dolphin_T_t_ds_process_instance_A_worker_group
 delimiter ;
 DROP FUNCTION IF EXISTS ac_dolphin_T_t_ds_process_instance_A_worker_group();
@@ -46,22 +165,10 @@ BEGIN
           AND COLUMN_NAME ='worker_group')
       THEN
          ALTER TABLE t_ds_process_instance ADD COLUMN worker_group varchar(255) DEFAULT null;
-=======
--- uc_dolphin_T_t_ds_task_instance_A_executor_id
-delimiter d//
-CREATE OR REPLACE FUNCTION uc_dolphin_T_t_ds_task_instance_A_executor_id() RETURNS void AS $$
-BEGIN
-       IF NOT EXISTS (SELECT 1 FROM information_schema.COLUMNS
-          WHERE TABLE_NAME='t_ds_task_instance'
-                            AND COLUMN_NAME ='executor_id')
-      THEN
-         ALTER TABLE t_ds_task_instance ADD COLUMN executor_id int DEFAULT NULL;
->>>>>>> remotes/upstream/dev
        END IF;
 END;
 $$ LANGUAGE plpgsql;
 d//
-<<<<<<< HEAD
 delimiter ;
 select ac_dolphin_T_t_ds_process_instance_A_worker_group();
 DROP FUNCTION ac_dolphin_T_t_ds_process_instance_A_worker_group();
@@ -79,27 +186,10 @@ BEGIN
           AND COLUMN_NAME ='worker_group_id')
       THEN
          ALTER TABLE t_ds_process_instance DROP COLUMN worker_group_id;
-=======
-
-delimiter ;
-SELECT uc_dolphin_T_t_ds_task_instance_A_executor_id();
-DROP FUNCTION IF EXISTS uc_dolphin_T_t_ds_task_instance_A_executor_id();
-
--- uc_dolphin_T_t_ds_task_instance_C_app_link
-delimiter d//
-CREATE OR REPLACE FUNCTION uc_dolphin_T_t_ds_task_instance_C_app_link() RETURNS void AS $$
-BEGIN
-       IF NOT EXISTS (SELECT 1 FROM information_schema.COLUMNS
-          WHERE TABLE_NAME='t_ds_task_instance'
-                            AND COLUMN_NAME ='app_link')
-      THEN
-         ALTER TABLE t_ds_task_instance ALTER COLUMN app_link type text;
->>>>>>> remotes/upstream/dev
        END IF;
 END;
 $$ LANGUAGE plpgsql;
 d//
-<<<<<<< HEAD
 delimiter ;
 select dc_dolphin_T_t_ds_process_instance_D_worker_group_id();
 DROP FUNCTION dc_dolphin_T_t_ds_process_instance_D_worker_group_id();
@@ -110,38 +200,19 @@ delimiter ;
 DROP FUNCTION IF EXISTS ac_dolphin_T_t_ds_task_instance_A_worker_group();
 delimiter d//
 CREATE FUNCTION ac_dolphin_T_t_ds_task_instance_A_worker_group() RETURNS void AS $$
-=======
-
-delimiter ;
-SELECT uc_dolphin_T_t_ds_task_instance_C_app_link();
-DROP FUNCTION IF EXISTS uc_dolphin_T_t_ds_task_instance_C_app_link();
-
-
--- ac_dolphin_T_t_ds_resources_A_pid
-delimiter d//
-CREATE FUNCTION ac_dolphin_T_t_ds_resources_A_pid() RETURNS void AS $$
->>>>>>> remotes/upstream/dev
 BEGIN
        IF NOT EXISTS (SELECT 1 FROM information_schema.COLUMNS
           WHERE TABLE_CATALOG=current_database()
           AND TABLE_SCHEMA=current_schema()
-<<<<<<< HEAD
           AND TABLE_NAME='t_ds_task_instance'
           AND COLUMN_NAME ='worker_group')
       THEN
          ALTER TABLE t_ds_task_instance ADD COLUMN worker_group varchar(255) DEFAULT null;
-=======
-          AND TABLE_NAME='t_ds_resources'
-          AND COLUMN_NAME ='pid')
-      THEN
-         ALTER TABLE t_ds_resources ADD COLUMN pid int DEFAULT -1;
->>>>>>> remotes/upstream/dev
        END IF;
 END;
 $$ LANGUAGE plpgsql;
 d//
 delimiter ;
-<<<<<<< HEAD
 select ac_dolphin_T_t_ds_task_instance_A_worker_group();
 DROP FUNCTION ac_dolphin_T_t_ds_task_instance_A_worker_group();
 
@@ -158,30 +229,11 @@ BEGIN
           AND COLUMN_NAME ='worker_group_id')
       THEN
          ALTER TABLE t_ds_task_instance DROP COLUMN worker_group_id;
-=======
-select ac_dolphin_T_t_ds_resources_A_pid();
-DROP FUNCTION ac_dolphin_T_t_ds_resources_A_pid();
-
--- ac_dolphin_T_t_ds_resources_A_full_name
-delimiter ;
-DROP FUNCTION IF EXISTS ac_dolphin_T_t_ds_resources_A_full_name();
-delimiter d//
-CREATE FUNCTION ac_dolphin_T_t_ds_resources_A_full_name() RETURNS void AS $$
-BEGIN
-       IF NOT EXISTS (SELECT 1 FROM information_schema.COLUMNS
-          WHERE TABLE_CATALOG=current_database()
-          AND TABLE_SCHEMA=current_schema()
-          AND TABLE_NAME='t_ds_resources'
-          AND COLUMN_NAME ='full_name')
-      THEN
-         ALTER TABLE t_ds_resources ADD COLUMN full_name varchar(255) DEFAULT null;
->>>>>>> remotes/upstream/dev
        END IF;
 END;
 $$ LANGUAGE plpgsql;
 d//
 delimiter ;
-<<<<<<< HEAD
 select dc_dolphin_T_t_ds_task_instance_D_worker_group_id();
 DROP FUNCTION dc_dolphin_T_t_ds_task_instance_D_worker_group_id();
 
@@ -190,37 +242,19 @@ delimiter ;
 DROP FUNCTION IF EXISTS ac_dolphin_T_t_ds_schedules_A_worker_group();
 delimiter d//
 CREATE FUNCTION ac_dolphin_T_t_ds_schedules_A_worker_group() RETURNS void AS $$
-=======
-select ac_dolphin_T_t_ds_resources_A_full_name();
-DROP FUNCTION ac_dolphin_T_t_ds_resources_A_full_name();
-
--- ac_dolphin_T_t_ds_resources_A_is_directory
-delimiter ;
-DROP FUNCTION IF EXISTS ac_dolphin_T_t_ds_resources_A_is_directory();
-delimiter d//
-CREATE FUNCTION ac_dolphin_T_t_ds_resources_A_is_directory() RETURNS void AS $$
->>>>>>> remotes/upstream/dev
 BEGIN
        IF NOT EXISTS (SELECT 1 FROM information_schema.COLUMNS
           WHERE TABLE_CATALOG=current_database()
           AND TABLE_SCHEMA=current_schema()
-<<<<<<< HEAD
           AND TABLE_NAME='t_ds_schedules'
           AND COLUMN_NAME ='worker_group')
       THEN
          ALTER TABLE t_ds_schedules ADD COLUMN worker_group varchar(255) DEFAULT null;
-=======
-          AND TABLE_NAME='t_ds_resources'
-          AND COLUMN_NAME ='is_directory')
-      THEN
-         ALTER TABLE t_ds_resources ADD COLUMN is_directory boolean DEFAULT false;
->>>>>>> remotes/upstream/dev
        END IF;
 END;
 $$ LANGUAGE plpgsql;
 d//
 delimiter ;
-<<<<<<< HEAD
 select ac_dolphin_T_t_ds_schedules_A_worker_group();
 DROP FUNCTION ac_dolphin_T_t_ds_schedules_A_worker_group();
 
@@ -237,34 +271,12 @@ BEGIN
           AND COLUMN_NAME ='worker_group_id')
       THEN
          ALTER TABLE t_ds_schedules DROP COLUMN worker_group_id;
-=======
-select ac_dolphin_T_t_ds_resources_A_is_directory();
-DROP FUNCTION ac_dolphin_T_t_ds_resources_A_is_directory();
-
--- ac_dolphin_T_t_ds_process_definition_A_resource_ids
-delimiter ;
-DROP FUNCTION IF EXISTS ac_dolphin_T_t_ds_process_definition_A_resource_ids();
-delimiter d//
-CREATE FUNCTION ac_dolphin_T_t_ds_process_definition_A_resource_ids() RETURNS void AS $$
-BEGIN
-       IF NOT EXISTS (SELECT 1 FROM information_schema.COLUMNS
-          WHERE TABLE_CATALOG=current_database()
-          AND TABLE_SCHEMA=current_schema()
-          AND TABLE_NAME='t_ds_process_definition'
-          AND COLUMN_NAME ='resource_ids')
-      THEN
-         ALTER TABLE t_ds_process_definition ADD COLUMN resource_ids varchar(255) DEFAULT null;
->>>>>>> remotes/upstream/dev
        END IF;
 END;
 $$ LANGUAGE plpgsql;
 d//
 delimiter ;
-<<<<<<< HEAD
 select dc_dolphin_T_t_ds_schedules_D_worker_group_id();
 DROP FUNCTION dc_dolphin_T_t_ds_schedules_D_worker_group_id();
 
-=======
-select ac_dolphin_T_t_ds_process_definition_A_resource_ids();
-DROP FUNCTION ac_dolphin_T_t_ds_process_definition_A_resource_ids();
->>>>>>> remotes/upstream/dev
+