github
/
DolphinScheduler
mirror of https://gitee.com/dolphinscheduler/DolphinScheduler.git
1
0
Fork 0
Code Issues Releases Wiki Activity
Browse Source

[Bug-6152][Server] Fix the the exception of manual workflow execution (#6209)

2.0.7-release
Hua Jiang 3 years ago committed by GitHub
parent
c1496d8a74
commit
5fead427f2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 113 additions and 88 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProcessTaskRelationLogMapper.xml
  2. 4
      dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProcessTaskRelationMapper.xml
  3. 8
      dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskDefinitionLogMapper.xml
  4. 12
      dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskDefinitionMapper.xml
  5. 169
      sql/dolphinscheduler_postgre.sql

4
dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProcessTaskRelationLogMapper.xml
Unescape View File

@ -19,7 +19,7 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" > <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="org.apache.dolphinscheduler.dao.mapper.ProcessTaskRelationLogMapper"> <mapper namespace="org.apache.dolphinscheduler.dao.mapper.ProcessTaskRelationLogMapper">
<sql id="baseSql"> <sql id="baseSql">
id, `name`, process_definition_version, project_code, process_definition_code, pre_task_code, pre_task_version, id, name, process_definition_version, project_code, process_definition_code, pre_task_code, pre_task_version,
post_task_code, post_task_version, condition_type, condition_params, operator, operate_time, create_time, update_time post_task_code, post_task_version, condition_type, condition_params, operator, operate_time, create_time, update_time
</sql> </sql>
<select id="queryByProcessCodeAndVersion" resultType="org.apache.dolphinscheduler.dao.entity.ProcessTaskRelationLog"> <select id="queryByProcessCodeAndVersion" resultType="org.apache.dolphinscheduler.dao.entity.ProcessTaskRelationLog">
@ -30,7 +30,7 @@
and process_definition_version = #{processVersion} and process_definition_version = #{processVersion}
</select> </select>
<insert id="batchInsert"> <insert id="batchInsert">
insert into t_ds_process_task_relation_log (`name`, process_definition_version, project_code, process_definition_code, insert into t_ds_process_task_relation_log (name, process_definition_version, project_code, process_definition_code,
pre_task_code, pre_task_version, post_task_code, post_task_version, condition_type, condition_params, operator, operate_time, pre_task_code, pre_task_version, post_task_code, post_task_version, condition_type, condition_params, operator, operate_time,
create_time, update_time) create_time, update_time)
values values

4
dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProcessTaskRelationMapper.xml
Unescape View File

@ -19,7 +19,7 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" > <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="org.apache.dolphinscheduler.dao.mapper.ProcessTaskRelationMapper"> <mapper namespace="org.apache.dolphinscheduler.dao.mapper.ProcessTaskRelationMapper">
<sql id="baseSql"> <sql id="baseSql">
id, `name`, process_definition_version, project_code, process_definition_code, pre_task_code, pre_task_version, id, name, process_definition_version, project_code, process_definition_code, pre_task_code, pre_task_version,
post_task_code, post_task_version, condition_type, condition_params, create_time, update_time post_task_code, post_task_version, condition_type, condition_params, create_time, update_time
</sql> </sql>
<select id="queryByProcessCode" resultType="org.apache.dolphinscheduler.dao.entity.ProcessTaskRelation"> <select id="queryByProcessCode" resultType="org.apache.dolphinscheduler.dao.entity.ProcessTaskRelation">
@ -60,7 +60,7 @@
and process_definition_code = #{processCode} and process_definition_code = #{processCode}
</delete> </delete>
<insert id="batchInsert"> <insert id="batchInsert">
insert into t_ds_process_task_relation (`name`, process_definition_version, project_code, process_definition_code, insert into t_ds_process_task_relation (name, process_definition_version, project_code, process_definition_code,
pre_task_code, pre_task_version, post_task_code, post_task_version, condition_type, condition_params, create_time, update_time) pre_task_code, pre_task_version, post_task_code, post_task_version, condition_type, condition_params, create_time, update_time)
values values
<foreach collection="taskRelationList" item="relation" separator=","> <foreach collection="taskRelationList" item="relation" separator=",">

8
dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskDefinitionLogMapper.xml
Unescape View File

@ -19,7 +19,7 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" > <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="org.apache.dolphinscheduler.dao.mapper.TaskDefinitionLogMapper"> <mapper namespace="org.apache.dolphinscheduler.dao.mapper.TaskDefinitionLogMapper">
<sql id="baseSql"> <sql id="baseSql">
id, code, `name`, version, description, project_code, user_id, task_type, task_params, flag, task_priority, id, code, name, version, description, project_code, user_id, task_type, task_params, flag, task_priority,
worker_group, environment_code, fail_retry_times, fail_retry_interval, timeout_flag, timeout_notify_strategy, timeout, delay_time, worker_group, environment_code, fail_retry_times, fail_retry_interval, timeout_flag, timeout_notify_strategy, timeout, delay_time,
resource_ids, operator, operate_time, create_time, update_time resource_ids, operator, operate_time, create_time, update_time
</sql> </sql>
@ -49,14 +49,14 @@
</if> </if>
</select> </select>
<insert id="batchInsert"> <insert id="batchInsert">
insert into t_ds_task_definition_log (code, `name`, version, description, project_code, user_id, insert into t_ds_task_definition_log (code, name, version, description, project_code, user_id,
task_type, task_params, flag, task_priority, worker_group, fail_retry_times, fail_retry_interval, task_type, task_params, flag, task_priority, worker_group, environment_code, fail_retry_times, fail_retry_interval,
timeout_flag, timeout_notify_strategy, timeout, delay_time, resource_ids, operator, operate_time, create_time, update_time) timeout_flag, timeout_notify_strategy, timeout, delay_time, resource_ids, operator, operate_time, create_time, update_time)
values values
<foreach collection="taskDefinitionLogs" item="taskDefinitionLog" separator=","> <foreach collection="taskDefinitionLogs" item="taskDefinitionLog" separator=",">
(#{taskDefinitionLog.code},#{taskDefinitionLog.name},#{taskDefinitionLog.version},#{taskDefinitionLog.description}, (#{taskDefinitionLog.code},#{taskDefinitionLog.name},#{taskDefinitionLog.version},#{taskDefinitionLog.description},
#{taskDefinitionLog.projectCode},#{taskDefinitionLog.userId},#{taskDefinitionLog.taskType},#{taskDefinitionLog.taskParams}, #{taskDefinitionLog.projectCode},#{taskDefinitionLog.userId},#{taskDefinitionLog.taskType},#{taskDefinitionLog.taskParams},
#{taskDefinitionLog.flag},#{taskDefinitionLog.taskPriority},#{taskDefinitionLog.workerGroup},#{taskDefinitionLog.failRetryTimes}, #{taskDefinitionLog.flag},#{taskDefinitionLog.taskPriority},#{taskDefinitionLog.workerGroup},#{taskDefinitionLog.environmentCode},#{taskDefinitionLog.failRetryTimes},
#{taskDefinitionLog.failRetryInterval},#{taskDefinitionLog.timeoutFlag},#{taskDefinitionLog.timeoutNotifyStrategy},#{taskDefinitionLog.timeout}, #{taskDefinitionLog.failRetryInterval},#{taskDefinitionLog.timeoutFlag},#{taskDefinitionLog.timeoutNotifyStrategy},#{taskDefinitionLog.timeout},
#{taskDefinitionLog.delayTime},#{taskDefinitionLog.resourceIds},#{taskDefinitionLog.operator},#{taskDefinitionLog.operateTime}, #{taskDefinitionLog.delayTime},#{taskDefinitionLog.resourceIds},#{taskDefinitionLog.operator},#{taskDefinitionLog.operateTime},
#{taskDefinitionLog.createTime},#{taskDefinitionLog.updateTime}) #{taskDefinitionLog.createTime},#{taskDefinitionLog.updateTime})

12
dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskDefinitionMapper.xml
Unescape View File

@ -19,7 +19,7 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" > <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="org.apache.dolphinscheduler.dao.mapper.TaskDefinitionMapper"> <mapper namespace="org.apache.dolphinscheduler.dao.mapper.TaskDefinitionMapper">
<sql id="baseSql"> <sql id="baseSql">
id, code, `name`, version, description, project_code, user_id, task_type, task_params, flag, task_priority, id, code, name, version, description, project_code, user_id, task_type, task_params, flag, task_priority,
worker_group, environment_code, fail_retry_times, fail_retry_interval, timeout_flag, timeout_notify_strategy, timeout, delay_time, worker_group, environment_code, fail_retry_times, fail_retry_interval, timeout_flag, timeout_notify_strategy, timeout, delay_time,
resource_ids, create_time, update_time resource_ids, create_time, update_time
</sql> </sql>
@ -28,7 +28,7 @@
<include refid="baseSql"/> <include refid="baseSql"/>
from t_ds_task_definition from t_ds_task_definition
WHERE project_code = #{projectCode} WHERE project_code = #{projectCode}
and `name` = #{name} and name = #{name}
</select> </select>
<select id="queryAllDefinitionList" resultType="org.apache.dolphinscheduler.dao.entity.TaskDefinition"> <select id="queryAllDefinitionList" resultType="org.apache.dolphinscheduler.dao.entity.TaskDefinition">
select select
@ -74,21 +74,21 @@
where code = #{code} where code = #{code}
</delete> </delete>
<insert id="batchInsert"> <insert id="batchInsert">
insert into t_ds_task_definition (code, `name`, version, description, project_code, user_id, insert into t_ds_task_definition (code, name, version, description, project_code, user_id,
task_type, task_params, flag, task_priority, worker_group, fail_retry_times, fail_retry_interval, task_type, task_params, flag, task_priority, worker_group, environment_code, fail_retry_times, fail_retry_interval,
timeout_flag, timeout_notify_strategy, timeout, delay_time, resource_ids, create_time, update_time) timeout_flag, timeout_notify_strategy, timeout, delay_time, resource_ids, create_time, update_time)
values values
<foreach collection="taskDefinitions" item="taskDefinition" separator=","> <foreach collection="taskDefinitions" item="taskDefinition" separator=",">
(#{taskDefinition.code},#{taskDefinition.name},#{taskDefinition.version},#{taskDefinition.description}, (#{taskDefinition.code},#{taskDefinition.name},#{taskDefinition.version},#{taskDefinition.description},
#{taskDefinition.projectCode},#{taskDefinition.userId},#{taskDefinition.taskType},#{taskDefinition.taskParams}, #{taskDefinition.projectCode},#{taskDefinition.userId},#{taskDefinition.taskType},#{taskDefinition.taskParams},
#{taskDefinition.flag},#{taskDefinition.taskPriority},#{taskDefinition.workerGroup},#{taskDefinition.failRetryTimes}, #{taskDefinition.flag},#{taskDefinition.taskPriority},#{taskDefinition.workerGroup},#{taskDefinition.environmentCode},#{taskDefinition.failRetryTimes},
#{taskDefinition.failRetryInterval},#{taskDefinition.timeoutFlag},#{taskDefinition.timeoutNotifyStrategy},#{taskDefinition.timeout}, #{taskDefinition.failRetryInterval},#{taskDefinition.timeoutFlag},#{taskDefinition.timeoutNotifyStrategy},#{taskDefinition.timeout},
#{taskDefinition.delayTime},#{taskDefinition.resourceIds},#{taskDefinition.createTime},#{taskDefinition.updateTime}) #{taskDefinition.delayTime},#{taskDefinition.resourceIds},#{taskDefinition.createTime},#{taskDefinition.updateTime})
</foreach> </foreach>
</insert> </insert>
<select id="queryDefineListPaging" resultType="org.apache.dolphinscheduler.dao.entity.TaskDefinition"> <select id="queryDefineListPaging" resultType="org.apache.dolphinscheduler.dao.entity.TaskDefinition">
select td.id, td.code, td.name, td.version, td.description, td.project_code, td.user_id, td.task_type, td.task_params, select td.id, td.code, td.name, td.version, td.description, td.project_code, td.user_id, td.task_type, td.task_params,
td.flag, td.task_priority, td.worker_group, td.fail_retry_times, td.fail_retry_interval, td.timeout_flag, td.timeout_notify_strategy, td.flag, td.task_priority, td.worker_group,td.environment_code, td.fail_retry_times, td.fail_retry_interval, td.timeout_flag, td.timeout_notify_strategy,
td.timeout, td.delay_time, td.resource_ids, td.create_time, td.update_time, u.user_name,p.name as project_name td.timeout, td.delay_time, td.resource_ids, td.create_time, td.update_time, u.user_name,p.name as project_name
from t_ds_task_definition td from t_ds_task_definition td
JOIN t_ds_user u ON td.user_id = u.id JOIN t_ds_user u ON td.user_id = u.id

169
sql/dolphinscheduler_postgre.sql
Unescape View File

@ -27,57 +27,64 @@ DROP TABLE IF EXISTS QRTZ_TRIGGERS;
DROP TABLE IF EXISTS QRTZ_JOB_DETAILS; DROP TABLE IF EXISTS QRTZ_JOB_DETAILS;
DROP TABLE IF EXISTS QRTZ_CALENDARS; DROP TABLE IF EXISTS QRTZ_CALENDARS;
CREATE TABLE QRTZ_JOB_DETAILS( CREATE TABLE QRTZ_JOB_DETAILS (
SCHED_NAME character varying(120) NOT NULL, SCHED_NAME character varying(120) NOT NULL,
JOB_NAME character varying(200) NOT NULL, JOB_NAME character varying(200) NOT NULL,
JOB_GROUP character varying(200) NOT NULL, JOB_GROUP character varying(200) NOT NULL,
DESCRIPTION character varying(250) NULL, DESCRIPTION character varying(250) NULL,
JOB_CLASS_NAME character varying(250) NOT NULL, JOB_CLASS_NAME character varying(250) NOT NULL,
IS_DURABLE boolean NOT NULL, IS_DURABLE boolean NOT NULL,
IS_NONCONCURRENT boolean NOT NULL, IS_NONCONCURRENT boolean NOT NULL,
IS_UPDATE_DATA boolean NOT NULL, IS_UPDATE_DATA boolean NOT NULL,
REQUESTS_RECOVERY boolean NOT NULL, REQUESTS_RECOVERY boolean NOT NULL,
JOB_DATA bytea NULL); JOB_DATA bytea NULL
);
alter table QRTZ_JOB_DETAILS add primary key(SCHED_NAME,JOB_NAME,JOB_GROUP); alter table QRTZ_JOB_DETAILS add primary key(SCHED_NAME,JOB_NAME,JOB_GROUP);
CREATE TABLE QRTZ_TRIGGERS ( CREATE TABLE QRTZ_TRIGGERS (
SCHED_NAME character varying(120) NOT NULL, SCHED_NAME character varying(120) NOT NULL,
TRIGGER_NAME character varying(200) NOT NULL, TRIGGER_NAME character varying(200) NOT NULL,
TRIGGER_GROUP character varying(200) NOT NULL, TRIGGER_GROUP character varying(200) NOT NULL,
JOB_NAME character varying(200) NOT NULL, JOB_NAME character varying(200) NOT NULL,
JOB_GROUP character varying(200) NOT NULL, JOB_GROUP character varying(200) NOT NULL,
DESCRIPTION character varying(250) NULL, DESCRIPTION character varying(250) NULL,
NEXT_FIRE_TIME BIGINT NULL, NEXT_FIRE_TIME BIGINT NULL,
PREV_FIRE_TIME BIGINT NULL, PREV_FIRE_TIME BIGINT NULL,
PRIORITY INTEGER NULL, PRIORITY INTEGER NULL,
TRIGGER_STATE character varying(16) NOT NULL, TRIGGER_STATE character varying(16) NOT NULL,
TRIGGER_TYPE character varying(8) NOT NULL, TRIGGER_TYPE character varying(8) NOT NULL,
START_TIME BIGINT NOT NULL, START_TIME BIGINT NOT NULL,
END_TIME BIGINT NULL, END_TIME BIGINT NULL,
CALENDAR_NAME character varying(200) NULL, CALENDAR_NAME character varying(200) NULL,
MISFIRE_INSTR SMALLINT NULL, MISFIRE_INSTR SMALLINT NULL,
JOB_DATA bytea NULL) ; JOB_DATA bytea NULL
) ;
alter table QRTZ_TRIGGERS add primary key(SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP); alter table QRTZ_TRIGGERS add primary key(SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP);
CREATE TABLE QRTZ_SIMPLE_TRIGGERS ( CREATE TABLE QRTZ_SIMPLE_TRIGGERS (
SCHED_NAME character varying(120) NOT NULL, SCHED_NAME character varying(120) NOT NULL,
TRIGGER_NAME character varying(200) NOT NULL, TRIGGER_NAME character varying(200) NOT NULL,
TRIGGER_GROUP character varying(200) NOT NULL, TRIGGER_GROUP character varying(200) NOT NULL,
REPEAT_COUNT BIGINT NOT NULL, REPEAT_COUNT BIGINT NOT NULL,
REPEAT_INTERVAL BIGINT NOT NULL, REPEAT_INTERVAL BIGINT NOT NULL,
TIMES_TRIGGERED BIGINT NOT NULL) ; TIMES_TRIGGERED BIGINT NOT NULL
) ;
alter table QRTZ_SIMPLE_TRIGGERS add primary key(SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP); alter table QRTZ_SIMPLE_TRIGGERS add primary key(SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP);
CREATE TABLE QRTZ_CRON_TRIGGERS ( CREATE TABLE QRTZ_CRON_TRIGGERS (
SCHED_NAME character varying(120) NOT NULL, SCHED_NAME character varying(120) NOT NULL,
TRIGGER_NAME character varying(200) NOT NULL, TRIGGER_NAME character varying(200) NOT NULL,
TRIGGER_GROUP character varying(200) NOT NULL, TRIGGER_GROUP character varying(200) NOT NULL,
CRON_EXPRESSION character varying(120) NOT NULL, CRON_EXPRESSION character varying(120) NOT NULL,
TIME_ZONE_ID character varying(80)) ; TIME_ZONE_ID character varying(80)
) ;
alter table QRTZ_CRON_TRIGGERS add primary key(SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP); alter table QRTZ_CRON_TRIGGERS add primary key(SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP);
CREATE TABLE QRTZ_SIMPROP_TRIGGERS CREATE TABLE QRTZ_SIMPROP_TRIGGERS (
(
SCHED_NAME character varying(120) NOT NULL, SCHED_NAME character varying(120) NOT NULL,
TRIGGER_NAME character varying(200) NOT NULL, TRIGGER_NAME character varying(200) NOT NULL,
TRIGGER_GROUP character varying(200) NOT NULL, TRIGGER_GROUP character varying(200) NOT NULL,
@ -91,53 +98,67 @@ CREATE TABLE QRTZ_SIMPROP_TRIGGERS
DEC_PROP_1 NUMERIC(13,4) NULL, DEC_PROP_1 NUMERIC(13,4) NULL,
DEC_PROP_2 NUMERIC(13,4) NULL, DEC_PROP_2 NUMERIC(13,4) NULL,
BOOL_PROP_1 boolean NULL, BOOL_PROP_1 boolean NULL,
BOOL_PROP_2 boolean NULL) ; BOOL_PROP_2 boolean NULL
) ;
alter table QRTZ_SIMPROP_TRIGGERS add primary key(SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP); alter table QRTZ_SIMPROP_TRIGGERS add primary key(SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP);
CREATE TABLE QRTZ_BLOB_TRIGGERS ( CREATE TABLE QRTZ_BLOB_TRIGGERS (
SCHED_NAME character varying(120) NOT NULL, SCHED_NAME character varying(120) NOT NULL,
TRIGGER_NAME character varying(200) NOT NULL, TRIGGER_NAME character varying(200) NOT NULL,
TRIGGER_GROUP character varying(200) NOT NULL, TRIGGER_GROUP character varying(200) NOT NULL,
BLOB_DATA bytea NULL) ; BLOB_DATA bytea NULL
) ;
alter table QRTZ_BLOB_TRIGGERS add primary key(SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP); alter table QRTZ_BLOB_TRIGGERS add primary key(SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP);
CREATE TABLE QRTZ_CALENDARS ( CREATE TABLE QRTZ_CALENDARS (
SCHED_NAME character varying(120) NOT NULL, SCHED_NAME character varying(120) NOT NULL,
CALENDAR_NAME character varying(200) NOT NULL, CALENDAR_NAME character varying(200) NOT NULL,
CALENDAR bytea NOT NULL) ; CALENDAR bytea NOT NULL
) ;
alter table QRTZ_CALENDARS add primary key(SCHED_NAME,CALENDAR_NAME); alter table QRTZ_CALENDARS add primary key(SCHED_NAME,CALENDAR_NAME);
CREATE TABLE QRTZ_PAUSED_TRIGGER_GRPS ( CREATE TABLE QRTZ_PAUSED_TRIGGER_GRPS (
SCHED_NAME character varying(120) NOT NULL, SCHED_NAME character varying(120) NOT NULL,
TRIGGER_GROUP character varying(200) NOT NULL) ; TRIGGER_GROUP character varying(200) NOT NULL
) ;
alter table QRTZ_PAUSED_TRIGGER_GRPS add primary key(SCHED_NAME,TRIGGER_GROUP); alter table QRTZ_PAUSED_TRIGGER_GRPS add primary key(SCHED_NAME,TRIGGER_GROUP);
CREATE TABLE QRTZ_FIRED_TRIGGERS ( CREATE TABLE QRTZ_FIRED_TRIGGERS (
SCHED_NAME character varying(120) NOT NULL, SCHED_NAME character varying(120) NOT NULL,
ENTRY_ID character varying(200) NOT NULL, ENTRY_ID character varying(200) NOT NULL,
TRIGGER_NAME character varying(200) NOT NULL, TRIGGER_NAME character varying(200) NOT NULL,
TRIGGER_GROUP character varying(200) NOT NULL, TRIGGER_GROUP character varying(200) NOT NULL,
INSTANCE_NAME character varying(200) NOT NULL, INSTANCE_NAME character varying(200) NOT NULL,
FIRED_TIME BIGINT NOT NULL, FIRED_TIME BIGINT NOT NULL,
SCHED_TIME BIGINT NOT NULL, SCHED_TIME BIGINT NOT NULL,
PRIORITY INTEGER NOT NULL, PRIORITY INTEGER NOT NULL,
STATE character varying(16) NOT NULL, STATE character varying(16) NOT NULL,
JOB_NAME character varying(200) NULL, JOB_NAME character varying(200) NULL,
JOB_GROUP character varying(200) NULL, JOB_GROUP character varying(200) NULL,
IS_NONCONCURRENT boolean NULL, IS_NONCONCURRENT boolean NULL,
REQUESTS_RECOVERY boolean NULL) ; REQUESTS_RECOVERY boolean NULL
) ;
alter table QRTZ_FIRED_TRIGGERS add primary key(SCHED_NAME,ENTRY_ID); alter table QRTZ_FIRED_TRIGGERS add primary key(SCHED_NAME,ENTRY_ID);
CREATE TABLE QRTZ_SCHEDULER_STATE ( CREATE TABLE QRTZ_SCHEDULER_STATE (
SCHED_NAME character varying(120) NOT NULL, SCHED_NAME character varying(120) NOT NULL,
INSTANCE_NAME character varying(200) NOT NULL, INSTANCE_NAME character varying(200) NOT NULL,
LAST_CHECKIN_TIME BIGINT NOT NULL, LAST_CHECKIN_TIME BIGINT NOT NULL,
CHECKIN_INTERVAL BIGINT NOT NULL) ; CHECKIN_INTERVAL BIGINT NOT NULL
) ;
alter table QRTZ_SCHEDULER_STATE add primary key(SCHED_NAME,INSTANCE_NAME); alter table QRTZ_SCHEDULER_STATE add primary key(SCHED_NAME,INSTANCE_NAME);
CREATE TABLE QRTZ_LOCKS ( CREATE TABLE QRTZ_LOCKS (
SCHED_NAME character varying(120) NOT NULL, SCHED_NAME character varying(120) NOT NULL,
LOCK_NAME character varying(40) NOT NULL) ; LOCK_NAME character varying(40) NOT NULL
) ;
alter table QRTZ_LOCKS add primary key(SCHED_NAME,LOCK_NAME); alter table QRTZ_LOCKS add primary key(SCHED_NAME,LOCK_NAME);
CREATE INDEX IDX_QRTZ_J_REQ_RECOVERY ON QRTZ_JOB_DETAILS(SCHED_NAME,REQUESTS_RECOVERY); CREATE INDEX IDX_QRTZ_J_REQ_RECOVERY ON QRTZ_JOB_DETAILS(SCHED_NAME,REQUESTS_RECOVERY);
@ -471,8 +492,9 @@ CREATE TABLE t_ds_process_instance (
var_pool text , var_pool text ,
PRIMARY KEY (id) PRIMARY KEY (id)
) ; ) ;
create index process_instance_index on t_ds_process_instance (process_definition_code,id);
create index start_time_index on t_ds_process_instance (start_time); create index process_instance_index on t_ds_process_instance (process_definition_code,id);
create index start_time_index on t_ds_process_instance (start_time);
-- --
-- Table structure for table t_ds_project -- Table structure for table t_ds_project
@ -490,7 +512,8 @@ CREATE TABLE t_ds_project (
update_time timestamp DEFAULT CURRENT_TIMESTAMP , update_time timestamp DEFAULT CURRENT_TIMESTAMP ,
PRIMARY KEY (id) PRIMARY KEY (id)
) ; ) ;
create index user_id_index on t_ds_project (user_id);
create index user_id_index on t_ds_project (user_id);
-- --
-- Table structure for table t_ds_queue -- Table structure for table t_ds_queue
@ -822,9 +845,11 @@ ALTER TABLE t_ds_process_task_relation_log ALTER COLUMN id SET DEFAULT NEXTVAL('
DROP SEQUENCE IF EXISTS t_ds_process_instance_id_sequence; DROP SEQUENCE IF EXISTS t_ds_process_instance_id_sequence;
CREATE SEQUENCE t_ds_process_instance_id_sequence; CREATE SEQUENCE t_ds_process_instance_id_sequence;
ALTER TABLE t_ds_process_instance ALTER COLUMN id SET DEFAULT NEXTVAL('t_ds_process_instance_id_sequence'); ALTER TABLE t_ds_process_instance ALTER COLUMN id SET DEFAULT NEXTVAL('t_ds_process_instance_id_sequence');
DROP SEQUENCE IF EXISTS t_ds_project_id_sequence; DROP SEQUENCE IF EXISTS t_ds_project_id_sequence;
CREATE SEQUENCE t_ds_project_id_sequence; CREATE SEQUENCE t_ds_project_id_sequence;
ALTER TABLE t_ds_project ALTER COLUMN id SET DEFAULT NEXTVAL('t_ds_project_id_sequence'); ALTER TABLE t_ds_project ALTER COLUMN id SET DEFAULT NEXTVAL('t_ds_project_id_sequence');
DROP SEQUENCE IF EXISTS t_ds_queue_id_sequence; DROP SEQUENCE IF EXISTS t_ds_queue_id_sequence;
CREATE SEQUENCE t_ds_queue_id_sequence; CREATE SEQUENCE t_ds_queue_id_sequence;
ALTER TABLE t_ds_queue ALTER COLUMN id SET DEFAULT NEXTVAL('t_ds_queue_id_sequence'); ALTER TABLE t_ds_queue ALTER COLUMN id SET DEFAULT NEXTVAL('t_ds_queue_id_sequence');

Write Preview
Loading…
Cancel
Save