Browse Source

Remove useless table fields (#5284)

Co-authored-by: dalekliuhan <dalekliuhan@didiglobal.com>
pull/3/MERGE
mrproliu 4 years ago committed by GitHub
parent
commit
b6453da298
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/CommandMapper.xml
  2. 2
      sql/dolphinscheduler_mysql.sql
  3. 2
      sql/dolphinscheduler_postgre.sql
  4. 4
      sql/upgrade/1.4.0_schema/mysql/dolphinscheduler_ddl.sql
  5. 4
      sql/upgrade/1.4.0_schema/postgresql/dolphinscheduler_ddl.sql

2
dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/CommandMapper.xml

@ -20,7 +20,7 @@
<mapper namespace="org.apache.dolphinscheduler.dao.mapper.CommandMapper"> <mapper namespace="org.apache.dolphinscheduler.dao.mapper.CommandMapper">
<select id="getOneToRun" resultType="org.apache.dolphinscheduler.dao.entity.Command"> <select id="getOneToRun" resultType="org.apache.dolphinscheduler.dao.entity.Command">
select cmd.id, cmd.command_type, cmd.process_definition_id, cmd.command_param, cmd.task_depend_type, cmd.failure_strategy, select cmd.id, cmd.command_type, cmd.process_definition_id, cmd.command_param, cmd.task_depend_type, cmd.failure_strategy,
cmd.warning_type, cmd.warning_group_id, cmd.schedule_time, cmd.start_time, cmd.executor_id, cmd.dependence, cmd.update_time, cmd.warning_type, cmd.warning_group_id, cmd.schedule_time, cmd.start_time, cmd.executor_id, cmd.update_time,
cmd.process_instance_priority, cmd.worker_group cmd.process_instance_priority, cmd.worker_group
from t_ds_command cmd from t_ds_command cmd
join t_ds_process_definition definition on cmd.process_definition_id = definition.id join t_ds_process_definition definition on cmd.process_definition_id = definition.id

2
sql/dolphinscheduler_mysql.sql

@ -327,7 +327,6 @@ CREATE TABLE `t_ds_command` (
`schedule_time` datetime DEFAULT NULL COMMENT 'schedule time', `schedule_time` datetime DEFAULT NULL COMMENT 'schedule time',
`start_time` datetime DEFAULT NULL COMMENT 'start time', `start_time` datetime DEFAULT NULL COMMENT 'start time',
`executor_id` int(11) DEFAULT NULL COMMENT 'executor id', `executor_id` int(11) DEFAULT NULL COMMENT 'executor id',
`dependence` varchar(255) DEFAULT NULL COMMENT 'dependence',
`update_time` datetime DEFAULT NULL COMMENT 'update time', `update_time` datetime DEFAULT NULL COMMENT 'update time',
`process_instance_priority` int(11) DEFAULT NULL COMMENT 'process instance priority: 0 Highest,1 High,2 Medium,3 Low,4 Lowest', `process_instance_priority` int(11) DEFAULT NULL COMMENT 'process instance priority: 0 Highest,1 High,2 Medium,3 Low,4 Lowest',
`worker_group` varchar(64) COMMENT 'worker group', `worker_group` varchar(64) COMMENT 'worker group',
@ -375,7 +374,6 @@ CREATE TABLE `t_ds_error_command` (
`schedule_time` datetime DEFAULT NULL COMMENT 'scheduler time', `schedule_time` datetime DEFAULT NULL COMMENT 'scheduler time',
`start_time` datetime DEFAULT NULL COMMENT 'start time', `start_time` datetime DEFAULT NULL COMMENT 'start time',
`update_time` datetime DEFAULT NULL COMMENT 'update time', `update_time` datetime DEFAULT NULL COMMENT 'update time',
`dependence` text COMMENT 'dependence',
`process_instance_priority` int(11) DEFAULT NULL COMMENT 'process instance priority, 0 Highest,1 High,2 Medium,3 Low,4 Lowest', `process_instance_priority` int(11) DEFAULT NULL COMMENT 'process instance priority, 0 Highest,1 High,2 Medium,3 Low,4 Lowest',
`worker_group` varchar(64) COMMENT 'worker group', `worker_group` varchar(64) COMMENT 'worker group',
`message` text COMMENT 'message', `message` text COMMENT 'message',

2
sql/dolphinscheduler_postgre.sql

@ -228,7 +228,6 @@ CREATE TABLE t_ds_command (
schedule_time timestamp DEFAULT NULL , schedule_time timestamp DEFAULT NULL ,
start_time timestamp DEFAULT NULL , start_time timestamp DEFAULT NULL ,
executor_id int DEFAULT NULL , executor_id int DEFAULT NULL ,
dependence varchar(255) DEFAULT NULL ,
update_time timestamp DEFAULT NULL , update_time timestamp DEFAULT NULL ,
process_instance_priority int DEFAULT NULL , process_instance_priority int DEFAULT NULL ,
worker_group varchar(64), worker_group varchar(64),
@ -270,7 +269,6 @@ CREATE TABLE t_ds_error_command (
schedule_time timestamp DEFAULT NULL , schedule_time timestamp DEFAULT NULL ,
start_time timestamp DEFAULT NULL , start_time timestamp DEFAULT NULL ,
update_time timestamp DEFAULT NULL , update_time timestamp DEFAULT NULL ,
dependence text ,
process_instance_priority int DEFAULT NULL , process_instance_priority int DEFAULT NULL ,
worker_group varchar(64), worker_group varchar(64),
message text , message text ,

4
sql/upgrade/1.4.0_schema/mysql/dolphinscheduler_ddl.sql

@ -290,3 +290,7 @@ DROP PROCEDURE uc_dolphin_T_t_ds_alertgroup_A_create_user_id;
-- ALTER TABLE t_ds_process_definition_version DROP `receivers`, DROP `receivers_cc`; -- ALTER TABLE t_ds_process_definition_version DROP `receivers`, DROP `receivers_cc`;
-- DROP TABLE IF EXISTS t_ds_relation_user_alertgroup; -- DROP TABLE IF EXISTS t_ds_relation_user_alertgroup;
-- ALTER TABLE t_ds_command DROP `dependence`;
-- ALTER TABLE t_ds_error_command DROP `dependence`;

4
sql/upgrade/1.4.0_schema/postgresql/dolphinscheduler_ddl.sql

@ -281,3 +281,7 @@ DROP FUNCTION IF EXISTS uc_dolphin_T_t_ds_alertgroup_A_create_user_id();
-- ALTER TABLE t_ds_process_definition_version DROP COLUMN "receivers", DROP COLUMN "receivers_cc"; -- ALTER TABLE t_ds_process_definition_version DROP COLUMN "receivers", DROP COLUMN "receivers_cc";
-- DROP TABLE IF EXISTS t_ds_relation_user_alertgroup; -- DROP TABLE IF EXISTS t_ds_relation_user_alertgroup;
-- ALTER TABLE t_ds_command DROP COLUMN "dependence";
-- ALTER TABLE t_ds_error_command DROP COLUMN "dependence";
Loading…
Cancel
Save