From 8540e2afb56dfe43c26ce8d4852c2edbc7102a0b Mon Sep 17 00:00:00 2001 From: opensnail <598092184@qq.com> Date: Tue, 25 Feb 2025 23:11:39 +0800 Subject: [PATCH] =?UTF-8?q?feat(1.4.0-beta1):=201.=E5=90=8C=E6=AD=A5?= =?UTF-8?q?=E5=85=B6=E4=BB=96=E6=95=B0=E6=8D=AE=E5=BA=93sql=202.=E6=9B=B4?= =?UTF-8?q?=E6=96=B0xml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- doc/sql/snail_job_dm8.sql | 244 ++++++------ doc/sql/snail_job_kingbase.sql | 244 ++++++------ doc/sql/snail_job_mysql.sql | 16 +- doc/sql/snail_job_oracle.sql | 259 ++++++------ doc/sql/snail_job_postgre.sql | 242 +++++------ doc/sql/snail_job_sqlserver.sql | 375 +++++++++--------- .../persistence/mapper/RetryTaskMapper.java | 9 - ...TaskService.xml => JobTaskBatchMapper.xml} | 0 .../dm/mapper/RetryDeadLetterMapper.xml | 3 +- .../{RetryTaskMapper.xml => RetryMapper.xml} | 14 +- .../dm/mapper/RetryTaskLogMapper.xml | 26 -- .../kingbase/mapper/RetryDeadLetterMapper.xml | 3 +- .../{RetryTaskMapper.xml => RetryMapper.xml} | 16 +- .../kingbase/mapper/RetryTaskLogMapper.xml | 26 -- .../mariadb/mapper/RetryDeadLetterMapper.xml | 3 +- .../{RetryTaskMapper.xml => RetryMapper.xml} | 36 +- .../mariadb/mapper/RetryTaskLogMapper.xml | 26 -- .../resources/mysql/mapper/RetryMapper.xml | 7 +- .../mysql/mapper/RetryTaskLogMapper.xml | 26 -- .../mysql/mapper/RetryTaskMapper.xml | 42 -- .../oracle/mapper/RetryDeadLetterMapper.xml | 3 +- .../{RetryTaskMapper.xml => RetryMapper.xml} | 14 +- .../oracle/mapper/RetryTaskLogMapper.xml | 17 - .../mapper/RetryDeadLetterMapper.xml | 3 +- .../{RetryTaskMapper.xml => RetryMapper.xml} | 15 +- .../postgresql/mapper/RetryTaskLogMapper.xml | 26 -- .../mapper/RetryDeadLetterMapper.xml | 3 +- .../{RetryTaskMapper.xml => RetryMapper.xml} | 33 +- .../sqlserver/mapper/RetryTaskLogMapper.xml | 26 -- 29 files changed, 784 insertions(+), 973 deletions(-) rename snail-job-datasource/snail-job-datasource-template/src/main/resources/template/mapper/{RetryTaskService.xml => JobTaskBatchMapper.xml} (100%) rename snail-job-datasource/snail-job-dm8-datasource/src/main/resources/dm/mapper/{RetryTaskMapper.xml => RetryMapper.xml} (58%) delete mode 100644 snail-job-datasource/snail-job-dm8-datasource/src/main/resources/dm/mapper/RetryTaskLogMapper.xml rename snail-job-datasource/snail-job-kingbase-datasource/src/main/resources/kingbase/mapper/{RetryTaskMapper.xml => RetryMapper.xml} (61%) delete mode 100644 snail-job-datasource/snail-job-kingbase-datasource/src/main/resources/kingbase/mapper/RetryTaskLogMapper.xml rename snail-job-datasource/snail-job-mariadb-datasource/src/main/resources/mariadb/mapper/{RetryTaskMapper.xml => RetryMapper.xml} (55%) delete mode 100644 snail-job-datasource/snail-job-mariadb-datasource/src/main/resources/mariadb/mapper/RetryTaskLogMapper.xml delete mode 100644 snail-job-datasource/snail-job-mysql-datasource/src/main/resources/mysql/mapper/RetryTaskLogMapper.xml delete mode 100644 snail-job-datasource/snail-job-mysql-datasource/src/main/resources/mysql/mapper/RetryTaskMapper.xml rename snail-job-datasource/snail-job-oracle-datasource/src/main/resources/oracle/mapper/{RetryTaskMapper.xml => RetryMapper.xml} (57%) delete mode 100644 snail-job-datasource/snail-job-oracle-datasource/src/main/resources/oracle/mapper/RetryTaskLogMapper.xml rename snail-job-datasource/snail-job-postgres-datasource/src/main/resources/postgresql/mapper/{RetryTaskMapper.xml => RetryMapper.xml} (62%) delete mode 100644 snail-job-datasource/snail-job-postgres-datasource/src/main/resources/postgresql/mapper/RetryTaskLogMapper.xml rename snail-job-datasource/snail-job-sqlserver-datasource/src/main/resources/sqlserver/mapper/{RetryTaskMapper.xml => RetryMapper.xml} (65%) delete mode 100644 snail-job-datasource/snail-job-sqlserver-datasource/src/main/resources/sqlserver/mapper/RetryTaskLogMapper.xml diff --git a/doc/sql/snail_job_dm8.sql b/doc/sql/snail_job_dm8.sql index 69411e654..d5d1eff03 100644 --- a/doc/sql/snail_job_dm8.sql +++ b/doc/sql/snail_job_dm8.sql @@ -2,7 +2,7 @@ SnailJob Database Transfer Tool Source Server Type : MySQL Target Server Type : DM8 - Date: 2024-12-27 22:18:34 + Date: 2025-02-25 22:17:15 */ @@ -45,7 +45,6 @@ CREATE TABLE sj_group_config group_partition int NOT NULL, id_generator_mode smallint DEFAULT 1 NOT NULL, init_scene smallint DEFAULT 0 NOT NULL, - bucket_index int DEFAULT 0 NOT NULL, create_dt datetime DEFAULT CURRENT_TIMESTAMP NOT NULL, update_dt datetime DEFAULT CURRENT_TIMESTAMP NOT NULL ); @@ -62,7 +61,6 @@ COMMENT ON COLUMN sj_group_config.version IS '版本号'; COMMENT ON COLUMN sj_group_config.group_partition IS '分区'; COMMENT ON COLUMN sj_group_config.id_generator_mode IS '唯一id生成模式 默认号段模式'; COMMENT ON COLUMN sj_group_config.init_scene IS '是否初始化场景 0:否 1:是'; -COMMENT ON COLUMN sj_group_config.bucket_index IS 'bucket'; COMMENT ON COLUMN sj_group_config.create_dt IS '创建时间'; COMMENT ON COLUMN sj_group_config.update_dt IS '修改时间'; COMMENT ON TABLE sj_group_config IS '组配置'; @@ -129,12 +127,11 @@ COMMENT ON COLUMN sj_notify_recipient.create_dt IS '创建时间'; COMMENT ON COLUMN sj_notify_recipient.update_dt IS '修改时间'; COMMENT ON TABLE sj_notify_recipient IS '告警通知接收人'; --- sj_retry_dead_letter_0 -CREATE TABLE sj_retry_dead_letter_0 +-- sj_retry_dead_letter +CREATE TABLE sj_retry_dead_letter ( id bigint NOT NULL PRIMARY KEY IDENTITY, namespace_id varchar(64) DEFAULT '764d604ec6fc45f68cd92514c40e9e1a' NULL, - unique_id varchar(64) NULL, group_name varchar(64) NULL, scene_name varchar(64) NULL, idempotent_id varchar(64) NULL, @@ -142,37 +139,31 @@ CREATE TABLE sj_retry_dead_letter_0 executor_name varchar(512) DEFAULT '' NULL, args_str text NULL, ext_attrs text NULL, - task_type smallint DEFAULT 1 NOT NULL, create_dt datetime DEFAULT CURRENT_TIMESTAMP NOT NULL ); -CREATE UNIQUE INDEX uk_sj_retry_dead_letter_0_01 ON sj_retry_dead_letter_0 (namespace_id, group_name, unique_id); +CREATE INDEX idx_sj_retry_dead_letter_01 ON sj_retry_dead_letter (namespace_id, group_name, scene_name); +CREATE INDEX idx_sj_retry_dead_letter_02 ON sj_retry_dead_letter (idempotent_id); +CREATE INDEX idx_sj_retry_dead_letter_03 ON sj_retry_dead_letter (biz_no); +CREATE INDEX idx_sj_retry_dead_letter_04 ON sj_retry_dead_letter (create_dt); -CREATE INDEX idx_sj_retry_dead_letter_0_01 ON sj_retry_dead_letter_0 (namespace_id, group_name, scene_name); -CREATE INDEX idx_sj_retry_dead_letter_0_02 ON sj_retry_dead_letter_0 (idempotent_id); -CREATE INDEX idx_sj_retry_dead_letter_0_03 ON sj_retry_dead_letter_0 (biz_no); -CREATE INDEX idx_sj_retry_dead_letter_0_04 ON sj_retry_dead_letter_0 (create_dt); +COMMENT ON COLUMN sj_retry_dead_letter.id IS '主键'; +COMMENT ON COLUMN sj_retry_dead_letter.namespace_id IS '命名空间id'; +COMMENT ON COLUMN sj_retry_dead_letter.group_name IS '组名称'; +COMMENT ON COLUMN sj_retry_dead_letter.scene_name IS '场景名称'; +COMMENT ON COLUMN sj_retry_dead_letter.idempotent_id IS '幂等id'; +COMMENT ON COLUMN sj_retry_dead_letter.biz_no IS '业务编号'; +COMMENT ON COLUMN sj_retry_dead_letter.executor_name IS '执行器名称'; +COMMENT ON COLUMN sj_retry_dead_letter.args_str IS '执行方法参数'; +COMMENT ON COLUMN sj_retry_dead_letter.ext_attrs IS '扩展字段'; +COMMENT ON COLUMN sj_retry_dead_letter.create_dt IS '创建时间'; +COMMENT ON TABLE sj_retry_dead_letter IS '死信队列表'; -COMMENT ON COLUMN sj_retry_dead_letter_0.id IS '主键'; -COMMENT ON COLUMN sj_retry_dead_letter_0.namespace_id IS '命名空间id'; -COMMENT ON COLUMN sj_retry_dead_letter_0.unique_id IS '同组下id唯一'; -COMMENT ON COLUMN sj_retry_dead_letter_0.group_name IS '组名称'; -COMMENT ON COLUMN sj_retry_dead_letter_0.scene_name IS '场景名称'; -COMMENT ON COLUMN sj_retry_dead_letter_0.idempotent_id IS '幂等id'; -COMMENT ON COLUMN sj_retry_dead_letter_0.biz_no IS '业务编号'; -COMMENT ON COLUMN sj_retry_dead_letter_0.executor_name IS '执行器名称'; -COMMENT ON COLUMN sj_retry_dead_letter_0.args_str IS '执行方法参数'; -COMMENT ON COLUMN sj_retry_dead_letter_0.ext_attrs IS '扩展字段'; -COMMENT ON COLUMN sj_retry_dead_letter_0.task_type IS '任务类型 1、重试数据 2、回调数据'; -COMMENT ON COLUMN sj_retry_dead_letter_0.create_dt IS '创建时间'; -COMMENT ON TABLE sj_retry_dead_letter_0 IS '死信队列表'; - --- sj_retry_task_0 -CREATE TABLE sj_retry_task_0 +-- sj_retry +CREATE TABLE sj_retry ( id bigint NOT NULL PRIMARY KEY IDENTITY, namespace_id varchar(64) DEFAULT '764d604ec6fc45f68cd92514c40e9e1a' NULL, - unique_id varchar(64) NULL, group_name varchar(64) NULL, scene_name varchar(64) NULL, idempotent_id varchar(64) NULL, @@ -180,103 +171,104 @@ CREATE TABLE sj_retry_task_0 executor_name varchar(512) DEFAULT '' NULL, args_str text NULL, ext_attrs text NULL, - next_trigger_at datetime NOT NULL, + next_trigger_at bigint NOT NULL, retry_count int DEFAULT 0 NOT NULL, retry_status smallint DEFAULT 0 NOT NULL, task_type smallint DEFAULT 1 NOT NULL, + bucket_index int DEFAULT 0 NOT NULL, + parent_id bigint DEFAULT 0 NOT NULL, + deleted bigint DEFAULT 0 NOT NULL, create_dt datetime DEFAULT CURRENT_TIMESTAMP NOT NULL, update_dt datetime DEFAULT CURRENT_TIMESTAMP NOT NULL ); -CREATE UNIQUE INDEX uk_sj_retry_task_0_01 ON sj_retry_task_0 (namespace_id, group_name, unique_id); +CREATE UNIQUE INDEX uk_sj_retry_01 ON sj_retry (namespace_id, group_name, task_type, idempotent_id, deleted); -CREATE INDEX idx_sj_retry_task_0_01 ON sj_retry_task_0 (namespace_id, group_name, scene_name); -CREATE INDEX idx_sj_retry_task_0_02 ON sj_retry_task_0 (namespace_id, group_name, task_type); -CREATE INDEX idx_sj_retry_task_0_03 ON sj_retry_task_0 (namespace_id, group_name, retry_status); -CREATE INDEX idx_sj_retry_task_0_04 ON sj_retry_task_0 (idempotent_id); -CREATE INDEX idx_sj_retry_task_0_05 ON sj_retry_task_0 (biz_no); -CREATE INDEX idx_sj_retry_task_0_06 ON sj_retry_task_0 (create_dt); +CREATE INDEX idx_sj_retry_01 ON sj_retry (namespace_id, group_name, scene_name); +CREATE INDEX idx_sj_retry_02 ON sj_retry (namespace_id, group_name, retry_status); +CREATE INDEX idx_sj_retry_03 ON sj_retry (idempotent_id); +CREATE INDEX idx_sj_retry_04 ON sj_retry (biz_no); +CREATE INDEX idx_sj_retry_05 ON sj_retry (parent_id); +CREATE INDEX idx_sj_retry_06 ON sj_retry (create_dt); -COMMENT ON COLUMN sj_retry_task_0.id IS '主键'; -COMMENT ON COLUMN sj_retry_task_0.namespace_id IS '命名空间id'; -COMMENT ON COLUMN sj_retry_task_0.unique_id IS '同组下id唯一'; -COMMENT ON COLUMN sj_retry_task_0.group_name IS '组名称'; -COMMENT ON COLUMN sj_retry_task_0.scene_name IS '场景名称'; -COMMENT ON COLUMN sj_retry_task_0.idempotent_id IS '幂等id'; -COMMENT ON COLUMN sj_retry_task_0.biz_no IS '业务编号'; -COMMENT ON COLUMN sj_retry_task_0.executor_name IS '执行器名称'; -COMMENT ON COLUMN sj_retry_task_0.args_str IS '执行方法参数'; -COMMENT ON COLUMN sj_retry_task_0.ext_attrs IS '扩展字段'; -COMMENT ON COLUMN sj_retry_task_0.next_trigger_at IS '下次触发时间'; -COMMENT ON COLUMN sj_retry_task_0.retry_count IS '重试次数'; -COMMENT ON COLUMN sj_retry_task_0.retry_status IS '重试状态 0、重试中 1、成功 2、最大重试次数'; -COMMENT ON COLUMN sj_retry_task_0.task_type IS '任务类型 1、重试数据 2、回调数据'; -COMMENT ON COLUMN sj_retry_task_0.create_dt IS '创建时间'; -COMMENT ON COLUMN sj_retry_task_0.update_dt IS '修改时间'; -COMMENT ON TABLE sj_retry_task_0 IS '任务表'; +COMMENT ON COLUMN sj_retry.id IS '主键'; +COMMENT ON COLUMN sj_retry.namespace_id IS '命名空间id'; +COMMENT ON COLUMN sj_retry.group_name IS '组名称'; +COMMENT ON COLUMN sj_retry.scene_name IS '场景名称'; +COMMENT ON COLUMN sj_retry.idempotent_id IS '幂等id'; +COMMENT ON COLUMN sj_retry.biz_no IS '业务编号'; +COMMENT ON COLUMN sj_retry.executor_name IS '执行器名称'; +COMMENT ON COLUMN sj_retry.args_str IS '执行方法参数'; +COMMENT ON COLUMN sj_retry.ext_attrs IS '扩展字段'; +COMMENT ON COLUMN sj_retry.next_trigger_at IS '下次触发时间'; +COMMENT ON COLUMN sj_retry.retry_count IS '重试次数'; +COMMENT ON COLUMN sj_retry.retry_status IS '重试状态 0、重试中 1、成功 2、最大重试次数'; +COMMENT ON COLUMN sj_retry.task_type IS '任务类型 1、重试数据 2、回调数据'; +COMMENT ON COLUMN sj_retry.bucket_index IS 'bucket'; +COMMENT ON COLUMN sj_retry.parent_id IS '父节点id'; +COMMENT ON COLUMN sj_retry.deleted IS '逻辑删除'; +COMMENT ON COLUMN sj_retry.create_dt IS '创建时间'; +COMMENT ON COLUMN sj_retry.update_dt IS '修改时间'; +COMMENT ON TABLE sj_retry IS '重试信息表'; --- sj_retry_task_log -CREATE TABLE sj_retry_task_log +-- sj_retry_task +CREATE TABLE sj_retry_task ( - id bigint NOT NULL PRIMARY KEY IDENTITY, - namespace_id varchar(64) DEFAULT '764d604ec6fc45f68cd92514c40e9e1a' NULL, - unique_id varchar(64) NULL, - group_name varchar(64) NULL, - scene_name varchar(64) NULL, - idempotent_id varchar(64) NULL, - biz_no varchar(64) DEFAULT '' NULL, - executor_name varchar(512) DEFAULT '' NULL, - args_str text NULL, - ext_attrs text NULL, - retry_status smallint DEFAULT 0 NOT NULL, - task_type smallint DEFAULT 1 NOT NULL, - create_dt datetime DEFAULT CURRENT_TIMESTAMP NOT NULL, - update_dt datetime DEFAULT CURRENT_TIMESTAMP NOT NULL + id bigint NOT NULL PRIMARY KEY IDENTITY, + namespace_id varchar(64) DEFAULT '764d604ec6fc45f68cd92514c40e9e1a' NULL, + group_name varchar(64) NULL, + scene_name varchar(64) NULL, + retry_id bigint NOT NULL, + ext_attrs text NULL, + task_status smallint DEFAULT 1 NOT NULL, + task_type smallint DEFAULT 1 NOT NULL, + operation_reason smallint DEFAULT 0 NOT NULL, + client_info varchar(128) DEFAULT NULL NULL, + create_dt datetime DEFAULT CURRENT_TIMESTAMP NOT NULL, + update_dt datetime DEFAULT CURRENT_TIMESTAMP NOT NULL ); -CREATE INDEX idx_sj_retry_task_log_01 ON sj_retry_task_log (namespace_id, group_name, scene_name); -CREATE INDEX idx_sj_retry_task_log_02 ON sj_retry_task_log (retry_status); -CREATE INDEX idx_sj_retry_task_log_03 ON sj_retry_task_log (idempotent_id); -CREATE INDEX idx_sj_retry_task_log_04 ON sj_retry_task_log (unique_id); -CREATE INDEX idx_sj_retry_task_log_05 ON sj_retry_task_log (biz_no); -CREATE INDEX idx_sj_retry_task_log_06 ON sj_retry_task_log (create_dt); +CREATE INDEX idx_sj_retry_task_01 ON sj_retry_task (namespace_id, group_name, scene_name); +CREATE INDEX idx_sj_retry_task_02 ON sj_retry_task (task_status); +CREATE INDEX idx_sj_retry_task_03 ON sj_retry_task (create_dt); +CREATE INDEX idx_sj_retry_task_04 ON sj_retry_task (retry_id); -COMMENT ON COLUMN sj_retry_task_log.id IS '主键'; -COMMENT ON COLUMN sj_retry_task_log.namespace_id IS '命名空间id'; -COMMENT ON COLUMN sj_retry_task_log.unique_id IS '同组下id唯一'; -COMMENT ON COLUMN sj_retry_task_log.group_name IS '组名称'; -COMMENT ON COLUMN sj_retry_task_log.scene_name IS '场景名称'; -COMMENT ON COLUMN sj_retry_task_log.idempotent_id IS '幂等id'; -COMMENT ON COLUMN sj_retry_task_log.biz_no IS '业务编号'; -COMMENT ON COLUMN sj_retry_task_log.executor_name IS '执行器名称'; -COMMENT ON COLUMN sj_retry_task_log.args_str IS '执行方法参数'; -COMMENT ON COLUMN sj_retry_task_log.ext_attrs IS '扩展字段'; -COMMENT ON COLUMN sj_retry_task_log.retry_status IS '重试状态 0、重试中 1、成功 2、最大次数'; -COMMENT ON COLUMN sj_retry_task_log.task_type IS '任务类型 1、重试数据 2、回调数据'; -COMMENT ON COLUMN sj_retry_task_log.create_dt IS '创建时间'; -COMMENT ON COLUMN sj_retry_task_log.update_dt IS '修改时间'; -COMMENT ON TABLE sj_retry_task_log IS '任务日志基础信息表'; +COMMENT ON COLUMN sj_retry_task.id IS '主键'; +COMMENT ON COLUMN sj_retry_task.namespace_id IS '命名空间id'; +COMMENT ON COLUMN sj_retry_task.group_name IS '组名称'; +COMMENT ON COLUMN sj_retry_task.scene_name IS '场景名称'; +COMMENT ON COLUMN sj_retry_task.retry_id IS '重试信息Id'; +COMMENT ON COLUMN sj_retry_task.ext_attrs IS '扩展字段'; +COMMENT ON COLUMN sj_retry_task.task_status IS '重试状态'; +COMMENT ON COLUMN sj_retry_task.task_type IS '任务类型 1、重试数据 2、回调数据'; +COMMENT ON COLUMN sj_retry_task.operation_reason IS '操作原因'; +COMMENT ON COLUMN sj_retry_task.client_info IS '客户端地址 clientId#ip:port'; +COMMENT ON COLUMN sj_retry_task.create_dt IS '创建时间'; +COMMENT ON COLUMN sj_retry_task.update_dt IS '修改时间'; +COMMENT ON TABLE sj_retry_task IS '重试任务表'; -- sj_retry_task_log_message CREATE TABLE sj_retry_task_log_message ( - id bigint NOT NULL PRIMARY KEY IDENTITY, - namespace_id varchar(64) DEFAULT '764d604ec6fc45f68cd92514c40e9e1a' NULL, - group_name varchar(64) NULL, - unique_id varchar(64) NULL, - message text NULL, - log_num int DEFAULT 1 NOT NULL, - real_time bigint DEFAULT 0 NOT NULL, - create_dt datetime DEFAULT CURRENT_TIMESTAMP NOT NULL + id bigint NOT NULL PRIMARY KEY IDENTITY, + namespace_id varchar(64) DEFAULT '764d604ec6fc45f68cd92514c40e9e1a' NULL, + group_name varchar(64) NULL, + retry_id bigint NOT NULL, + retry_task_id bigint NOT NULL, + message text NULL, + log_num int DEFAULT 1 NOT NULL, + real_time bigint DEFAULT 0 NOT NULL, + create_dt datetime DEFAULT CURRENT_TIMESTAMP NOT NULL ); -CREATE INDEX idx_sj_retry_task_log_message_01 ON sj_retry_task_log_message (namespace_id, group_name, unique_id); +CREATE INDEX idx_sj_retry_task_log_message_01 ON sj_retry_task_log_message (namespace_id, group_name, retry_task_id); CREATE INDEX idx_sj_retry_task_log_message_02 ON sj_retry_task_log_message (create_dt); COMMENT ON COLUMN sj_retry_task_log_message.id IS '主键'; COMMENT ON COLUMN sj_retry_task_log_message.namespace_id IS '命名空间id'; COMMENT ON COLUMN sj_retry_task_log_message.group_name IS '组名称'; -COMMENT ON COLUMN sj_retry_task_log_message.unique_id IS '同组下id唯一'; +COMMENT ON COLUMN sj_retry_task_log_message.retry_id IS '重试信息Id'; +COMMENT ON COLUMN sj_retry_task_log_message.retry_task_id IS '重试任务Id'; COMMENT ON COLUMN sj_retry_task_log_message.message IS '异常信息'; COMMENT ON COLUMN sj_retry_task_log_message.log_num IS '日志数量'; COMMENT ON COLUMN sj_retry_task_log_message.real_time IS '上报时间'; @@ -286,21 +278,26 @@ COMMENT ON TABLE sj_retry_task_log_message IS '任务调度日志信息记录表 -- sj_retry_scene_config CREATE TABLE sj_retry_scene_config ( - id bigint NOT NULL PRIMARY KEY IDENTITY, - namespace_id varchar(64) DEFAULT '764d604ec6fc45f68cd92514c40e9e1a' NULL, - scene_name varchar(64) NULL, - group_name varchar(64) NULL, - scene_status smallint DEFAULT 0 NOT NULL, - max_retry_count int DEFAULT 5 NOT NULL, - back_off smallint DEFAULT 1 NOT NULL, - trigger_interval varchar(16) DEFAULT '' NULL, - notify_ids varchar(128) DEFAULT '' NULL, - deadline_request bigint DEFAULT 60000 NOT NULL, - executor_timeout int DEFAULT 5 NOT NULL, - route_key smallint DEFAULT 4 NOT NULL, - description varchar(256) DEFAULT '' NULL, - create_dt datetime DEFAULT CURRENT_TIMESTAMP NOT NULL, - update_dt datetime DEFAULT CURRENT_TIMESTAMP NOT NULL + id bigint NOT NULL PRIMARY KEY IDENTITY, + namespace_id varchar(64) DEFAULT '764d604ec6fc45f68cd92514c40e9e1a' NULL, + scene_name varchar(64) NULL, + group_name varchar(64) NULL, + scene_status smallint DEFAULT 0 NOT NULL, + max_retry_count int DEFAULT 5 NOT NULL, + back_off smallint DEFAULT 1 NOT NULL, + trigger_interval varchar(16) DEFAULT '' NULL, + notify_ids varchar(128) DEFAULT '' NULL, + deadline_request bigint DEFAULT 60000 NOT NULL, + executor_timeout int DEFAULT 5 NOT NULL, + route_key smallint DEFAULT 4 NOT NULL, + block_strategy smallint DEFAULT 1 NOT NULL, + cb_status smallint DEFAULT 0 NOT NULL, + cb_trigger_type smallint DEFAULT 1 NOT NULL, + cb_max_count int DEFAULT 16 NOT NULL, + cb_trigger_interval varchar(16) DEFAULT '' NULL, + description varchar(256) DEFAULT '' NULL, + create_dt datetime DEFAULT CURRENT_TIMESTAMP NOT NULL, + update_dt datetime DEFAULT CURRENT_TIMESTAMP NOT NULL ); CREATE UNIQUE INDEX uk_sj_retry_scene_config_01 ON sj_retry_scene_config (namespace_id, group_name, scene_name); @@ -317,6 +314,11 @@ COMMENT ON COLUMN sj_retry_scene_config.notify_ids IS '通知告警场景配置i COMMENT ON COLUMN sj_retry_scene_config.deadline_request IS 'Deadline Request 调用链超时 单位毫秒'; COMMENT ON COLUMN sj_retry_scene_config.executor_timeout IS '任务执行超时时间，单位秒'; COMMENT ON COLUMN sj_retry_scene_config.route_key IS '路由策略'; +COMMENT ON COLUMN sj_retry_scene_config.block_strategy IS '阻塞策略 1、丢弃 2、覆盖 3、并行'; +COMMENT ON COLUMN sj_retry_scene_config.cb_status IS '回调状态 0、不开启 1、开启'; +COMMENT ON COLUMN sj_retry_scene_config.cb_trigger_type IS '1、默认等级 2、固定间隔时间 3、CRON 表达式'; +COMMENT ON COLUMN sj_retry_scene_config.cb_max_count IS '回调的最大执行次数'; +COMMENT ON COLUMN sj_retry_scene_config.cb_trigger_interval IS '回调的最大执行次数'; COMMENT ON COLUMN sj_retry_scene_config.description IS '描述'; COMMENT ON COLUMN sj_retry_scene_config.create_dt IS '创建时间'; COMMENT ON COLUMN sj_retry_scene_config.update_dt IS '修改时间'; @@ -359,7 +361,7 @@ COMMENT ON TABLE sj_server_node IS '服务器节点'; -- sj_distributed_lock CREATE TABLE sj_distributed_lock ( - name varchar(64) NOT NULL PRIMARY KEY, + name varchar(64) NULL, lock_until timestamp(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL, locked_at timestamp(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL, locked_by varchar(255) NULL, @@ -490,11 +492,11 @@ COMMENT ON COLUMN sj_job.executor_type IS '执行器类型'; COMMENT ON COLUMN sj_job.executor_info IS '执行器名称'; COMMENT ON COLUMN sj_job.trigger_type IS '触发类型 1.CRON 表达式 2. 固定时间'; COMMENT ON COLUMN sj_job.trigger_interval IS '间隔时长'; -COMMENT ON COLUMN sj_job.block_strategy IS '阻塞策略 1、丢弃 2、覆盖 3、并行'; +COMMENT ON COLUMN sj_job.block_strategy IS '阻塞策略 1、丢弃 2、覆盖 3、并行 4、恢复'; COMMENT ON COLUMN sj_job.executor_timeout IS '任务执行超时时间，单位秒'; COMMENT ON COLUMN sj_job.max_retry_times IS '最大重试次数'; COMMENT ON COLUMN sj_job.parallel_num IS '并行数'; -COMMENT ON COLUMN sj_job.retry_interval IS '重试间隔 ( s ) '; +COMMENT ON COLUMN sj_job.retry_interval IS '重试间隔 ( s)'; COMMENT ON COLUMN sj_job.bucket_index IS 'bucket'; COMMENT ON COLUMN sj_job.resident IS '是否是常驻任务'; COMMENT ON COLUMN sj_job.notify_ids IS '通知告警场景配置id列表'; @@ -659,7 +661,7 @@ CREATE INDEX idx_sj_job_summary_01 ON sj_job_summary (namespace_id, group_name, COMMENT ON COLUMN sj_job_summary.id IS '主键'; COMMENT ON COLUMN sj_job_summary.namespace_id IS '命名空间id'; COMMENT ON COLUMN sj_job_summary.group_name IS '组名称'; -COMMENT ON COLUMN sj_job_summary.business_id IS '业务id ( job_id或workflow_id ) '; +COMMENT ON COLUMN sj_job_summary.business_id IS '业务id ( job_id或workflow_id)'; COMMENT ON COLUMN sj_job_summary.system_task_type IS '任务类型 3、JOB任务 4、WORKFLOW任务'; COMMENT ON COLUMN sj_job_summary.trigger_at IS '统计时间'; COMMENT ON COLUMN sj_job_summary.success_num IS '执行成功-日志数量'; @@ -837,4 +839,4 @@ COMMENT ON COLUMN sj_workflow_task_batch.version IS '版本号'; COMMENT ON COLUMN sj_workflow_task_batch.deleted IS '逻辑删除 1、删除'; COMMENT ON COLUMN sj_workflow_task_batch.create_dt IS '创建时间'; COMMENT ON COLUMN sj_workflow_task_batch.update_dt IS '修改时间'; -COMMENT ON TABLE sj_workflow_task_batch IS '工作流批次'; +COMMENT ON TABLE sj_workflow_task_batch IS '工作流批次'; \ No newline at end of file diff --git a/doc/sql/snail_job_kingbase.sql b/doc/sql/snail_job_kingbase.sql index ba17d4a38..868d1b93f 100644 --- a/doc/sql/snail_job_kingbase.sql +++ b/doc/sql/snail_job_kingbase.sql @@ -2,7 +2,7 @@ SnailJob Database Transfer Tool Source Server Type : MySQL Target Server Type : KingbaseES - Date: 2024-12-27 22:20:26 + Date: 2025-02-25 22:17:37 */ @@ -45,7 +45,6 @@ CREATE TABLE sj_group_config group_partition int NOT NULL, id_generator_mode smallint NOT NULL DEFAULT 1, init_scene smallint NOT NULL DEFAULT 0, - bucket_index int NOT NULL DEFAULT 0, create_dt timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, update_dt timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ); @@ -62,7 +61,6 @@ COMMENT ON COLUMN sj_group_config.version IS '版本号'; COMMENT ON COLUMN sj_group_config.group_partition IS '分区'; COMMENT ON COLUMN sj_group_config.id_generator_mode IS '唯一id生成模式 默认号段模式'; COMMENT ON COLUMN sj_group_config.init_scene IS '是否初始化场景 0:否 1:是'; -COMMENT ON COLUMN sj_group_config.bucket_index IS 'bucket'; COMMENT ON COLUMN sj_group_config.create_dt IS '创建时间'; COMMENT ON COLUMN sj_group_config.update_dt IS '修改时间'; COMMENT ON TABLE sj_group_config IS '组配置'; @@ -129,12 +127,11 @@ COMMENT ON COLUMN sj_notify_recipient.create_dt IS '创建时间'; COMMENT ON COLUMN sj_notify_recipient.update_dt IS '修改时间'; COMMENT ON TABLE sj_notify_recipient IS '告警通知接收人'; --- sj_retry_dead_letter_0 -CREATE TABLE sj_retry_dead_letter_0 +-- sj_retry_dead_letter +CREATE TABLE sj_retry_dead_letter ( id bigserial PRIMARY KEY, namespace_id varchar(64) NOT NULL DEFAULT '764d604ec6fc45f68cd92514c40e9e1a', - unique_id varchar(64) NOT NULL, group_name varchar(64) NOT NULL, scene_name varchar(64) NOT NULL, idempotent_id varchar(64) NOT NULL, @@ -142,37 +139,31 @@ CREATE TABLE sj_retry_dead_letter_0 executor_name varchar(512) NULL DEFAULT '', args_str text NULL, ext_attrs text NULL, - task_type smallint NOT NULL DEFAULT 1, create_dt timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ); -CREATE UNIQUE INDEX uk_sj_retry_dead_letter_0_01 ON sj_retry_dead_letter_0 (namespace_id, group_name, unique_id); +CREATE INDEX idx_sj_retry_dead_letter_01 ON sj_retry_dead_letter (namespace_id, group_name, scene_name); +CREATE INDEX idx_sj_retry_dead_letter_02 ON sj_retry_dead_letter (idempotent_id); +CREATE INDEX idx_sj_retry_dead_letter_03 ON sj_retry_dead_letter (biz_no); +CREATE INDEX idx_sj_retry_dead_letter_04 ON sj_retry_dead_letter (create_dt); -CREATE INDEX idx_sj_retry_dead_letter_0_01 ON sj_retry_dead_letter_0 (namespace_id, group_name, scene_name); -CREATE INDEX idx_sj_retry_dead_letter_0_02 ON sj_retry_dead_letter_0 (idempotent_id); -CREATE INDEX idx_sj_retry_dead_letter_0_03 ON sj_retry_dead_letter_0 (biz_no); -CREATE INDEX idx_sj_retry_dead_letter_0_04 ON sj_retry_dead_letter_0 (create_dt); +COMMENT ON COLUMN sj_retry_dead_letter.id IS '主键'; +COMMENT ON COLUMN sj_retry_dead_letter.namespace_id IS '命名空间id'; +COMMENT ON COLUMN sj_retry_dead_letter.group_name IS '组名称'; +COMMENT ON COLUMN sj_retry_dead_letter.scene_name IS '场景名称'; +COMMENT ON COLUMN sj_retry_dead_letter.idempotent_id IS '幂等id'; +COMMENT ON COLUMN sj_retry_dead_letter.biz_no IS '业务编号'; +COMMENT ON COLUMN sj_retry_dead_letter.executor_name IS '执行器名称'; +COMMENT ON COLUMN sj_retry_dead_letter.args_str IS '执行方法参数'; +COMMENT ON COLUMN sj_retry_dead_letter.ext_attrs IS '扩展字段'; +COMMENT ON COLUMN sj_retry_dead_letter.create_dt IS '创建时间'; +COMMENT ON TABLE sj_retry_dead_letter IS '死信队列表'; -COMMENT ON COLUMN sj_retry_dead_letter_0.id IS '主键'; -COMMENT ON COLUMN sj_retry_dead_letter_0.namespace_id IS '命名空间id'; -COMMENT ON COLUMN sj_retry_dead_letter_0.unique_id IS '同组下id唯一'; -COMMENT ON COLUMN sj_retry_dead_letter_0.group_name IS '组名称'; -COMMENT ON COLUMN sj_retry_dead_letter_0.scene_name IS '场景名称'; -COMMENT ON COLUMN sj_retry_dead_letter_0.idempotent_id IS '幂等id'; -COMMENT ON COLUMN sj_retry_dead_letter_0.biz_no IS '业务编号'; -COMMENT ON COLUMN sj_retry_dead_letter_0.executor_name IS '执行器名称'; -COMMENT ON COLUMN sj_retry_dead_letter_0.args_str IS '执行方法参数'; -COMMENT ON COLUMN sj_retry_dead_letter_0.ext_attrs IS '扩展字段'; -COMMENT ON COLUMN sj_retry_dead_letter_0.task_type IS '任务类型 1、重试数据 2、回调数据'; -COMMENT ON COLUMN sj_retry_dead_letter_0.create_dt IS '创建时间'; -COMMENT ON TABLE sj_retry_dead_letter_0 IS '死信队列表'; - --- sj_retry_task_0 -CREATE TABLE sj_retry_task_0 +-- sj_retry +CREATE TABLE sj_retry ( id bigserial PRIMARY KEY, namespace_id varchar(64) NOT NULL DEFAULT '764d604ec6fc45f68cd92514c40e9e1a', - unique_id varchar(64) NOT NULL, group_name varchar(64) NOT NULL, scene_name varchar(64) NOT NULL, idempotent_id varchar(64) NOT NULL, @@ -180,103 +171,104 @@ CREATE TABLE sj_retry_task_0 executor_name varchar(512) NULL DEFAULT '', args_str text NULL, ext_attrs text NULL, - next_trigger_at timestamp NOT NULL, + next_trigger_at bigint NOT NULL, retry_count int NOT NULL DEFAULT 0, retry_status smallint NOT NULL DEFAULT 0, task_type smallint NOT NULL DEFAULT 1, + bucket_index int NOT NULL DEFAULT 0, + parent_id bigint NOT NULL DEFAULT 0, + deleted bigint NOT NULL DEFAULT 0, create_dt timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, update_dt timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ); -CREATE UNIQUE INDEX uk_sj_retry_task_0_01 ON sj_retry_task_0 (namespace_id, group_name, unique_id); +CREATE UNIQUE INDEX uk_sj_retry_01 ON sj_retry (namespace_id, group_name, task_type, idempotent_id, deleted); -CREATE INDEX idx_sj_retry_task_0_01 ON sj_retry_task_0 (namespace_id, group_name, scene_name); -CREATE INDEX idx_sj_retry_task_0_02 ON sj_retry_task_0 (namespace_id, group_name, task_type); -CREATE INDEX idx_sj_retry_task_0_03 ON sj_retry_task_0 (namespace_id, group_name, retry_status); -CREATE INDEX idx_sj_retry_task_0_04 ON sj_retry_task_0 (idempotent_id); -CREATE INDEX idx_sj_retry_task_0_05 ON sj_retry_task_0 (biz_no); -CREATE INDEX idx_sj_retry_task_0_06 ON sj_retry_task_0 (create_dt); +CREATE INDEX idx_sj_retry_01 ON sj_retry (namespace_id, group_name, scene_name); +CREATE INDEX idx_sj_retry_02 ON sj_retry (namespace_id, group_name, retry_status); +CREATE INDEX idx_sj_retry_03 ON sj_retry (idempotent_id); +CREATE INDEX idx_sj_retry_04 ON sj_retry (biz_no); +CREATE INDEX idx_sj_retry_05 ON sj_retry (parent_id); +CREATE INDEX idx_sj_retry_06 ON sj_retry (create_dt); -COMMENT ON COLUMN sj_retry_task_0.id IS '主键'; -COMMENT ON COLUMN sj_retry_task_0.namespace_id IS '命名空间id'; -COMMENT ON COLUMN sj_retry_task_0.unique_id IS '同组下id唯一'; -COMMENT ON COLUMN sj_retry_task_0.group_name IS '组名称'; -COMMENT ON COLUMN sj_retry_task_0.scene_name IS '场景名称'; -COMMENT ON COLUMN sj_retry_task_0.idempotent_id IS '幂等id'; -COMMENT ON COLUMN sj_retry_task_0.biz_no IS '业务编号'; -COMMENT ON COLUMN sj_retry_task_0.executor_name IS '执行器名称'; -COMMENT ON COLUMN sj_retry_task_0.args_str IS '执行方法参数'; -COMMENT ON COLUMN sj_retry_task_0.ext_attrs IS '扩展字段'; -COMMENT ON COLUMN sj_retry_task_0.next_trigger_at IS '下次触发时间'; -COMMENT ON COLUMN sj_retry_task_0.retry_count IS '重试次数'; -COMMENT ON COLUMN sj_retry_task_0.retry_status IS '重试状态 0、重试中 1、成功 2、最大重试次数'; -COMMENT ON COLUMN sj_retry_task_0.task_type IS '任务类型 1、重试数据 2、回调数据'; -COMMENT ON COLUMN sj_retry_task_0.create_dt IS '创建时间'; -COMMENT ON COLUMN sj_retry_task_0.update_dt IS '修改时间'; -COMMENT ON TABLE sj_retry_task_0 IS '任务表'; +COMMENT ON COLUMN sj_retry.id IS '主键'; +COMMENT ON COLUMN sj_retry.namespace_id IS '命名空间id'; +COMMENT ON COLUMN sj_retry.group_name IS '组名称'; +COMMENT ON COLUMN sj_retry.scene_name IS '场景名称'; +COMMENT ON COLUMN sj_retry.idempotent_id IS '幂等id'; +COMMENT ON COLUMN sj_retry.biz_no IS '业务编号'; +COMMENT ON COLUMN sj_retry.executor_name IS '执行器名称'; +COMMENT ON COLUMN sj_retry.args_str IS '执行方法参数'; +COMMENT ON COLUMN sj_retry.ext_attrs IS '扩展字段'; +COMMENT ON COLUMN sj_retry.next_trigger_at IS '下次触发时间'; +COMMENT ON COLUMN sj_retry.retry_count IS '重试次数'; +COMMENT ON COLUMN sj_retry.retry_status IS '重试状态 0、重试中 1、成功 2、最大重试次数'; +COMMENT ON COLUMN sj_retry.task_type IS '任务类型 1、重试数据 2、回调数据'; +COMMENT ON COLUMN sj_retry.bucket_index IS 'bucket'; +COMMENT ON COLUMN sj_retry.parent_id IS '父节点id'; +COMMENT ON COLUMN sj_retry.deleted IS '逻辑删除'; +COMMENT ON COLUMN sj_retry.create_dt IS '创建时间'; +COMMENT ON COLUMN sj_retry.update_dt IS '修改时间'; +COMMENT ON TABLE sj_retry IS '重试信息表'; --- sj_retry_task_log -CREATE TABLE sj_retry_task_log +-- sj_retry_task +CREATE TABLE sj_retry_task ( - id bigserial PRIMARY KEY, - namespace_id varchar(64) NOT NULL DEFAULT '764d604ec6fc45f68cd92514c40e9e1a', - unique_id varchar(64) NOT NULL, - group_name varchar(64) NOT NULL, - scene_name varchar(64) NOT NULL, - idempotent_id varchar(64) NOT NULL, - biz_no varchar(64) NULL DEFAULT '', - executor_name varchar(512) NULL DEFAULT '', - args_str text NULL, - ext_attrs text NULL, - retry_status smallint NOT NULL DEFAULT 0, - task_type smallint NOT NULL DEFAULT 1, - create_dt timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, - update_dt timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP + id bigserial PRIMARY KEY, + namespace_id varchar(64) NOT NULL DEFAULT '764d604ec6fc45f68cd92514c40e9e1a', + group_name varchar(64) NOT NULL, + scene_name varchar(64) NOT NULL, + retry_id bigint NOT NULL, + ext_attrs text NULL, + task_status smallint NOT NULL DEFAULT 1, + task_type smallint NOT NULL DEFAULT 1, + operation_reason smallint NOT NULL DEFAULT 0, + client_info varchar(128) NULL DEFAULT NULL, + create_dt timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, + update_dt timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ); -CREATE INDEX idx_sj_retry_task_log_01 ON sj_retry_task_log (namespace_id, group_name, scene_name); -CREATE INDEX idx_sj_retry_task_log_02 ON sj_retry_task_log (retry_status); -CREATE INDEX idx_sj_retry_task_log_03 ON sj_retry_task_log (idempotent_id); -CREATE INDEX idx_sj_retry_task_log_04 ON sj_retry_task_log (unique_id); -CREATE INDEX idx_sj_retry_task_log_05 ON sj_retry_task_log (biz_no); -CREATE INDEX idx_sj_retry_task_log_06 ON sj_retry_task_log (create_dt); +CREATE INDEX idx_sj_retry_task_01 ON sj_retry_task (namespace_id, group_name, scene_name); +CREATE INDEX idx_sj_retry_task_02 ON sj_retry_task (task_status); +CREATE INDEX idx_sj_retry_task_03 ON sj_retry_task (create_dt); +CREATE INDEX idx_sj_retry_task_04 ON sj_retry_task (retry_id); -COMMENT ON COLUMN sj_retry_task_log.id IS '主键'; -COMMENT ON COLUMN sj_retry_task_log.namespace_id IS '命名空间id'; -COMMENT ON COLUMN sj_retry_task_log.unique_id IS '同组下id唯一'; -COMMENT ON COLUMN sj_retry_task_log.group_name IS '组名称'; -COMMENT ON COLUMN sj_retry_task_log.scene_name IS '场景名称'; -COMMENT ON COLUMN sj_retry_task_log.idempotent_id IS '幂等id'; -COMMENT ON COLUMN sj_retry_task_log.biz_no IS '业务编号'; -COMMENT ON COLUMN sj_retry_task_log.executor_name IS '执行器名称'; -COMMENT ON COLUMN sj_retry_task_log.args_str IS '执行方法参数'; -COMMENT ON COLUMN sj_retry_task_log.ext_attrs IS '扩展字段'; -COMMENT ON COLUMN sj_retry_task_log.retry_status IS '重试状态 0、重试中 1、成功 2、最大次数'; -COMMENT ON COLUMN sj_retry_task_log.task_type IS '任务类型 1、重试数据 2、回调数据'; -COMMENT ON COLUMN sj_retry_task_log.create_dt IS '创建时间'; -COMMENT ON COLUMN sj_retry_task_log.update_dt IS '修改时间'; -COMMENT ON TABLE sj_retry_task_log IS '任务日志基础信息表'; +COMMENT ON COLUMN sj_retry_task.id IS '主键'; +COMMENT ON COLUMN sj_retry_task.namespace_id IS '命名空间id'; +COMMENT ON COLUMN sj_retry_task.group_name IS '组名称'; +COMMENT ON COLUMN sj_retry_task.scene_name IS '场景名称'; +COMMENT ON COLUMN sj_retry_task.retry_id IS '重试信息Id'; +COMMENT ON COLUMN sj_retry_task.ext_attrs IS '扩展字段'; +COMMENT ON COLUMN sj_retry_task.task_status IS '重试状态'; +COMMENT ON COLUMN sj_retry_task.task_type IS '任务类型 1、重试数据 2、回调数据'; +COMMENT ON COLUMN sj_retry_task.operation_reason IS '操作原因'; +COMMENT ON COLUMN sj_retry_task.client_info IS '客户端地址 clientId#ip:port'; +COMMENT ON COLUMN sj_retry_task.create_dt IS '创建时间'; +COMMENT ON COLUMN sj_retry_task.update_dt IS '修改时间'; +COMMENT ON TABLE sj_retry_task IS '重试任务表'; -- sj_retry_task_log_message CREATE TABLE sj_retry_task_log_message ( - id bigserial PRIMARY KEY, - namespace_id varchar(64) NOT NULL DEFAULT '764d604ec6fc45f68cd92514c40e9e1a', - group_name varchar(64) NOT NULL, - unique_id varchar(64) NOT NULL, - message text NULL, - log_num int NOT NULL DEFAULT 1, - real_time bigint NOT NULL DEFAULT 0, - create_dt timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP + id bigserial PRIMARY KEY, + namespace_id varchar(64) NOT NULL DEFAULT '764d604ec6fc45f68cd92514c40e9e1a', + group_name varchar(64) NOT NULL, + retry_id bigint NOT NULL, + retry_task_id bigint NOT NULL, + message text NULL, + log_num int NOT NULL DEFAULT 1, + real_time bigint NOT NULL DEFAULT 0, + create_dt timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ); -CREATE INDEX idx_sj_retry_task_log_message_01 ON sj_retry_task_log_message (namespace_id, group_name, unique_id); +CREATE INDEX idx_sj_retry_task_log_message_01 ON sj_retry_task_log_message (namespace_id, group_name, retry_task_id); CREATE INDEX idx_sj_retry_task_log_message_02 ON sj_retry_task_log_message (create_dt); COMMENT ON COLUMN sj_retry_task_log_message.id IS '主键'; COMMENT ON COLUMN sj_retry_task_log_message.namespace_id IS '命名空间id'; COMMENT ON COLUMN sj_retry_task_log_message.group_name IS '组名称'; -COMMENT ON COLUMN sj_retry_task_log_message.unique_id IS '同组下id唯一'; +COMMENT ON COLUMN sj_retry_task_log_message.retry_id IS '重试信息Id'; +COMMENT ON COLUMN sj_retry_task_log_message.retry_task_id IS '重试任务Id'; COMMENT ON COLUMN sj_retry_task_log_message.message IS '异常信息'; COMMENT ON COLUMN sj_retry_task_log_message.log_num IS '日志数量'; COMMENT ON COLUMN sj_retry_task_log_message.real_time IS '上报时间'; @@ -286,21 +278,26 @@ COMMENT ON TABLE sj_retry_task_log_message IS '任务调度日志信息记录表 -- sj_retry_scene_config CREATE TABLE sj_retry_scene_config ( - id bigserial PRIMARY KEY, - namespace_id varchar(64) NOT NULL DEFAULT '764d604ec6fc45f68cd92514c40e9e1a', - scene_name varchar(64) NOT NULL, - group_name varchar(64) NOT NULL, - scene_status smallint NOT NULL DEFAULT 0, - max_retry_count int NOT NULL DEFAULT 5, - back_off smallint NOT NULL DEFAULT 1, - trigger_interval varchar(16) NULL DEFAULT '', - notify_ids varchar(128) NULL DEFAULT '', - deadline_request bigint NOT NULL DEFAULT 60000, - executor_timeout int NOT NULL DEFAULT 5, - route_key smallint NOT NULL DEFAULT 4, - description varchar(256) NULL DEFAULT '', - create_dt timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, - update_dt timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP + id bigserial PRIMARY KEY, + namespace_id varchar(64) NOT NULL DEFAULT '764d604ec6fc45f68cd92514c40e9e1a', + scene_name varchar(64) NOT NULL, + group_name varchar(64) NOT NULL, + scene_status smallint NOT NULL DEFAULT 0, + max_retry_count int NOT NULL DEFAULT 5, + back_off smallint NOT NULL DEFAULT 1, + trigger_interval varchar(16) NULL DEFAULT '', + notify_ids varchar(128) NULL DEFAULT '', + deadline_request bigint NOT NULL DEFAULT 60000, + executor_timeout int NOT NULL DEFAULT 5, + route_key smallint NOT NULL DEFAULT 4, + block_strategy smallint NOT NULL DEFAULT 1, + cb_status smallint NOT NULL DEFAULT 0, + cb_trigger_type smallint NOT NULL DEFAULT 1, + cb_max_count int NOT NULL DEFAULT 16, + cb_trigger_interval varchar(16) NULL DEFAULT '', + description varchar(256) NULL DEFAULT '', + create_dt timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, + update_dt timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ); CREATE UNIQUE INDEX uk_sj_retry_scene_config_01 ON sj_retry_scene_config (namespace_id, group_name, scene_name); @@ -317,6 +314,11 @@ COMMENT ON COLUMN sj_retry_scene_config.notify_ids IS '通知告警场景配置i COMMENT ON COLUMN sj_retry_scene_config.deadline_request IS 'Deadline Request 调用链超时 单位毫秒'; COMMENT ON COLUMN sj_retry_scene_config.executor_timeout IS '任务执行超时时间，单位秒'; COMMENT ON COLUMN sj_retry_scene_config.route_key IS '路由策略'; +COMMENT ON COLUMN sj_retry_scene_config.block_strategy IS '阻塞策略 1、丢弃 2、覆盖 3、并行'; +COMMENT ON COLUMN sj_retry_scene_config.cb_status IS '回调状态 0、不开启 1、开启'; +COMMENT ON COLUMN sj_retry_scene_config.cb_trigger_type IS '1、默认等级 2、固定间隔时间 3、CRON 表达式'; +COMMENT ON COLUMN sj_retry_scene_config.cb_max_count IS '回调的最大执行次数'; +COMMENT ON COLUMN sj_retry_scene_config.cb_trigger_interval IS '回调的最大执行次数'; COMMENT ON COLUMN sj_retry_scene_config.description IS '描述'; COMMENT ON COLUMN sj_retry_scene_config.create_dt IS '创建时间'; COMMENT ON COLUMN sj_retry_scene_config.update_dt IS '修改时间'; @@ -359,7 +361,7 @@ COMMENT ON TABLE sj_server_node IS '服务器节点'; -- sj_distributed_lock CREATE TABLE sj_distributed_lock ( - name varchar(64) PRIMARY KEY, + name varchar(64) NOT NULL, lock_until timestamp(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3), locked_at timestamp(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3), locked_by varchar(255) NOT NULL, @@ -490,11 +492,11 @@ COMMENT ON COLUMN sj_job.executor_type IS '执行器类型'; COMMENT ON COLUMN sj_job.executor_info IS '执行器名称'; COMMENT ON COLUMN sj_job.trigger_type IS '触发类型 1.CRON 表达式 2. 固定时间'; COMMENT ON COLUMN sj_job.trigger_interval IS '间隔时长'; -COMMENT ON COLUMN sj_job.block_strategy IS '阻塞策略 1、丢弃 2、覆盖 3、并行'; +COMMENT ON COLUMN sj_job.block_strategy IS '阻塞策略 1、丢弃 2、覆盖 3、并行 4、恢复'; COMMENT ON COLUMN sj_job.executor_timeout IS '任务执行超时时间，单位秒'; COMMENT ON COLUMN sj_job.max_retry_times IS '最大重试次数'; COMMENT ON COLUMN sj_job.parallel_num IS '并行数'; -COMMENT ON COLUMN sj_job.retry_interval IS '重试间隔 ( s ) '; +COMMENT ON COLUMN sj_job.retry_interval IS '重试间隔 ( s)'; COMMENT ON COLUMN sj_job.bucket_index IS 'bucket'; COMMENT ON COLUMN sj_job.resident IS '是否是常驻任务'; COMMENT ON COLUMN sj_job.notify_ids IS '通知告警场景配置id列表'; @@ -659,7 +661,7 @@ CREATE INDEX idx_sj_job_summary_01 ON sj_job_summary (namespace_id, group_name, COMMENT ON COLUMN sj_job_summary.id IS '主键'; COMMENT ON COLUMN sj_job_summary.namespace_id IS '命名空间id'; COMMENT ON COLUMN sj_job_summary.group_name IS '组名称'; -COMMENT ON COLUMN sj_job_summary.business_id IS '业务id ( job_id或workflow_id ) '; +COMMENT ON COLUMN sj_job_summary.business_id IS '业务id ( job_id或workflow_id)'; COMMENT ON COLUMN sj_job_summary.system_task_type IS '任务类型 3、JOB任务 4、WORKFLOW任务'; COMMENT ON COLUMN sj_job_summary.trigger_at IS '统计时间'; COMMENT ON COLUMN sj_job_summary.success_num IS '执行成功-日志数量'; @@ -837,4 +839,4 @@ COMMENT ON COLUMN sj_workflow_task_batch.version IS '版本号'; COMMENT ON COLUMN sj_workflow_task_batch.deleted IS '逻辑删除 1、删除'; COMMENT ON COLUMN sj_workflow_task_batch.create_dt IS '创建时间'; COMMENT ON COLUMN sj_workflow_task_batch.update_dt IS '修改时间'; -COMMENT ON TABLE sj_workflow_task_batch IS '工作流批次'; +COMMENT ON TABLE sj_workflow_task_batch IS '工作流批次'; \ No newline at end of file diff --git a/doc/sql/snail_job_mysql.sql b/doc/sql/snail_job_mysql.sql index b750b2e79..a7a2e4685 100644 --- a/doc/sql/snail_job_mysql.sql +++ b/doc/sql/snail_job_mysql.sql @@ -166,17 +166,17 @@ CREATE TABLE `sj_retry_task` CREATE TABLE `sj_retry_task_log_message` ( `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT '主键', - `namespace_id` varchar(64) NOT NULL DEFAULT '764d604ec6fc45f68cd92514c40e9e1a' COMMENT '命名空间id', - `group_name` varchar(64) NOT NULL COMMENT '组名称', - `retry_id` bigint(20) NOT NULL COMMENT '重试信息Id', - `retry_task_id` bigint(20) NOT NULL COMMENT '重试任务Id', - `message` longtext NOT NULL COMMENT '异常信息', + `namespace_id` varchar(64) NOT NULL DEFAULT '764d604ec6fc45f68cd92514c40e9e1a' COMMENT '命名空间id', + `group_name` varchar(64) NOT NULL COMMENT '组名称', + `retry_id` bigint(20) NOT NULL COMMENT '重试信息Id', + `retry_task_id` bigint(20) NOT NULL COMMENT '重试任务Id', + `message` longtext NOT NULL COMMENT '异常信息', `log_num` int(11) NOT NULL DEFAULT 1 COMMENT '日志数量', `real_time` bigint(13) NOT NULL DEFAULT 0 COMMENT '上报时间', - `create_dt` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `create_dt` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', PRIMARY KEY (`id`), - KEY `idx_namespace_id_group_name_retry_task_id` (`namespace_id`, `group_name`, `retry_task_id`), - KEY `idx_create_dt` (`create_dt`) + KEY `idx_namespace_id_group_name_retry_task_id` (`namespace_id`, `group_name`, `retry_task_id`), + KEY `idx_create_dt` (`create_dt`) ) ENGINE = InnoDB AUTO_INCREMENT = 0 DEFAULT CHARSET = utf8mb4 COMMENT ='任务调度日志信息记录表' diff --git a/doc/sql/snail_job_oracle.sql b/doc/sql/snail_job_oracle.sql index ed0b4449e..7c6d62fec 100644 --- a/doc/sql/snail_job_oracle.sql +++ b/doc/sql/snail_job_oracle.sql @@ -1,8 +1,9 @@ + /* SnailJob Database Transfer Tool Source Server Type : MySQL Target Server Type : Oracle - Date: 2024-12-27 22:22:15 + Date: 2025-02-25 22:16:28 */ @@ -48,7 +49,6 @@ CREATE TABLE sj_group_config group_partition number NOT NULL, id_generator_mode smallint DEFAULT 1 NOT NULL, init_scene smallint DEFAULT 0 NOT NULL, - bucket_index number DEFAULT 0 NOT NULL, create_dt date DEFAULT CURRENT_TIMESTAMP NOT NULL, update_dt date DEFAULT CURRENT_TIMESTAMP NOT NULL ); @@ -68,7 +68,6 @@ COMMENT ON COLUMN sj_group_config.version IS '版本号'; COMMENT ON COLUMN sj_group_config.group_partition IS '分区'; COMMENT ON COLUMN sj_group_config.id_generator_mode IS '唯一id生成模式 默认号段模式'; COMMENT ON COLUMN sj_group_config.init_scene IS '是否初始化场景 0:否 1:是'; -COMMENT ON COLUMN sj_group_config.bucket_index IS 'bucket'; COMMENT ON COLUMN sj_group_config.create_dt IS '创建时间'; COMMENT ON COLUMN sj_group_config.update_dt IS '修改时间'; COMMENT ON TABLE sj_group_config IS '组配置'; @@ -141,12 +140,11 @@ COMMENT ON COLUMN sj_notify_recipient.create_dt IS '创建时间'; COMMENT ON COLUMN sj_notify_recipient.update_dt IS '修改时间'; COMMENT ON TABLE sj_notify_recipient IS '告警通知接收人'; --- sj_retry_dead_letter_0 -CREATE TABLE sj_retry_dead_letter_0 +-- sj_retry_dead_letter +CREATE TABLE sj_retry_dead_letter ( id number GENERATED ALWAYS AS IDENTITY, namespace_id varchar2(64) DEFAULT '764d604ec6fc45f68cd92514c40e9e1a' NULL, - unique_id varchar2(64) NULL, group_name varchar2(64) NULL, scene_name varchar2(64) NULL, idempotent_id varchar2(64) NULL, @@ -154,40 +152,34 @@ CREATE TABLE sj_retry_dead_letter_0 executor_name varchar2(512) DEFAULT '' NULL, args_str clob NULL, ext_attrs clob NULL, - task_type smallint DEFAULT 1 NOT NULL, create_dt date DEFAULT CURRENT_TIMESTAMP NOT NULL ); -ALTER TABLE sj_retry_dead_letter_0 - ADD CONSTRAINT pk_sj_retry_dead_letter_0 PRIMARY KEY (id); +ALTER TABLE sj_retry_dead_letter + ADD CONSTRAINT pk_sj_retry_dead_letter PRIMARY KEY (id); -CREATE UNIQUE INDEX uk_sj_retry_dead_letter_0_01 ON sj_retry_dead_letter_0 (namespace_id, group_name, unique_id); +CREATE INDEX idx_sj_retry_dead_letter_01 ON sj_retry_dead_letter (namespace_id, group_name, scene_name); +CREATE INDEX idx_sj_retry_dead_letter_02 ON sj_retry_dead_letter (idempotent_id); +CREATE INDEX idx_sj_retry_dead_letter_03 ON sj_retry_dead_letter (biz_no); +CREATE INDEX idx_sj_retry_dead_letter_04 ON sj_retry_dead_letter (create_dt); -CREATE INDEX idx_sj_retry_dead_letter_0_01 ON sj_retry_dead_letter_0 (namespace_id, group_name, scene_name); -CREATE INDEX idx_sj_retry_dead_letter_0_02 ON sj_retry_dead_letter_0 (idempotent_id); -CREATE INDEX idx_sj_retry_dead_letter_0_03 ON sj_retry_dead_letter_0 (biz_no); -CREATE INDEX idx_sj_retry_dead_letter_0_04 ON sj_retry_dead_letter_0 (create_dt); +COMMENT ON COLUMN sj_retry_dead_letter.id IS '主键'; +COMMENT ON COLUMN sj_retry_dead_letter.namespace_id IS '命名空间id'; +COMMENT ON COLUMN sj_retry_dead_letter.group_name IS '组名称'; +COMMENT ON COLUMN sj_retry_dead_letter.scene_name IS '场景名称'; +COMMENT ON COLUMN sj_retry_dead_letter.idempotent_id IS '幂等id'; +COMMENT ON COLUMN sj_retry_dead_letter.biz_no IS '业务编号'; +COMMENT ON COLUMN sj_retry_dead_letter.executor_name IS '执行器名称'; +COMMENT ON COLUMN sj_retry_dead_letter.args_str IS '执行方法参数'; +COMMENT ON COLUMN sj_retry_dead_letter.ext_attrs IS '扩展字段'; +COMMENT ON COLUMN sj_retry_dead_letter.create_dt IS '创建时间'; +COMMENT ON TABLE sj_retry_dead_letter IS '死信队列表'; -COMMENT ON COLUMN sj_retry_dead_letter_0.id IS '主键'; -COMMENT ON COLUMN sj_retry_dead_letter_0.namespace_id IS '命名空间id'; -COMMENT ON COLUMN sj_retry_dead_letter_0.unique_id IS '同组下id唯一'; -COMMENT ON COLUMN sj_retry_dead_letter_0.group_name IS '组名称'; -COMMENT ON COLUMN sj_retry_dead_letter_0.scene_name IS '场景名称'; -COMMENT ON COLUMN sj_retry_dead_letter_0.idempotent_id IS '幂等id'; -COMMENT ON COLUMN sj_retry_dead_letter_0.biz_no IS '业务编号'; -COMMENT ON COLUMN sj_retry_dead_letter_0.executor_name IS '执行器名称'; -COMMENT ON COLUMN sj_retry_dead_letter_0.args_str IS '执行方法参数'; -COMMENT ON COLUMN sj_retry_dead_letter_0.ext_attrs IS '扩展字段'; -COMMENT ON COLUMN sj_retry_dead_letter_0.task_type IS '任务类型 1、重试数据 2、回调数据'; -COMMENT ON COLUMN sj_retry_dead_letter_0.create_dt IS '创建时间'; -COMMENT ON TABLE sj_retry_dead_letter_0 IS '死信队列表'; - --- sj_retry_task_0 -CREATE TABLE sj_retry_task_0 +-- sj_retry +CREATE TABLE sj_retry ( id number GENERATED ALWAYS AS IDENTITY, namespace_id varchar2(64) DEFAULT '764d604ec6fc45f68cd92514c40e9e1a' NULL, - unique_id varchar2(64) NULL, group_name varchar2(64) NULL, scene_name varchar2(64) NULL, idempotent_id varchar2(64) NULL, @@ -195,112 +187,113 @@ CREATE TABLE sj_retry_task_0 executor_name varchar2(512) DEFAULT '' NULL, args_str clob NULL, ext_attrs clob NULL, - next_trigger_at date NOT NULL, + next_trigger_at number NOT NULL, retry_count number DEFAULT 0 NOT NULL, retry_status smallint DEFAULT 0 NOT NULL, task_type smallint DEFAULT 1 NOT NULL, + bucket_index number DEFAULT 0 NOT NULL, + parent_id number DEFAULT 0 NOT NULL, + deleted number DEFAULT 0 NOT NULL, create_dt date DEFAULT CURRENT_TIMESTAMP NOT NULL, update_dt date DEFAULT CURRENT_TIMESTAMP NOT NULL ); -ALTER TABLE sj_retry_task_0 - ADD CONSTRAINT pk_sj_retry_task_0 PRIMARY KEY (id); +ALTER TABLE sj_retry + ADD CONSTRAINT pk_sj_retry PRIMARY KEY (id); -CREATE UNIQUE INDEX uk_sj_retry_task_0_01 ON sj_retry_task_0 (namespace_id, group_name, unique_id); +CREATE UNIQUE INDEX uk_sj_retry_01 ON sj_retry (namespace_id, group_name, task_type, idempotent_id, deleted); -CREATE INDEX idx_sj_retry_task_0_01 ON sj_retry_task_0 (namespace_id, group_name, scene_name); -CREATE INDEX idx_sj_retry_task_0_02 ON sj_retry_task_0 (namespace_id, group_name, task_type); -CREATE INDEX idx_sj_retry_task_0_03 ON sj_retry_task_0 (namespace_id, group_name, retry_status); -CREATE INDEX idx_sj_retry_task_0_04 ON sj_retry_task_0 (idempotent_id); -CREATE INDEX idx_sj_retry_task_0_05 ON sj_retry_task_0 (biz_no); -CREATE INDEX idx_sj_retry_task_0_06 ON sj_retry_task_0 (create_dt); +CREATE INDEX idx_sj_retry_01 ON sj_retry (namespace_id, group_name, scene_name); +CREATE INDEX idx_sj_retry_02 ON sj_retry (namespace_id, group_name, retry_status); +CREATE INDEX idx_sj_retry_03 ON sj_retry (idempotent_id); +CREATE INDEX idx_sj_retry_04 ON sj_retry (biz_no); +CREATE INDEX idx_sj_retry_05 ON sj_retry (parent_id); +CREATE INDEX idx_sj_retry_06 ON sj_retry (create_dt); -COMMENT ON COLUMN sj_retry_task_0.id IS '主键'; -COMMENT ON COLUMN sj_retry_task_0.namespace_id IS '命名空间id'; -COMMENT ON COLUMN sj_retry_task_0.unique_id IS '同组下id唯一'; -COMMENT ON COLUMN sj_retry_task_0.group_name IS '组名称'; -COMMENT ON COLUMN sj_retry_task_0.scene_name IS '场景名称'; -COMMENT ON COLUMN sj_retry_task_0.idempotent_id IS '幂等id'; -COMMENT ON COLUMN sj_retry_task_0.biz_no IS '业务编号'; -COMMENT ON COLUMN sj_retry_task_0.executor_name IS '执行器名称'; -COMMENT ON COLUMN sj_retry_task_0.args_str IS '执行方法参数'; -COMMENT ON COLUMN sj_retry_task_0.ext_attrs IS '扩展字段'; -COMMENT ON COLUMN sj_retry_task_0.next_trigger_at IS '下次触发时间'; -COMMENT ON COLUMN sj_retry_task_0.retry_count IS '重试次数'; -COMMENT ON COLUMN sj_retry_task_0.retry_status IS '重试状态 0、重试中 1、成功 2、最大重试次数'; -COMMENT ON COLUMN sj_retry_task_0.task_type IS '任务类型 1、重试数据 2、回调数据'; -COMMENT ON COLUMN sj_retry_task_0.create_dt IS '创建时间'; -COMMENT ON COLUMN sj_retry_task_0.update_dt IS '修改时间'; -COMMENT ON TABLE sj_retry_task_0 IS '任务表'; +COMMENT ON COLUMN sj_retry.id IS '主键'; +COMMENT ON COLUMN sj_retry.namespace_id IS '命名空间id'; +COMMENT ON COLUMN sj_retry.group_name IS '组名称'; +COMMENT ON COLUMN sj_retry.scene_name IS '场景名称'; +COMMENT ON COLUMN sj_retry.idempotent_id IS '幂等id'; +COMMENT ON COLUMN sj_retry.biz_no IS '业务编号'; +COMMENT ON COLUMN sj_retry.executor_name IS '执行器名称'; +COMMENT ON COLUMN sj_retry.args_str IS '执行方法参数'; +COMMENT ON COLUMN sj_retry.ext_attrs IS '扩展字段'; +COMMENT ON COLUMN sj_retry.next_trigger_at IS '下次触发时间'; +COMMENT ON COLUMN sj_retry.retry_count IS '重试次数'; +COMMENT ON COLUMN sj_retry.retry_status IS '重试状态 0、重试中 1、成功 2、最大重试次数'; +COMMENT ON COLUMN sj_retry.task_type IS '任务类型 1、重试数据 2、回调数据'; +COMMENT ON COLUMN sj_retry.bucket_index IS 'bucket'; +COMMENT ON COLUMN sj_retry.parent_id IS '父节点id'; +COMMENT ON COLUMN sj_retry.deleted IS '逻辑删除'; +COMMENT ON COLUMN sj_retry.create_dt IS '创建时间'; +COMMENT ON COLUMN sj_retry.update_dt IS '修改时间'; +COMMENT ON TABLE sj_retry IS '重试信息表'; --- sj_retry_task_log -CREATE TABLE sj_retry_task_log +-- sj_retry_task +CREATE TABLE sj_retry_task ( - id number GENERATED ALWAYS AS IDENTITY, - namespace_id varchar2(64) DEFAULT '764d604ec6fc45f68cd92514c40e9e1a' NULL, - unique_id varchar2(64) NULL, - group_name varchar2(64) NULL, - scene_name varchar2(64) NULL, - idempotent_id varchar2(64) NULL, - biz_no varchar2(64) DEFAULT '' NULL, - executor_name varchar2(512) DEFAULT '' NULL, - args_str clob NULL, - ext_attrs clob NULL, - retry_status smallint DEFAULT 0 NOT NULL, - task_type smallint DEFAULT 1 NOT NULL, - create_dt date DEFAULT CURRENT_TIMESTAMP NOT NULL, - update_dt date DEFAULT CURRENT_TIMESTAMP NOT NULL + id number GENERATED ALWAYS AS IDENTITY, + namespace_id varchar2(64) DEFAULT '764d604ec6fc45f68cd92514c40e9e1a' NULL, + group_name varchar2(64) NULL, + scene_name varchar2(64) NULL, + retry_id number NOT NULL, + ext_attrs clob NULL, + task_status smallint DEFAULT 1 NOT NULL, + task_type smallint DEFAULT 1 NOT NULL, + operation_reason smallint DEFAULT 0 NOT NULL, + client_info varchar2(128) DEFAULT NULL NULL, + create_dt date DEFAULT CURRENT_TIMESTAMP NOT NULL, + update_dt date DEFAULT CURRENT_TIMESTAMP NOT NULL ); -ALTER TABLE sj_retry_task_log - ADD CONSTRAINT pk_sj_retry_task_log PRIMARY KEY (id); +ALTER TABLE sj_retry_task + ADD CONSTRAINT pk_sj_retry_task PRIMARY KEY (id); -CREATE INDEX idx_sj_retry_task_log_01 ON sj_retry_task_log (namespace_id, group_name, scene_name); -CREATE INDEX idx_sj_retry_task_log_02 ON sj_retry_task_log (retry_status); -CREATE INDEX idx_sj_retry_task_log_03 ON sj_retry_task_log (idempotent_id); -CREATE INDEX idx_sj_retry_task_log_04 ON sj_retry_task_log (unique_id); -CREATE INDEX idx_sj_retry_task_log_05 ON sj_retry_task_log (biz_no); -CREATE INDEX idx_sj_retry_task_log_06 ON sj_retry_task_log (create_dt); +CREATE INDEX idx_sj_retry_task_01 ON sj_retry_task (namespace_id, group_name, scene_name); +CREATE INDEX idx_sj_retry_task_02 ON sj_retry_task (task_status); +CREATE INDEX idx_sj_retry_task_03 ON sj_retry_task (create_dt); +CREATE INDEX idx_sj_retry_task_04 ON sj_retry_task (retry_id); -COMMENT ON COLUMN sj_retry_task_log.id IS '主键'; -COMMENT ON COLUMN sj_retry_task_log.namespace_id IS '命名空间id'; -COMMENT ON COLUMN sj_retry_task_log.unique_id IS '同组下id唯一'; -COMMENT ON COLUMN sj_retry_task_log.group_name IS '组名称'; -COMMENT ON COLUMN sj_retry_task_log.scene_name IS '场景名称'; -COMMENT ON COLUMN sj_retry_task_log.idempotent_id IS '幂等id'; -COMMENT ON COLUMN sj_retry_task_log.biz_no IS '业务编号'; -COMMENT ON COLUMN sj_retry_task_log.executor_name IS '执行器名称'; -COMMENT ON COLUMN sj_retry_task_log.args_str IS '执行方法参数'; -COMMENT ON COLUMN sj_retry_task_log.ext_attrs IS '扩展字段'; -COMMENT ON COLUMN sj_retry_task_log.retry_status IS '重试状态 0、重试中 1、成功 2、最大次数'; -COMMENT ON COLUMN sj_retry_task_log.task_type IS '任务类型 1、重试数据 2、回调数据'; -COMMENT ON COLUMN sj_retry_task_log.create_dt IS '创建时间'; -COMMENT ON COLUMN sj_retry_task_log.update_dt IS '修改时间'; -COMMENT ON TABLE sj_retry_task_log IS '任务日志基础信息表'; +COMMENT ON COLUMN sj_retry_task.id IS '主键'; +COMMENT ON COLUMN sj_retry_task.namespace_id IS '命名空间id'; +COMMENT ON COLUMN sj_retry_task.group_name IS '组名称'; +COMMENT ON COLUMN sj_retry_task.scene_name IS '场景名称'; +COMMENT ON COLUMN sj_retry_task.retry_id IS '重试信息Id'; +COMMENT ON COLUMN sj_retry_task.ext_attrs IS '扩展字段'; +COMMENT ON COLUMN sj_retry_task.task_status IS '重试状态'; +COMMENT ON COLUMN sj_retry_task.task_type IS '任务类型 1、重试数据 2、回调数据'; +COMMENT ON COLUMN sj_retry_task.operation_reason IS '操作原因'; +COMMENT ON COLUMN sj_retry_task.client_info IS '客户端地址 clientId#ip:port'; +COMMENT ON COLUMN sj_retry_task.create_dt IS '创建时间'; +COMMENT ON COLUMN sj_retry_task.update_dt IS '修改时间'; +COMMENT ON TABLE sj_retry_task IS '重试任务表'; -- sj_retry_task_log_message CREATE TABLE sj_retry_task_log_message ( - id number GENERATED ALWAYS AS IDENTITY, - namespace_id varchar2(64) DEFAULT '764d604ec6fc45f68cd92514c40e9e1a' NULL, - group_name varchar2(64) NULL, - unique_id varchar2(64) NULL, - message clob NULL, - log_num number DEFAULT 1 NOT NULL, - real_time number DEFAULT 0 NOT NULL, - create_dt date DEFAULT CURRENT_TIMESTAMP NOT NULL + id number GENERATED ALWAYS AS IDENTITY, + namespace_id varchar2(64) DEFAULT '764d604ec6fc45f68cd92514c40e9e1a' NULL, + group_name varchar2(64) NULL, + retry_id number NOT NULL, + retry_task_id number NOT NULL, + message clob NULL, + log_num number DEFAULT 1 NOT NULL, + real_time number DEFAULT 0 NOT NULL, + create_dt date DEFAULT CURRENT_TIMESTAMP NOT NULL ); ALTER TABLE sj_retry_task_log_message ADD CONSTRAINT pk_sj_retry_task_log_message PRIMARY KEY (id); -CREATE INDEX idx_sj_rt_log_message_01 ON sj_retry_task_log_message (namespace_id, group_name, unique_id); -CREATE INDEX idx_sj_rt_log_message_02 ON sj_retry_task_log_message (create_dt); +CREATE INDEX idx_sj_retry_task_log_message_01 ON sj_retry_task_log_message (namespace_id, group_name, retry_task_id); +CREATE INDEX idx_sj_retry_task_log_message_02 ON sj_retry_task_log_message (create_dt); COMMENT ON COLUMN sj_retry_task_log_message.id IS '主键'; COMMENT ON COLUMN sj_retry_task_log_message.namespace_id IS '命名空间id'; COMMENT ON COLUMN sj_retry_task_log_message.group_name IS '组名称'; -COMMENT ON COLUMN sj_retry_task_log_message.unique_id IS '同组下id唯一'; +COMMENT ON COLUMN sj_retry_task_log_message.retry_id IS '重试信息Id'; +COMMENT ON COLUMN sj_retry_task_log_message.retry_task_id IS '重试任务Id'; COMMENT ON COLUMN sj_retry_task_log_message.message IS '异常信息'; COMMENT ON COLUMN sj_retry_task_log_message.log_num IS '日志数量'; COMMENT ON COLUMN sj_retry_task_log_message.real_time IS '上报时间'; @@ -310,21 +303,26 @@ COMMENT ON TABLE sj_retry_task_log_message IS '任务调度日志信息记录表 -- sj_retry_scene_config CREATE TABLE sj_retry_scene_config ( - id number GENERATED ALWAYS AS IDENTITY, - namespace_id varchar2(64) DEFAULT '764d604ec6fc45f68cd92514c40e9e1a' NULL, - scene_name varchar2(64) NULL, - group_name varchar2(64) NULL, - scene_status smallint DEFAULT 0 NOT NULL, - max_retry_count number DEFAULT 5 NOT NULL, - back_off smallint DEFAULT 1 NOT NULL, - trigger_interval varchar2(16) DEFAULT '' NULL, - notify_ids varchar2(128) DEFAULT '' NULL, - deadline_request number DEFAULT 60000 NOT NULL, - executor_timeout number DEFAULT 5 NOT NULL, - route_key smallint DEFAULT 4 NOT NULL, - description varchar2(256) DEFAULT '' NULL, - create_dt date DEFAULT CURRENT_TIMESTAMP NOT NULL, - update_dt date DEFAULT CURRENT_TIMESTAMP NOT NULL + id number GENERATED ALWAYS AS IDENTITY, + namespace_id varchar2(64) DEFAULT '764d604ec6fc45f68cd92514c40e9e1a' NULL, + scene_name varchar2(64) NULL, + group_name varchar2(64) NULL, + scene_status smallint DEFAULT 0 NOT NULL, + max_retry_count number DEFAULT 5 NOT NULL, + back_off smallint DEFAULT 1 NOT NULL, + trigger_interval varchar2(16) DEFAULT '' NULL, + notify_ids varchar2(128) DEFAULT '' NULL, + deadline_request number DEFAULT 60000 NOT NULL, + executor_timeout number DEFAULT 5 NOT NULL, + route_key smallint DEFAULT 4 NOT NULL, + block_strategy smallint DEFAULT 1 NOT NULL, + cb_status smallint DEFAULT 0 NOT NULL, + cb_trigger_type smallint DEFAULT 1 NOT NULL, + cb_max_count number DEFAULT 16 NOT NULL, + cb_trigger_interval varchar2(16) DEFAULT '' NULL, + description varchar2(256) DEFAULT '' NULL, + create_dt date DEFAULT CURRENT_TIMESTAMP NOT NULL, + update_dt date DEFAULT CURRENT_TIMESTAMP NOT NULL ); ALTER TABLE sj_retry_scene_config @@ -344,6 +342,11 @@ COMMENT ON COLUMN sj_retry_scene_config.notify_ids IS '通知告警场景配置i COMMENT ON COLUMN sj_retry_scene_config.deadline_request IS 'Deadline Request 调用链超时 单位毫秒'; COMMENT ON COLUMN sj_retry_scene_config.executor_timeout IS '任务执行超时时间，单位秒'; COMMENT ON COLUMN sj_retry_scene_config.route_key IS '路由策略'; +COMMENT ON COLUMN sj_retry_scene_config.block_strategy IS '阻塞策略 1、丢弃 2、覆盖 3、并行'; +COMMENT ON COLUMN sj_retry_scene_config.cb_status IS '回调状态 0、不开启 1、开启'; +COMMENT ON COLUMN sj_retry_scene_config.cb_trigger_type IS '1、默认等级 2、固定间隔时间 3、CRON 表达式'; +COMMENT ON COLUMN sj_retry_scene_config.cb_max_count IS '回调的最大执行次数'; +COMMENT ON COLUMN sj_retry_scene_config.cb_trigger_interval IS '回调的最大执行次数'; COMMENT ON COLUMN sj_retry_scene_config.description IS '描述'; COMMENT ON COLUMN sj_retry_scene_config.create_dt IS '创建时间'; COMMENT ON COLUMN sj_retry_scene_config.update_dt IS '修改时间'; @@ -447,7 +450,7 @@ CREATE TABLE sj_system_user_permission ALTER TABLE sj_system_user_permission ADD CONSTRAINT pk_sj_system_user_permission PRIMARY KEY (id); -CREATE UNIQUE INDEX uk_sj_su_permission_01 ON sj_system_user_permission (namespace_id, group_name, system_user_id); +CREATE UNIQUE INDEX uk_sj_system_user_permission_01 ON sj_system_user_permission (namespace_id, group_name, system_user_id); COMMENT ON COLUMN sj_system_user_permission.id IS '主键'; COMMENT ON COLUMN sj_system_user_permission.group_name IS '组名称'; @@ -535,11 +538,11 @@ COMMENT ON COLUMN sj_job.executor_type IS '执行器类型'; COMMENT ON COLUMN sj_job.executor_info IS '执行器名称'; COMMENT ON COLUMN sj_job.trigger_type IS '触发类型 1.CRON 表达式 2. 固定时间'; COMMENT ON COLUMN sj_job.trigger_interval IS '间隔时长'; -COMMENT ON COLUMN sj_job.block_strategy IS '阻塞策略 1、丢弃 2、覆盖 3、并行'; +COMMENT ON COLUMN sj_job.block_strategy IS '阻塞策略 1、丢弃 2、覆盖 3、并行 4、恢复'; COMMENT ON COLUMN sj_job.executor_timeout IS '任务执行超时时间，单位秒'; COMMENT ON COLUMN sj_job.max_retry_times IS '最大重试次数'; COMMENT ON COLUMN sj_job.parallel_num IS '并行数'; -COMMENT ON COLUMN sj_job.retry_interval IS '重试间隔 ( s ) '; +COMMENT ON COLUMN sj_job.retry_interval IS '重试间隔 ( s)'; COMMENT ON COLUMN sj_job.bucket_index IS 'bucket'; COMMENT ON COLUMN sj_job.resident IS '是否是常驻任务'; COMMENT ON COLUMN sj_job.notify_ids IS '通知告警场景配置id列表'; @@ -716,7 +719,7 @@ CREATE INDEX idx_sj_job_summary_01 ON sj_job_summary (namespace_id, group_name, COMMENT ON COLUMN sj_job_summary.id IS '主键'; COMMENT ON COLUMN sj_job_summary.namespace_id IS '命名空间id'; COMMENT ON COLUMN sj_job_summary.group_name IS '组名称'; -COMMENT ON COLUMN sj_job_summary.business_id IS '业务id ( job_id或workflow_id ) '; +COMMENT ON COLUMN sj_job_summary.business_id IS '业务id ( job_id或workflow_id)'; COMMENT ON COLUMN sj_job_summary.system_task_type IS '任务类型 3、JOB任务 4、WORKFLOW任务'; COMMENT ON COLUMN sj_job_summary.trigger_at IS '统计时间'; COMMENT ON COLUMN sj_job_summary.success_num IS '执行成功-日志数量'; @@ -906,4 +909,4 @@ COMMENT ON COLUMN sj_workflow_task_batch.version IS '版本号'; COMMENT ON COLUMN sj_workflow_task_batch.deleted IS '逻辑删除 1、删除'; COMMENT ON COLUMN sj_workflow_task_batch.create_dt IS '创建时间'; COMMENT ON COLUMN sj_workflow_task_batch.update_dt IS '修改时间'; -COMMENT ON TABLE sj_workflow_task_batch IS '工作流批次'; +COMMENT ON TABLE sj_workflow_task_batch IS '工作流批次'; \ No newline at end of file diff --git a/doc/sql/snail_job_postgre.sql b/doc/sql/snail_job_postgre.sql index 48cde652a..21ebb68d8 100644 --- a/doc/sql/snail_job_postgre.sql +++ b/doc/sql/snail_job_postgre.sql @@ -2,7 +2,7 @@ SnailJob Database Transfer Tool Source Server Type : MySQL Target Server Type : PostgreSQL - Date: 2024-12-27 22:13:49 + Date: 2025-02-25 22:15:32 */ @@ -45,7 +45,6 @@ CREATE TABLE sj_group_config group_partition int NOT NULL, id_generator_mode smallint NOT NULL DEFAULT 1, init_scene smallint NOT NULL DEFAULT 0, - bucket_index int NOT NULL DEFAULT 0, create_dt timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, update_dt timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ); @@ -62,7 +61,6 @@ COMMENT ON COLUMN sj_group_config.version IS '版本号'; COMMENT ON COLUMN sj_group_config.group_partition IS '分区'; COMMENT ON COLUMN sj_group_config.id_generator_mode IS '唯一id生成模式 默认号段模式'; COMMENT ON COLUMN sj_group_config.init_scene IS '是否初始化场景 0:否 1:是'; -COMMENT ON COLUMN sj_group_config.bucket_index IS 'bucket'; COMMENT ON COLUMN sj_group_config.create_dt IS '创建时间'; COMMENT ON COLUMN sj_group_config.update_dt IS '修改时间'; COMMENT ON TABLE sj_group_config IS '组配置'; @@ -129,12 +127,11 @@ COMMENT ON COLUMN sj_notify_recipient.create_dt IS '创建时间'; COMMENT ON COLUMN sj_notify_recipient.update_dt IS '修改时间'; COMMENT ON TABLE sj_notify_recipient IS '告警通知接收人'; --- sj_retry_dead_letter_0 -CREATE TABLE sj_retry_dead_letter_0 +-- sj_retry_dead_letter +CREATE TABLE sj_retry_dead_letter ( id bigserial PRIMARY KEY, namespace_id varchar(64) NOT NULL DEFAULT '764d604ec6fc45f68cd92514c40e9e1a', - unique_id varchar(64) NOT NULL, group_name varchar(64) NOT NULL, scene_name varchar(64) NOT NULL, idempotent_id varchar(64) NOT NULL, @@ -142,37 +139,31 @@ CREATE TABLE sj_retry_dead_letter_0 executor_name varchar(512) NOT NULL DEFAULT '', args_str text NOT NULL, ext_attrs text NOT NULL, - task_type smallint NOT NULL DEFAULT 1, create_dt timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ); -CREATE UNIQUE INDEX uk_sj_retry_dead_letter_0_01 ON sj_retry_dead_letter_0 (namespace_id, group_name, unique_id); +CREATE INDEX idx_sj_retry_dead_letter_01 ON sj_retry_dead_letter (namespace_id, group_name, scene_name); +CREATE INDEX idx_sj_retry_dead_letter_02 ON sj_retry_dead_letter (idempotent_id); +CREATE INDEX idx_sj_retry_dead_letter_03 ON sj_retry_dead_letter (biz_no); +CREATE INDEX idx_sj_retry_dead_letter_04 ON sj_retry_dead_letter (create_dt); -CREATE INDEX idx_sj_retry_dead_letter_0_01 ON sj_retry_dead_letter_0 (namespace_id, group_name, scene_name); -CREATE INDEX idx_sj_retry_dead_letter_0_02 ON sj_retry_dead_letter_0 (idempotent_id); -CREATE INDEX idx_sj_retry_dead_letter_0_03 ON sj_retry_dead_letter_0 (biz_no); -CREATE INDEX idx_sj_retry_dead_letter_0_04 ON sj_retry_dead_letter_0 (create_dt); +COMMENT ON COLUMN sj_retry_dead_letter.id IS '主键'; +COMMENT ON COLUMN sj_retry_dead_letter.namespace_id IS '命名空间id'; +COMMENT ON COLUMN sj_retry_dead_letter.group_name IS '组名称'; +COMMENT ON COLUMN sj_retry_dead_letter.scene_name IS '场景名称'; +COMMENT ON COLUMN sj_retry_dead_letter.idempotent_id IS '幂等id'; +COMMENT ON COLUMN sj_retry_dead_letter.biz_no IS '业务编号'; +COMMENT ON COLUMN sj_retry_dead_letter.executor_name IS '执行器名称'; +COMMENT ON COLUMN sj_retry_dead_letter.args_str IS '执行方法参数'; +COMMENT ON COLUMN sj_retry_dead_letter.ext_attrs IS '扩展字段'; +COMMENT ON COLUMN sj_retry_dead_letter.create_dt IS '创建时间'; +COMMENT ON TABLE sj_retry_dead_letter IS '死信队列表'; -COMMENT ON COLUMN sj_retry_dead_letter_0.id IS '主键'; -COMMENT ON COLUMN sj_retry_dead_letter_0.namespace_id IS '命名空间id'; -COMMENT ON COLUMN sj_retry_dead_letter_0.unique_id IS '同组下id唯一'; -COMMENT ON COLUMN sj_retry_dead_letter_0.group_name IS '组名称'; -COMMENT ON COLUMN sj_retry_dead_letter_0.scene_name IS '场景名称'; -COMMENT ON COLUMN sj_retry_dead_letter_0.idempotent_id IS '幂等id'; -COMMENT ON COLUMN sj_retry_dead_letter_0.biz_no IS '业务编号'; -COMMENT ON COLUMN sj_retry_dead_letter_0.executor_name IS '执行器名称'; -COMMENT ON COLUMN sj_retry_dead_letter_0.args_str IS '执行方法参数'; -COMMENT ON COLUMN sj_retry_dead_letter_0.ext_attrs IS '扩展字段'; -COMMENT ON COLUMN sj_retry_dead_letter_0.task_type IS '任务类型 1、重试数据 2、回调数据'; -COMMENT ON COLUMN sj_retry_dead_letter_0.create_dt IS '创建时间'; -COMMENT ON TABLE sj_retry_dead_letter_0 IS '死信队列表'; - --- sj_retry_task_0 -CREATE TABLE sj_retry_task_0 +-- sj_retry +CREATE TABLE sj_retry ( id bigserial PRIMARY KEY, namespace_id varchar(64) NOT NULL DEFAULT '764d604ec6fc45f68cd92514c40e9e1a', - unique_id varchar(64) NOT NULL, group_name varchar(64) NOT NULL, scene_name varchar(64) NOT NULL, idempotent_id varchar(64) NOT NULL, @@ -180,103 +171,104 @@ CREATE TABLE sj_retry_task_0 executor_name varchar(512) NOT NULL DEFAULT '', args_str text NOT NULL, ext_attrs text NOT NULL, - next_trigger_at timestamp NOT NULL, + next_trigger_at bigint NOT NULL, retry_count int NOT NULL DEFAULT 0, retry_status smallint NOT NULL DEFAULT 0, task_type smallint NOT NULL DEFAULT 1, + bucket_index int NOT NULL DEFAULT 0, + parent_id bigint NOT NULL DEFAULT 0, + deleted bigint NOT NULL DEFAULT 0, create_dt timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, update_dt timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ); -CREATE UNIQUE INDEX uk_sj_retry_task_0_01 ON sj_retry_task_0 (namespace_id, group_name, unique_id); +CREATE UNIQUE INDEX uk_sj_retry_01 ON sj_retry (namespace_id, group_name, task_type, idempotent_id, deleted); -CREATE INDEX idx_sj_retry_task_0_01 ON sj_retry_task_0 (namespace_id, group_name, scene_name); -CREATE INDEX idx_sj_retry_task_0_02 ON sj_retry_task_0 (namespace_id, group_name, task_type); -CREATE INDEX idx_sj_retry_task_0_03 ON sj_retry_task_0 (namespace_id, group_name, retry_status); -CREATE INDEX idx_sj_retry_task_0_04 ON sj_retry_task_0 (idempotent_id); -CREATE INDEX idx_sj_retry_task_0_05 ON sj_retry_task_0 (biz_no); -CREATE INDEX idx_sj_retry_task_0_06 ON sj_retry_task_0 (create_dt); +CREATE INDEX idx_sj_retry_01 ON sj_retry (namespace_id, group_name, scene_name); +CREATE INDEX idx_sj_retry_02 ON sj_retry (namespace_id, group_name, retry_status); +CREATE INDEX idx_sj_retry_03 ON sj_retry (idempotent_id); +CREATE INDEX idx_sj_retry_04 ON sj_retry (biz_no); +CREATE INDEX idx_sj_retry_05 ON sj_retry (parent_id); +CREATE INDEX idx_sj_retry_06 ON sj_retry (create_dt); -COMMENT ON COLUMN sj_retry_task_0.id IS '主键'; -COMMENT ON COLUMN sj_retry_task_0.namespace_id IS '命名空间id'; -COMMENT ON COLUMN sj_retry_task_0.unique_id IS '同组下id唯一'; -COMMENT ON COLUMN sj_retry_task_0.group_name IS '组名称'; -COMMENT ON COLUMN sj_retry_task_0.scene_name IS '场景名称'; -COMMENT ON COLUMN sj_retry_task_0.idempotent_id IS '幂等id'; -COMMENT ON COLUMN sj_retry_task_0.biz_no IS '业务编号'; -COMMENT ON COLUMN sj_retry_task_0.executor_name IS '执行器名称'; -COMMENT ON COLUMN sj_retry_task_0.args_str IS '执行方法参数'; -COMMENT ON COLUMN sj_retry_task_0.ext_attrs IS '扩展字段'; -COMMENT ON COLUMN sj_retry_task_0.next_trigger_at IS '下次触发时间'; -COMMENT ON COLUMN sj_retry_task_0.retry_count IS '重试次数'; -COMMENT ON COLUMN sj_retry_task_0.retry_status IS '重试状态 0、重试中 1、成功 2、最大重试次数'; -COMMENT ON COLUMN sj_retry_task_0.task_type IS '任务类型 1、重试数据 2、回调数据'; -COMMENT ON COLUMN sj_retry_task_0.create_dt IS '创建时间'; -COMMENT ON COLUMN sj_retry_task_0.update_dt IS '修改时间'; -COMMENT ON TABLE sj_retry_task_0 IS '任务表'; +COMMENT ON COLUMN sj_retry.id IS '主键'; +COMMENT ON COLUMN sj_retry.namespace_id IS '命名空间id'; +COMMENT ON COLUMN sj_retry.group_name IS '组名称'; +COMMENT ON COLUMN sj_retry.scene_name IS '场景名称'; +COMMENT ON COLUMN sj_retry.idempotent_id IS '幂等id'; +COMMENT ON COLUMN sj_retry.biz_no IS '业务编号'; +COMMENT ON COLUMN sj_retry.executor_name IS '执行器名称'; +COMMENT ON COLUMN sj_retry.args_str IS '执行方法参数'; +COMMENT ON COLUMN sj_retry.ext_attrs IS '扩展字段'; +COMMENT ON COLUMN sj_retry.next_trigger_at IS '下次触发时间'; +COMMENT ON COLUMN sj_retry.retry_count IS '重试次数'; +COMMENT ON COLUMN sj_retry.retry_status IS '重试状态 0、重试中 1、成功 2、最大重试次数'; +COMMENT ON COLUMN sj_retry.task_type IS '任务类型 1、重试数据 2、回调数据'; +COMMENT ON COLUMN sj_retry.bucket_index IS 'bucket'; +COMMENT ON COLUMN sj_retry.parent_id IS '父节点id'; +COMMENT ON COLUMN sj_retry.deleted IS '逻辑删除'; +COMMENT ON COLUMN sj_retry.create_dt IS '创建时间'; +COMMENT ON COLUMN sj_retry.update_dt IS '修改时间'; +COMMENT ON TABLE sj_retry IS '重试信息表'; --- sj_retry_task_log -CREATE TABLE sj_retry_task_log +-- sj_retry_task +CREATE TABLE sj_retry_task ( - id bigserial PRIMARY KEY, - namespace_id varchar(64) NOT NULL DEFAULT '764d604ec6fc45f68cd92514c40e9e1a', - unique_id varchar(64) NOT NULL, - group_name varchar(64) NOT NULL, - scene_name varchar(64) NOT NULL, - idempotent_id varchar(64) NOT NULL, - biz_no varchar(64) NOT NULL DEFAULT '', - executor_name varchar(512) NOT NULL DEFAULT '', - args_str text NOT NULL, - ext_attrs text NOT NULL, - retry_status smallint NOT NULL DEFAULT 0, - task_type smallint NOT NULL DEFAULT 1, - create_dt timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, - update_dt timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP + id bigserial PRIMARY KEY, + namespace_id varchar(64) NOT NULL DEFAULT '764d604ec6fc45f68cd92514c40e9e1a', + group_name varchar(64) NOT NULL, + scene_name varchar(64) NOT NULL, + retry_id bigint NOT NULL, + ext_attrs text NOT NULL, + task_status smallint NOT NULL DEFAULT 1, + task_type smallint NOT NULL DEFAULT 1, + operation_reason smallint NOT NULL DEFAULT 0, + client_info varchar(128) NULL DEFAULT NULL, + create_dt timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, + update_dt timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ); -CREATE INDEX idx_sj_retry_task_log_01 ON sj_retry_task_log (namespace_id, group_name, scene_name); -CREATE INDEX idx_sj_retry_task_log_02 ON sj_retry_task_log (retry_status); -CREATE INDEX idx_sj_retry_task_log_03 ON sj_retry_task_log (idempotent_id); -CREATE INDEX idx_sj_retry_task_log_04 ON sj_retry_task_log (unique_id); -CREATE INDEX idx_sj_retry_task_log_05 ON sj_retry_task_log (biz_no); -CREATE INDEX idx_sj_retry_task_log_06 ON sj_retry_task_log (create_dt); +CREATE INDEX idx_sj_retry_task_01 ON sj_retry_task (namespace_id, group_name, scene_name); +CREATE INDEX idx_sj_retry_task_02 ON sj_retry_task (task_status); +CREATE INDEX idx_sj_retry_task_03 ON sj_retry_task (create_dt); +CREATE INDEX idx_sj_retry_task_04 ON sj_retry_task (retry_id); -COMMENT ON COLUMN sj_retry_task_log.id IS '主键'; -COMMENT ON COLUMN sj_retry_task_log.namespace_id IS '命名空间id'; -COMMENT ON COLUMN sj_retry_task_log.unique_id IS '同组下id唯一'; -COMMENT ON COLUMN sj_retry_task_log.group_name IS '组名称'; -COMMENT ON COLUMN sj_retry_task_log.scene_name IS '场景名称'; -COMMENT ON COLUMN sj_retry_task_log.idempotent_id IS '幂等id'; -COMMENT ON COLUMN sj_retry_task_log.biz_no IS '业务编号'; -COMMENT ON COLUMN sj_retry_task_log.executor_name IS '执行器名称'; -COMMENT ON COLUMN sj_retry_task_log.args_str IS '执行方法参数'; -COMMENT ON COLUMN sj_retry_task_log.ext_attrs IS '扩展字段'; -COMMENT ON COLUMN sj_retry_task_log.retry_status IS '重试状态 0、重试中 1、成功 2、最大次数'; -COMMENT ON COLUMN sj_retry_task_log.task_type IS '任务类型 1、重试数据 2、回调数据'; -COMMENT ON COLUMN sj_retry_task_log.create_dt IS '创建时间'; -COMMENT ON COLUMN sj_retry_task_log.update_dt IS '修改时间'; -COMMENT ON TABLE sj_retry_task_log IS '任务日志基础信息表'; +COMMENT ON COLUMN sj_retry_task.id IS '主键'; +COMMENT ON COLUMN sj_retry_task.namespace_id IS '命名空间id'; +COMMENT ON COLUMN sj_retry_task.group_name IS '组名称'; +COMMENT ON COLUMN sj_retry_task.scene_name IS '场景名称'; +COMMENT ON COLUMN sj_retry_task.retry_id IS '重试信息Id'; +COMMENT ON COLUMN sj_retry_task.ext_attrs IS '扩展字段'; +COMMENT ON COLUMN sj_retry_task.task_status IS '重试状态'; +COMMENT ON COLUMN sj_retry_task.task_type IS '任务类型 1、重试数据 2、回调数据'; +COMMENT ON COLUMN sj_retry_task.operation_reason IS '操作原因'; +COMMENT ON COLUMN sj_retry_task.client_info IS '客户端地址 clientId#ip:port'; +COMMENT ON COLUMN sj_retry_task.create_dt IS '创建时间'; +COMMENT ON COLUMN sj_retry_task.update_dt IS '修改时间'; +COMMENT ON TABLE sj_retry_task IS '重试任务表'; -- sj_retry_task_log_message CREATE TABLE sj_retry_task_log_message ( - id bigserial PRIMARY KEY, - namespace_id varchar(64) NOT NULL DEFAULT '764d604ec6fc45f68cd92514c40e9e1a', - group_name varchar(64) NOT NULL, - unique_id varchar(64) NOT NULL, - message text NOT NULL, - log_num int NOT NULL DEFAULT 1, - real_time bigint NOT NULL DEFAULT 0, - create_dt timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP + id bigserial PRIMARY KEY, + namespace_id varchar(64) NOT NULL DEFAULT '764d604ec6fc45f68cd92514c40e9e1a', + group_name varchar(64) NOT NULL, + retry_id bigint NOT NULL, + retry_task_id bigint NOT NULL, + message text NOT NULL, + log_num int NOT NULL DEFAULT 1, + real_time bigint NOT NULL DEFAULT 0, + create_dt timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ); -CREATE INDEX idx_sj_retry_task_log_message_01 ON sj_retry_task_log_message (namespace_id, group_name, unique_id); +CREATE INDEX idx_sj_retry_task_log_message_01 ON sj_retry_task_log_message (namespace_id, group_name, retry_task_id); CREATE INDEX idx_sj_retry_task_log_message_02 ON sj_retry_task_log_message (create_dt); COMMENT ON COLUMN sj_retry_task_log_message.id IS '主键'; COMMENT ON COLUMN sj_retry_task_log_message.namespace_id IS '命名空间id'; COMMENT ON COLUMN sj_retry_task_log_message.group_name IS '组名称'; -COMMENT ON COLUMN sj_retry_task_log_message.unique_id IS '同组下id唯一'; +COMMENT ON COLUMN sj_retry_task_log_message.retry_id IS '重试信息Id'; +COMMENT ON COLUMN sj_retry_task_log_message.retry_task_id IS '重试任务Id'; COMMENT ON COLUMN sj_retry_task_log_message.message IS '异常信息'; COMMENT ON COLUMN sj_retry_task_log_message.log_num IS '日志数量'; COMMENT ON COLUMN sj_retry_task_log_message.real_time IS '上报时间'; @@ -286,21 +278,26 @@ COMMENT ON TABLE sj_retry_task_log_message IS '任务调度日志信息记录表 -- sj_retry_scene_config CREATE TABLE sj_retry_scene_config ( - id bigserial PRIMARY KEY, - namespace_id varchar(64) NOT NULL DEFAULT '764d604ec6fc45f68cd92514c40e9e1a', - scene_name varchar(64) NOT NULL, - group_name varchar(64) NOT NULL, - scene_status smallint NOT NULL DEFAULT 0, - max_retry_count int NOT NULL DEFAULT 5, - back_off smallint NOT NULL DEFAULT 1, - trigger_interval varchar(16) NOT NULL DEFAULT '', - notify_ids varchar(128) NOT NULL DEFAULT '', - deadline_request bigint NOT NULL DEFAULT 60000, - executor_timeout int NOT NULL DEFAULT 5, - route_key smallint NOT NULL DEFAULT 4, - description varchar(256) NOT NULL DEFAULT '', - create_dt timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, - update_dt timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP + id bigserial PRIMARY KEY, + namespace_id varchar(64) NOT NULL DEFAULT '764d604ec6fc45f68cd92514c40e9e1a', + scene_name varchar(64) NOT NULL, + group_name varchar(64) NOT NULL, + scene_status smallint NOT NULL DEFAULT 0, + max_retry_count int NOT NULL DEFAULT 5, + back_off smallint NOT NULL DEFAULT 1, + trigger_interval varchar(16) NOT NULL DEFAULT '', + notify_ids varchar(128) NOT NULL DEFAULT '', + deadline_request bigint NOT NULL DEFAULT 60000, + executor_timeout int NOT NULL DEFAULT 5, + route_key smallint NOT NULL DEFAULT 4, + block_strategy smallint NOT NULL DEFAULT 1, + cb_status smallint NOT NULL DEFAULT 0, + cb_trigger_type smallint NOT NULL DEFAULT 1, + cb_max_count int NOT NULL DEFAULT 16, + cb_trigger_interval varchar(16) NOT NULL DEFAULT '', + description varchar(256) NOT NULL DEFAULT '', + create_dt timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, + update_dt timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ); CREATE UNIQUE INDEX uk_sj_retry_scene_config_01 ON sj_retry_scene_config (namespace_id, group_name, scene_name); @@ -317,6 +314,11 @@ COMMENT ON COLUMN sj_retry_scene_config.notify_ids IS '通知告警场景配置i COMMENT ON COLUMN sj_retry_scene_config.deadline_request IS 'Deadline Request 调用链超时 单位毫秒'; COMMENT ON COLUMN sj_retry_scene_config.executor_timeout IS '任务执行超时时间，单位秒'; COMMENT ON COLUMN sj_retry_scene_config.route_key IS '路由策略'; +COMMENT ON COLUMN sj_retry_scene_config.block_strategy IS '阻塞策略 1、丢弃 2、覆盖 3、并行'; +COMMENT ON COLUMN sj_retry_scene_config.cb_status IS '回调状态 0、不开启 1、开启'; +COMMENT ON COLUMN sj_retry_scene_config.cb_trigger_type IS '1、默认等级 2、固定间隔时间 3、CRON 表达式'; +COMMENT ON COLUMN sj_retry_scene_config.cb_max_count IS '回调的最大执行次数'; +COMMENT ON COLUMN sj_retry_scene_config.cb_trigger_interval IS '回调的最大执行次数'; COMMENT ON COLUMN sj_retry_scene_config.description IS '描述'; COMMENT ON COLUMN sj_retry_scene_config.create_dt IS '创建时间'; COMMENT ON COLUMN sj_retry_scene_config.update_dt IS '修改时间'; @@ -359,7 +361,7 @@ COMMENT ON TABLE sj_server_node IS '服务器节点'; -- sj_distributed_lock CREATE TABLE sj_distributed_lock ( - name varchar(64) PRIMARY KEY, + name varchar(64) NOT NULL, lock_until timestamp(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3), locked_at timestamp(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3), locked_by varchar(255) NOT NULL, @@ -490,11 +492,11 @@ COMMENT ON COLUMN sj_job.executor_type IS '执行器类型'; COMMENT ON COLUMN sj_job.executor_info IS '执行器名称'; COMMENT ON COLUMN sj_job.trigger_type IS '触发类型 1.CRON 表达式 2. 固定时间'; COMMENT ON COLUMN sj_job.trigger_interval IS '间隔时长'; -COMMENT ON COLUMN sj_job.block_strategy IS '阻塞策略 1、丢弃 2、覆盖 3、并行'; +COMMENT ON COLUMN sj_job.block_strategy IS '阻塞策略 1、丢弃 2、覆盖 3、并行 4、恢复'; COMMENT ON COLUMN sj_job.executor_timeout IS '任务执行超时时间，单位秒'; COMMENT ON COLUMN sj_job.max_retry_times IS '最大重试次数'; COMMENT ON COLUMN sj_job.parallel_num IS '并行数'; -COMMENT ON COLUMN sj_job.retry_interval IS '重试间隔 ( s ) '; +COMMENT ON COLUMN sj_job.retry_interval IS '重试间隔 ( s)'; COMMENT ON COLUMN sj_job.bucket_index IS 'bucket'; COMMENT ON COLUMN sj_job.resident IS '是否是常驻任务'; COMMENT ON COLUMN sj_job.notify_ids IS '通知告警场景配置id列表'; @@ -659,7 +661,7 @@ CREATE INDEX idx_sj_job_summary_01 ON sj_job_summary (namespace_id, group_name, COMMENT ON COLUMN sj_job_summary.id IS '主键'; COMMENT ON COLUMN sj_job_summary.namespace_id IS '命名空间id'; COMMENT ON COLUMN sj_job_summary.group_name IS '组名称'; -COMMENT ON COLUMN sj_job_summary.business_id IS '业务id ( job_id或workflow_id ) '; +COMMENT ON COLUMN sj_job_summary.business_id IS '业务id ( job_id或workflow_id)'; COMMENT ON COLUMN sj_job_summary.system_task_type IS '任务类型 3、JOB任务 4、WORKFLOW任务'; COMMENT ON COLUMN sj_job_summary.trigger_at IS '统计时间'; COMMENT ON COLUMN sj_job_summary.success_num IS '执行成功-日志数量'; diff --git a/doc/sql/snail_job_sqlserver.sql b/doc/sql/snail_job_sqlserver.sql index 1fe851790..a3176f95c 100644 --- a/doc/sql/snail_job_sqlserver.sql +++ b/doc/sql/snail_job_sqlserver.sql @@ -2,7 +2,7 @@ SnailJob Database Transfer Tool Source Server Type : MySQL Target Server Type : Microsoft SQL Server - Date: 2024-12-27 22:24:37 + Date: 2025-02-25 22:16:48 */ @@ -94,7 +94,6 @@ CREATE TABLE sj_group_config group_partition int NOT NULL, id_generator_mode tinyint NOT NULL DEFAULT 1, init_scene tinyint NOT NULL DEFAULT 0, - bucket_index int NOT NULL DEFAULT 0, create_dt datetime2 NOT NULL DEFAULT CURRENT_TIMESTAMP, update_dt datetime2 NOT NULL DEFAULT CURRENT_TIMESTAMP ) @@ -173,13 +172,6 @@ EXEC sp_addextendedproperty 'COLUMN', N'init_scene' GO -EXEC sp_addextendedproperty - 'MS_Description', N'bucket', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_group_config', - 'COLUMN', N'bucket_index' -GO - EXEC sp_addextendedproperty 'MS_Description', N'创建时间', 'SCHEMA', N'dbo', @@ -406,12 +398,11 @@ EXEC sp_addextendedproperty 'TABLE', N'sj_notify_recipient' GO --- sj_retry_dead_letter_0 -CREATE TABLE sj_retry_dead_letter_0 +-- sj_retry_dead_letter +CREATE TABLE sj_retry_dead_letter ( id bigint NOT NULL PRIMARY KEY IDENTITY, namespace_id nvarchar(64) NOT NULL DEFAULT '764d604ec6fc45f68cd92514c40e9e1a', - unique_id nvarchar(64) NOT NULL, group_name nvarchar(64) NOT NULL, scene_name nvarchar(64) NOT NULL, idempotent_id nvarchar(64) NOT NULL, @@ -419,119 +410,100 @@ CREATE TABLE sj_retry_dead_letter_0 executor_name nvarchar(512) NOT NULL DEFAULT '', args_str nvarchar(max) NOT NULL, ext_attrs nvarchar(max) NOT NULL, - task_type tinyint NOT NULL DEFAULT 1, create_dt datetime2 NOT NULL DEFAULT CURRENT_TIMESTAMP ) GO -CREATE UNIQUE INDEX uk_sj_retry_dead_letter_0_01 ON sj_retry_dead_letter_0 (namespace_id, group_name, unique_id) +CREATE INDEX idx_sj_retry_dead_letter_01 ON sj_retry_dead_letter (namespace_id, group_name, scene_name) GO - -CREATE INDEX idx_sj_retry_dead_letter_0_01 ON sj_retry_dead_letter_0 (namespace_id, group_name, scene_name) +CREATE INDEX idx_sj_retry_dead_letter_02 ON sj_retry_dead_letter (idempotent_id) GO -CREATE INDEX idx_sj_retry_dead_letter_0_02 ON sj_retry_dead_letter_0 (idempotent_id) +CREATE INDEX idx_sj_retry_dead_letter_03 ON sj_retry_dead_letter (biz_no) GO -CREATE INDEX idx_sj_retry_dead_letter_0_03 ON sj_retry_dead_letter_0 (biz_no) -GO -CREATE INDEX idx_sj_retry_dead_letter_0_04 ON sj_retry_dead_letter_0 (create_dt) +CREATE INDEX idx_sj_retry_dead_letter_04 ON sj_retry_dead_letter (create_dt) GO EXEC sp_addextendedproperty 'MS_Description', N'主键', 'SCHEMA', N'dbo', - 'TABLE', N'sj_retry_dead_letter_0', + 'TABLE', N'sj_retry_dead_letter', 'COLUMN', N'id' GO EXEC sp_addextendedproperty 'MS_Description', N'命名空间id', 'SCHEMA', N'dbo', - 'TABLE', N'sj_retry_dead_letter_0', + 'TABLE', N'sj_retry_dead_letter', 'COLUMN', N'namespace_id' GO -EXEC sp_addextendedproperty - 'MS_Description', N'同组下id唯一', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_retry_dead_letter_0', - 'COLUMN', N'unique_id' -GO - EXEC sp_addextendedproperty 'MS_Description', N'组名称', 'SCHEMA', N'dbo', - 'TABLE', N'sj_retry_dead_letter_0', + 'TABLE', N'sj_retry_dead_letter', 'COLUMN', N'group_name' GO EXEC sp_addextendedproperty 'MS_Description', N'场景名称', 'SCHEMA', N'dbo', - 'TABLE', N'sj_retry_dead_letter_0', + 'TABLE', N'sj_retry_dead_letter', 'COLUMN', N'scene_name' GO EXEC sp_addextendedproperty 'MS_Description', N'幂等id', 'SCHEMA', N'dbo', - 'TABLE', N'sj_retry_dead_letter_0', + 'TABLE', N'sj_retry_dead_letter', 'COLUMN', N'idempotent_id' GO EXEC sp_addextendedproperty 'MS_Description', N'业务编号', 'SCHEMA', N'dbo', - 'TABLE', N'sj_retry_dead_letter_0', + 'TABLE', N'sj_retry_dead_letter', 'COLUMN', N'biz_no' GO EXEC sp_addextendedproperty 'MS_Description', N'执行器名称', 'SCHEMA', N'dbo', - 'TABLE', N'sj_retry_dead_letter_0', + 'TABLE', N'sj_retry_dead_letter', 'COLUMN', N'executor_name' GO EXEC sp_addextendedproperty 'MS_Description', N'执行方法参数', 'SCHEMA', N'dbo', - 'TABLE', N'sj_retry_dead_letter_0', + 'TABLE', N'sj_retry_dead_letter', 'COLUMN', N'args_str' GO EXEC sp_addextendedproperty 'MS_Description', N'扩展字段', 'SCHEMA', N'dbo', - 'TABLE', N'sj_retry_dead_letter_0', + 'TABLE', N'sj_retry_dead_letter', 'COLUMN', N'ext_attrs' GO -EXEC sp_addextendedproperty - 'MS_Description', N'任务类型 1、重试数据 2、回调数据', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_retry_dead_letter_0', - 'COLUMN', N'task_type' -GO - EXEC sp_addextendedproperty 'MS_Description', N'创建时间', 'SCHEMA', N'dbo', - 'TABLE', N'sj_retry_dead_letter_0', + 'TABLE', N'sj_retry_dead_letter', 'COLUMN', N'create_dt' GO EXEC sp_addextendedproperty 'MS_Description', N'死信队列表', 'SCHEMA', N'dbo', - 'TABLE', N'sj_retry_dead_letter_0' + 'TABLE', N'sj_retry_dead_letter' GO --- sj_retry_task_0 -CREATE TABLE sj_retry_task_0 +-- sj_retry +CREATE TABLE sj_retry ( id bigint NOT NULL PRIMARY KEY IDENTITY, namespace_id nvarchar(64) NOT NULL DEFAULT '764d604ec6fc45f68cd92514c40e9e1a', - unique_id nvarchar(64) NOT NULL, group_name nvarchar(64) NOT NULL, scene_name nvarchar(64) NOT NULL, idempotent_id nvarchar(64) NOT NULL, @@ -539,301 +511,299 @@ CREATE TABLE sj_retry_task_0 executor_name nvarchar(512) NOT NULL DEFAULT '', args_str nvarchar(max) NOT NULL, ext_attrs nvarchar(max) NOT NULL, - next_trigger_at datetime2 NOT NULL, + next_trigger_at bigint NOT NULL, retry_count int NOT NULL DEFAULT 0, retry_status tinyint NOT NULL DEFAULT 0, task_type tinyint NOT NULL DEFAULT 1, + bucket_index int NOT NULL DEFAULT 0, + parent_id bigint NOT NULL DEFAULT 0, + deleted bigint NOT NULL DEFAULT 0, create_dt datetime2 NOT NULL DEFAULT CURRENT_TIMESTAMP, update_dt datetime2 NOT NULL DEFAULT CURRENT_TIMESTAMP ) GO -CREATE UNIQUE INDEX uk_sj_retry_task_0_01 ON sj_retry_task_0 (namespace_id, group_name, unique_id) +CREATE UNIQUE INDEX uk_sj_retry_01 ON sj_retry (namespace_id, group_name, task_type, idempotent_id, deleted) GO -CREATE INDEX idx_sj_retry_task_0_01 ON sj_retry_task_0 (namespace_id, group_name, scene_name) +CREATE INDEX idx_sj_retry_01 ON sj_retry (namespace_id, group_name, scene_name) GO -CREATE INDEX idx_sj_retry_task_0_02 ON sj_retry_task_0 (namespace_id, group_name, task_type) +CREATE INDEX idx_sj_retry_02 ON sj_retry (namespace_id, group_name, retry_status) GO -CREATE INDEX idx_sj_retry_task_0_03 ON sj_retry_task_0 (namespace_id, group_name, retry_status) +CREATE INDEX idx_sj_retry_03 ON sj_retry (idempotent_id) GO -CREATE INDEX idx_sj_retry_task_0_04 ON sj_retry_task_0 (idempotent_id) +CREATE INDEX idx_sj_retry_04 ON sj_retry (biz_no) GO -CREATE INDEX idx_sj_retry_task_0_05 ON sj_retry_task_0 (biz_no) +CREATE INDEX idx_sj_retry_05 ON sj_retry (parent_id) GO -CREATE INDEX idx_sj_retry_task_0_06 ON sj_retry_task_0 (create_dt) +CREATE INDEX idx_sj_retry_06 ON sj_retry (create_dt) GO EXEC sp_addextendedproperty 'MS_Description', N'主键', 'SCHEMA', N'dbo', - 'TABLE', N'sj_retry_task_0', + 'TABLE', N'sj_retry', 'COLUMN', N'id' GO EXEC sp_addextendedproperty 'MS_Description', N'命名空间id', 'SCHEMA', N'dbo', - 'TABLE', N'sj_retry_task_0', + 'TABLE', N'sj_retry', 'COLUMN', N'namespace_id' GO -EXEC sp_addextendedproperty - 'MS_Description', N'同组下id唯一', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_retry_task_0', - 'COLUMN', N'unique_id' -GO - EXEC sp_addextendedproperty 'MS_Description', N'组名称', 'SCHEMA', N'dbo', - 'TABLE', N'sj_retry_task_0', + 'TABLE', N'sj_retry', 'COLUMN', N'group_name' GO EXEC sp_addextendedproperty 'MS_Description', N'场景名称', 'SCHEMA', N'dbo', - 'TABLE', N'sj_retry_task_0', + 'TABLE', N'sj_retry', 'COLUMN', N'scene_name' GO EXEC sp_addextendedproperty 'MS_Description', N'幂等id', 'SCHEMA', N'dbo', - 'TABLE', N'sj_retry_task_0', + 'TABLE', N'sj_retry', 'COLUMN', N'idempotent_id' GO EXEC sp_addextendedproperty 'MS_Description', N'业务编号', 'SCHEMA', N'dbo', - 'TABLE', N'sj_retry_task_0', + 'TABLE', N'sj_retry', 'COLUMN', N'biz_no' GO EXEC sp_addextendedproperty 'MS_Description', N'执行器名称', 'SCHEMA', N'dbo', - 'TABLE', N'sj_retry_task_0', + 'TABLE', N'sj_retry', 'COLUMN', N'executor_name' GO EXEC sp_addextendedproperty 'MS_Description', N'执行方法参数', 'SCHEMA', N'dbo', - 'TABLE', N'sj_retry_task_0', + 'TABLE', N'sj_retry', 'COLUMN', N'args_str' GO EXEC sp_addextendedproperty 'MS_Description', N'扩展字段', 'SCHEMA', N'dbo', - 'TABLE', N'sj_retry_task_0', + 'TABLE', N'sj_retry', 'COLUMN', N'ext_attrs' GO EXEC sp_addextendedproperty 'MS_Description', N'下次触发时间', 'SCHEMA', N'dbo', - 'TABLE', N'sj_retry_task_0', + 'TABLE', N'sj_retry', 'COLUMN', N'next_trigger_at' GO EXEC sp_addextendedproperty 'MS_Description', N'重试次数', 'SCHEMA', N'dbo', - 'TABLE', N'sj_retry_task_0', + 'TABLE', N'sj_retry', 'COLUMN', N'retry_count' GO EXEC sp_addextendedproperty 'MS_Description', N'重试状态 0、重试中 1、成功 2、最大重试次数', 'SCHEMA', N'dbo', - 'TABLE', N'sj_retry_task_0', + 'TABLE', N'sj_retry', 'COLUMN', N'retry_status' GO EXEC sp_addextendedproperty 'MS_Description', N'任务类型 1、重试数据 2、回调数据', 'SCHEMA', N'dbo', - 'TABLE', N'sj_retry_task_0', + 'TABLE', N'sj_retry', 'COLUMN', N'task_type' GO +EXEC sp_addextendedproperty + 'MS_Description', N'bucket', + 'SCHEMA', N'dbo', + 'TABLE', N'sj_retry', + 'COLUMN', N'bucket_index' +GO + +EXEC sp_addextendedproperty + 'MS_Description', N'父节点id', + 'SCHEMA', N'dbo', + 'TABLE', N'sj_retry', + 'COLUMN', N'parent_id' +GO + +EXEC sp_addextendedproperty + 'MS_Description', N'逻辑删除', + 'SCHEMA', N'dbo', + 'TABLE', N'sj_retry', + 'COLUMN', N'deleted' +GO + EXEC sp_addextendedproperty 'MS_Description', N'创建时间', 'SCHEMA', N'dbo', - 'TABLE', N'sj_retry_task_0', + 'TABLE', N'sj_retry', 'COLUMN', N'create_dt' GO EXEC sp_addextendedproperty 'MS_Description', N'修改时间', 'SCHEMA', N'dbo', - 'TABLE', N'sj_retry_task_0', + 'TABLE', N'sj_retry', 'COLUMN', N'update_dt' GO EXEC sp_addextendedproperty - 'MS_Description', N'任务表', + 'MS_Description', N'重试信息表', 'SCHEMA', N'dbo', - 'TABLE', N'sj_retry_task_0' + 'TABLE', N'sj_retry' GO --- sj_retry_task_log -CREATE TABLE sj_retry_task_log +-- sj_retry_task +CREATE TABLE sj_retry_task ( - id bigint NOT NULL PRIMARY KEY IDENTITY, - namespace_id nvarchar(64) NOT NULL DEFAULT '764d604ec6fc45f68cd92514c40e9e1a', - unique_id nvarchar(64) NOT NULL, - group_name nvarchar(64) NOT NULL, - scene_name nvarchar(64) NOT NULL, - idempotent_id nvarchar(64) NOT NULL, - biz_no nvarchar(64) NOT NULL DEFAULT '', - executor_name nvarchar(512) NOT NULL DEFAULT '', - args_str nvarchar(max) NOT NULL, - ext_attrs nvarchar(max) NOT NULL, - retry_status tinyint NOT NULL DEFAULT 0, - task_type tinyint NOT NULL DEFAULT 1, - create_dt datetime2 NOT NULL DEFAULT CURRENT_TIMESTAMP, - update_dt datetime2 NOT NULL DEFAULT CURRENT_TIMESTAMP + id bigint NOT NULL PRIMARY KEY IDENTITY, + namespace_id nvarchar(64) NOT NULL DEFAULT '764d604ec6fc45f68cd92514c40e9e1a', + group_name nvarchar(64) NOT NULL, + scene_name nvarchar(64) NOT NULL, + retry_id bigint NOT NULL, + ext_attrs nvarchar(max) NOT NULL, + task_status tinyint NOT NULL DEFAULT 1, + task_type tinyint NOT NULL DEFAULT 1, + operation_reason tinyint NOT NULL DEFAULT 0, + client_info nvarchar(128) NULL DEFAULT NULL, + create_dt datetime2 NOT NULL DEFAULT CURRENT_TIMESTAMP, + update_dt datetime2 NOT NULL DEFAULT CURRENT_TIMESTAMP ) GO -CREATE INDEX idx_sj_retry_task_log_01 ON sj_retry_task_log (namespace_id, group_name, scene_name) +CREATE INDEX idx_sj_retry_task_01 ON sj_retry_task (namespace_id, group_name, scene_name) GO -CREATE INDEX idx_sj_retry_task_log_02 ON sj_retry_task_log (retry_status) +CREATE INDEX idx_sj_retry_task_02 ON sj_retry_task (task_status) GO -CREATE INDEX idx_sj_retry_task_log_03 ON sj_retry_task_log (idempotent_id) +CREATE INDEX idx_sj_retry_task_03 ON sj_retry_task (create_dt) GO -CREATE INDEX idx_sj_retry_task_log_04 ON sj_retry_task_log (unique_id) -GO -CREATE INDEX idx_sj_retry_task_log_05 ON sj_retry_task_log (biz_no) -GO -CREATE INDEX idx_sj_retry_task_log_06 ON sj_retry_task_log (create_dt) +CREATE INDEX idx_sj_retry_task_04 ON sj_retry_task (retry_id) GO EXEC sp_addextendedproperty 'MS_Description', N'主键', 'SCHEMA', N'dbo', - 'TABLE', N'sj_retry_task_log', + 'TABLE', N'sj_retry_task', 'COLUMN', N'id' GO EXEC sp_addextendedproperty 'MS_Description', N'命名空间id', 'SCHEMA', N'dbo', - 'TABLE', N'sj_retry_task_log', + 'TABLE', N'sj_retry_task', 'COLUMN', N'namespace_id' GO -EXEC sp_addextendedproperty - 'MS_Description', N'同组下id唯一', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_retry_task_log', - 'COLUMN', N'unique_id' -GO - EXEC sp_addextendedproperty 'MS_Description', N'组名称', 'SCHEMA', N'dbo', - 'TABLE', N'sj_retry_task_log', + 'TABLE', N'sj_retry_task', 'COLUMN', N'group_name' GO EXEC sp_addextendedproperty 'MS_Description', N'场景名称', 'SCHEMA', N'dbo', - 'TABLE', N'sj_retry_task_log', + 'TABLE', N'sj_retry_task', 'COLUMN', N'scene_name' GO EXEC sp_addextendedproperty - 'MS_Description', N'幂等id', + 'MS_Description', N'重试信息Id', 'SCHEMA', N'dbo', - 'TABLE', N'sj_retry_task_log', - 'COLUMN', N'idempotent_id' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'业务编号', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_retry_task_log', - 'COLUMN', N'biz_no' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'执行器名称', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_retry_task_log', - 'COLUMN', N'executor_name' -GO - -EXEC sp_addextendedproperty - 'MS_Description', N'执行方法参数', - 'SCHEMA', N'dbo', - 'TABLE', N'sj_retry_task_log', - 'COLUMN', N'args_str' + 'TABLE', N'sj_retry_task', + 'COLUMN', N'retry_id' GO EXEC sp_addextendedproperty 'MS_Description', N'扩展字段', 'SCHEMA', N'dbo', - 'TABLE', N'sj_retry_task_log', + 'TABLE', N'sj_retry_task', 'COLUMN', N'ext_attrs' GO EXEC sp_addextendedproperty - 'MS_Description', N'重试状态 0、重试中 1、成功 2、最大次数', + 'MS_Description', N'重试状态', 'SCHEMA', N'dbo', - 'TABLE', N'sj_retry_task_log', - 'COLUMN', N'retry_status' + 'TABLE', N'sj_retry_task', + 'COLUMN', N'task_status' GO EXEC sp_addextendedproperty 'MS_Description', N'任务类型 1、重试数据 2、回调数据', 'SCHEMA', N'dbo', - 'TABLE', N'sj_retry_task_log', + 'TABLE', N'sj_retry_task', 'COLUMN', N'task_type' GO +EXEC sp_addextendedproperty + 'MS_Description', N'操作原因', + 'SCHEMA', N'dbo', + 'TABLE', N'sj_retry_task', + 'COLUMN', N'operation_reason' +GO + +EXEC sp_addextendedproperty + 'MS_Description', N'客户端地址 clientId#ip:port', + 'SCHEMA', N'dbo', + 'TABLE', N'sj_retry_task', + 'COLUMN', N'client_info' +GO + EXEC sp_addextendedproperty 'MS_Description', N'创建时间', 'SCHEMA', N'dbo', - 'TABLE', N'sj_retry_task_log', + 'TABLE', N'sj_retry_task', 'COLUMN', N'create_dt' GO EXEC sp_addextendedproperty 'MS_Description', N'修改时间', 'SCHEMA', N'dbo', - 'TABLE', N'sj_retry_task_log', + 'TABLE', N'sj_retry_task', 'COLUMN', N'update_dt' GO EXEC sp_addextendedproperty - 'MS_Description', N'任务日志基础信息表', + 'MS_Description', N'重试任务表', 'SCHEMA', N'dbo', - 'TABLE', N'sj_retry_task_log' + 'TABLE', N'sj_retry_task' GO -- sj_retry_task_log_message CREATE TABLE sj_retry_task_log_message ( - id bigint NOT NULL PRIMARY KEY IDENTITY, - namespace_id nvarchar(64) NOT NULL DEFAULT '764d604ec6fc45f68cd92514c40e9e1a', - group_name nvarchar(64) NOT NULL, - unique_id nvarchar(64) NOT NULL, - message nvarchar(max) NOT NULL, - log_num int NOT NULL DEFAULT 1, - real_time bigint NOT NULL DEFAULT 0, - create_dt datetime2 NOT NULL DEFAULT CURRENT_TIMESTAMP + id bigint NOT NULL PRIMARY KEY IDENTITY, + namespace_id nvarchar(64) NOT NULL DEFAULT '764d604ec6fc45f68cd92514c40e9e1a', + group_name nvarchar(64) NOT NULL, + retry_id bigint NOT NULL, + retry_task_id bigint NOT NULL, + message nvarchar(max) NOT NULL, + log_num int NOT NULL DEFAULT 1, + real_time bigint NOT NULL DEFAULT 0, + create_dt datetime2 NOT NULL DEFAULT CURRENT_TIMESTAMP ) GO -CREATE INDEX idx_sj_retry_task_log_message_01 ON sj_retry_task_log_message (namespace_id, group_name, unique_id) +CREATE INDEX idx_sj_retry_task_log_message_01 ON sj_retry_task_log_message (namespace_id, group_name, retry_task_id) GO CREATE INDEX idx_sj_retry_task_log_message_02 ON sj_retry_task_log_message (create_dt) GO @@ -860,10 +830,17 @@ EXEC sp_addextendedproperty GO EXEC sp_addextendedproperty - 'MS_Description', N'同组下id唯一', + 'MS_Description', N'重试信息Id', 'SCHEMA', N'dbo', 'TABLE', N'sj_retry_task_log_message', - 'COLUMN', N'unique_id' + 'COLUMN', N'retry_id' +GO + +EXEC sp_addextendedproperty + 'MS_Description', N'重试任务Id', + 'SCHEMA', N'dbo', + 'TABLE', N'sj_retry_task_log_message', + 'COLUMN', N'retry_task_id' GO EXEC sp_addextendedproperty @@ -903,21 +880,26 @@ GO -- sj_retry_scene_config CREATE TABLE sj_retry_scene_config ( - id bigint NOT NULL PRIMARY KEY IDENTITY, - namespace_id nvarchar(64) NOT NULL DEFAULT '764d604ec6fc45f68cd92514c40e9e1a', - scene_name nvarchar(64) NOT NULL, - group_name nvarchar(64) NOT NULL, - scene_status tinyint NOT NULL DEFAULT 0, - max_retry_count int NOT NULL DEFAULT 5, - back_off tinyint NOT NULL DEFAULT 1, - trigger_interval nvarchar(16) NOT NULL DEFAULT '', - notify_ids nvarchar(128) NOT NULL DEFAULT '', - deadline_request bigint NOT NULL DEFAULT 60000, - executor_timeout int NOT NULL DEFAULT 5, - route_key tinyint NOT NULL DEFAULT 4, - description nvarchar(256) NOT NULL DEFAULT '', - create_dt datetime2 NOT NULL DEFAULT CURRENT_TIMESTAMP, - update_dt datetime2 NOT NULL DEFAULT CURRENT_TIMESTAMP + id bigint NOT NULL PRIMARY KEY IDENTITY, + namespace_id nvarchar(64) NOT NULL DEFAULT '764d604ec6fc45f68cd92514c40e9e1a', + scene_name nvarchar(64) NOT NULL, + group_name nvarchar(64) NOT NULL, + scene_status tinyint NOT NULL DEFAULT 0, + max_retry_count int NOT NULL DEFAULT 5, + back_off tinyint NOT NULL DEFAULT 1, + trigger_interval nvarchar(16) NOT NULL DEFAULT '', + notify_ids nvarchar(128) NOT NULL DEFAULT '', + deadline_request bigint NOT NULL DEFAULT 60000, + executor_timeout int NOT NULL DEFAULT 5, + route_key tinyint NOT NULL DEFAULT 4, + block_strategy tinyint NOT NULL DEFAULT 1, + cb_status tinyint NOT NULL DEFAULT 0, + cb_trigger_type tinyint NOT NULL DEFAULT 1, + cb_max_count int NOT NULL DEFAULT 16, + cb_trigger_interval nvarchar(16) NOT NULL DEFAULT '', + description nvarchar(256) NOT NULL DEFAULT '', + create_dt datetime2 NOT NULL DEFAULT CURRENT_TIMESTAMP, + update_dt datetime2 NOT NULL DEFAULT CURRENT_TIMESTAMP ) GO @@ -1008,6 +990,41 @@ EXEC sp_addextendedproperty 'COLUMN', N'route_key' GO +EXEC sp_addextendedproperty + 'MS_Description', N'阻塞策略 1、丢弃 2、覆盖 3、并行', + 'SCHEMA', N'dbo', + 'TABLE', N'sj_retry_scene_config', + 'COLUMN', N'block_strategy' +GO + +EXEC sp_addextendedproperty + 'MS_Description', N'回调状态 0、不开启 1、开启', + 'SCHEMA', N'dbo', + 'TABLE', N'sj_retry_scene_config', + 'COLUMN', N'cb_status' +GO + +EXEC sp_addextendedproperty + 'MS_Description', N'1、默认等级 2、固定间隔时间 3、CRON 表达式', + 'SCHEMA', N'dbo', + 'TABLE', N'sj_retry_scene_config', + 'COLUMN', N'cb_trigger_type' +GO + +EXEC sp_addextendedproperty + 'MS_Description', N'回调的最大执行次数', + 'SCHEMA', N'dbo', + 'TABLE', N'sj_retry_scene_config', + 'COLUMN', N'cb_max_count' +GO + +EXEC sp_addextendedproperty + 'MS_Description', N'回调的最大执行次数', + 'SCHEMA', N'dbo', + 'TABLE', N'sj_retry_scene_config', + 'COLUMN', N'cb_trigger_interval' +GO + EXEC sp_addextendedproperty 'MS_Description', N'描述', 'SCHEMA', N'dbo', @@ -1146,7 +1163,7 @@ GO -- sj_distributed_lock CREATE TABLE sj_distributed_lock ( - name nvarchar(64) NOT NULL PRIMARY KEY, + name nvarchar(64) NOT NULL, lock_until datetime2 NOT NULL DEFAULT CURRENT_TIMESTAMP, locked_at datetime2 NOT NULL DEFAULT CURRENT_TIMESTAMP, locked_by nvarchar(255) NOT NULL, @@ -1533,7 +1550,7 @@ EXEC sp_addextendedproperty GO EXEC sp_addextendedproperty - 'MS_Description', N'阻塞策略 1、丢弃 2、覆盖 3、并行', + 'MS_Description', N'阻塞策略 1、丢弃 2、覆盖 3、并行 4、恢复', 'SCHEMA', N'dbo', 'TABLE', N'sj_job', 'COLUMN', N'block_strategy' @@ -1561,7 +1578,7 @@ EXEC sp_addextendedproperty GO EXEC sp_addextendedproperty - 'MS_Description', N'重试间隔 ( s ) ', + 'MS_Description', N'重试间隔 ( s)', 'SCHEMA', N'dbo', 'TABLE', N'sj_job', 'COLUMN', N'retry_interval' @@ -2112,7 +2129,7 @@ EXEC sp_addextendedproperty GO EXEC sp_addextendedproperty - 'MS_Description', N'业务id ( job_id或workflow_id ) ', + 'MS_Description', N'业务id ( job_id或workflow_id)', 'SCHEMA', N'dbo', 'TABLE', N'sj_job_summary', 'COLUMN', N'business_id' @@ -2766,4 +2783,4 @@ EXEC sp_addextendedproperty 'MS_Description', N'工作流批次', 'SCHEMA', N'dbo', 'TABLE', N'sj_workflow_task_batch' -GO +GO \ No newline at end of file diff --git a/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/persistence/mapper/RetryTaskMapper.java b/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/persistence/mapper/RetryTaskMapper.java index 057cec348..ffa6a4228 100644 --- a/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/persistence/mapper/RetryTaskMapper.java +++ b/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/persistence/mapper/RetryTaskMapper.java @@ -1,17 +1,8 @@ package com.aizuda.snailjob.template.datasource.persistence.mapper; - -import com.aizuda.snailjob.template.datasource.persistence.dataobject.DashboardRetryResponseDO; import com.aizuda.snailjob.template.datasource.persistence.po.RetryTask; -import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.apache.ibatis.annotations.Param; - -import java.util.List; public interface RetryTaskMapper extends BaseMapper { - int insertBatch(@Param("list") List list); - - List selectRetryRetryTaskLogSummaryList(@Param("ew") Wrapper wrapper); } diff --git a/snail-job-datasource/snail-job-datasource-template/src/main/resources/template/mapper/RetryTaskService.xml b/snail-job-datasource/snail-job-datasource-template/src/main/resources/template/mapper/JobTaskBatchMapper.xml similarity index 100% rename from snail-job-datasource/snail-job-datasource-template/src/main/resources/template/mapper/RetryTaskService.xml rename to snail-job-datasource/snail-job-datasource-template/src/main/resources/template/mapper/JobTaskBatchMapper.xml diff --git a/snail-job-datasource/snail-job-dm8-datasource/src/main/resources/dm/mapper/RetryDeadLetterMapper.xml b/snail-job-datasource/snail-job-dm8-datasource/src/main/resources/dm/mapper/RetryDeadLetterMapper.xml index 0a1d1deca..e62db0f87 100644 --- a/snail-job-datasource/snail-job-dm8-datasource/src/main/resources/dm/mapper/RetryDeadLetterMapper.xml +++ b/snail-job-datasource/snail-job-dm8-datasource/src/main/resources/dm/mapper/RetryDeadLetterMapper.xml @@ -3,13 +3,12 @@ - INSERT INTO sj_retry_dead_letter (namespace_id, unique_id, group_name, scene_name, idempotent_id, biz_no, + INSERT INTO sj_retry_dead_letter (namespace_id, group_name, scene_name, idempotent_id, biz_no, executor_name, args_str, ext_attrs, create_dt) VALUES ( #{item.namespaceId,jdbcType=VARCHAR}, - #{item.uniqueId,jdbcType=VARCHAR}, #{item.groupName,jdbcType=VARCHAR}, #{item.sceneName,jdbcType=VARCHAR}, #{item.idempotentId,jdbcType=VARCHAR}, diff --git a/snail-job-datasource/snail-job-dm8-datasource/src/main/resources/dm/mapper/RetryTaskMapper.xml b/snail-job-datasource/snail-job-dm8-datasource/src/main/resources/dm/mapper/RetryMapper.xml similarity index 58% rename from snail-job-datasource/snail-job-dm8-datasource/src/main/resources/dm/mapper/RetryTaskMapper.xml rename to snail-job-datasource/snail-job-dm8-datasource/src/main/resources/dm/mapper/RetryMapper.xml index bc54244b8..67b73ca1c 100644 --- a/snail-job-datasource/snail-job-dm8-datasource/src/main/resources/dm/mapper/RetryTaskMapper.xml +++ b/snail-job-datasource/snail-job-dm8-datasource/src/main/resources/dm/mapper/RetryMapper.xml @@ -3,21 +3,23 @@ - INSERT INTO sj_retry_task (namespace_id, unique_id, group_name, scene_name, idempotent_id, biz_no, - executor_name, args_str, ext_attrs, next_trigger_at, task_type, retry_status, create_dt) + INSERT INTO sj_retry (namespace_id, group_name, scene_name, idempotent_id, biz_no, + executor_name, args_str, ext_attrs, next_trigger_at, task_type, retry_status, create_dt, + , bucket_index, parent_id, deleted) VALUES ( - #{item.namespaceId}, #{item.uniqueId}, #{item.groupName}, #{item.sceneName}, #{item.idempotentId}, - #{item.bizNo}, #{item.executorName}, #{item.argsStr}, #{item.extAttrs}, #{item.nextTriggerAt}, - #{item.taskType}, #{item.retryStatus}, #{item.createDt} + #{item.namespaceId}, #{item.groupName}, #{item.sceneName}, #{item.idempotentId}, + #{item.bizNo}, #{item.executorName}, #{item.argsStr}, #{item.extAttrs}, #{item.nextTriggerAt}, + #{item.taskType}, #{item.retryStatus}, #{item.createDt}, #{item.bucketIndex}, #{item.parentId}, + #{item.deleted} ) - UPDATE sj_retry_task_${partition} + UPDATE sj_retry SET next_trigger_at = #{item.nextTriggerAt}, update_dt = CURRENT_TIMESTAMP WHERE id = #{item.id} diff --git a/snail-job-datasource/snail-job-dm8-datasource/src/main/resources/dm/mapper/RetryTaskLogMapper.xml b/snail-job-datasource/snail-job-dm8-datasource/src/main/resources/dm/mapper/RetryTaskLogMapper.xml deleted file mode 100644 index 04d3f5b6c..000000000 --- a/snail-job-datasource/snail-job-dm8-datasource/src/main/resources/dm/mapper/RetryTaskLogMapper.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - INSERT INTO sj_retry_task_log (unique_id, group_name, scene_name, idempotent_id, biz_no, executor_name, - args_str, ext_attrs, task_type, create_dt, namespace_id) - VALUES - - ( - #{item.uniqueId}, - #{item.groupName}, - #{item.sceneName}, - #{item.idempotentId}, - #{item.bizNo}, - #{item.executorName}, - #{item.argsStr}, - #{item.extAttrs}, - #{item.taskType}, - #{item.createDt}, - #{item.namespaceId} - ) - - - - diff --git a/snail-job-datasource/snail-job-kingbase-datasource/src/main/resources/kingbase/mapper/RetryDeadLetterMapper.xml b/snail-job-datasource/snail-job-kingbase-datasource/src/main/resources/kingbase/mapper/RetryDeadLetterMapper.xml index 0a1d1deca..e62db0f87 100644 --- a/snail-job-datasource/snail-job-kingbase-datasource/src/main/resources/kingbase/mapper/RetryDeadLetterMapper.xml +++ b/snail-job-datasource/snail-job-kingbase-datasource/src/main/resources/kingbase/mapper/RetryDeadLetterMapper.xml @@ -3,13 +3,12 @@ - INSERT INTO sj_retry_dead_letter (namespace_id, unique_id, group_name, scene_name, idempotent_id, biz_no, + INSERT INTO sj_retry_dead_letter (namespace_id, group_name, scene_name, idempotent_id, biz_no, executor_name, args_str, ext_attrs, create_dt) VALUES ( #{item.namespaceId,jdbcType=VARCHAR}, - #{item.uniqueId,jdbcType=VARCHAR}, #{item.groupName,jdbcType=VARCHAR}, #{item.sceneName,jdbcType=VARCHAR}, #{item.idempotentId,jdbcType=VARCHAR}, diff --git a/snail-job-datasource/snail-job-kingbase-datasource/src/main/resources/kingbase/mapper/RetryTaskMapper.xml b/snail-job-datasource/snail-job-kingbase-datasource/src/main/resources/kingbase/mapper/RetryMapper.xml similarity index 61% rename from snail-job-datasource/snail-job-kingbase-datasource/src/main/resources/kingbase/mapper/RetryTaskMapper.xml rename to snail-job-datasource/snail-job-kingbase-datasource/src/main/resources/kingbase/mapper/RetryMapper.xml index adb01159b..0f3f059a5 100644 --- a/snail-job-datasource/snail-job-kingbase-datasource/src/main/resources/kingbase/mapper/RetryTaskMapper.xml +++ b/snail-job-datasource/snail-job-kingbase-datasource/src/main/resources/kingbase/mapper/RetryMapper.xml @@ -4,21 +4,23 @@ - INSERT INTO sj_retry_task (namespace_id, unique_id, group_name, scene_name, - idempotent_id, biz_no, executor_name, args_str, ext_attrs, - next_trigger_at, task_type, retry_status, create_dt) + INSERT INTO sj_retry (namespace_id, unique_id, group_name, scene_name, + idempotent_id, biz_no, executor_name, args_str, ext_attrs, + next_trigger_at, task_type, retry_status, create_dt, bucket_index, parent_id, deleted) VALUES ( - #{item.namespaceId}, #{item.uniqueId}, #{item.groupName}, - #{item.sceneName}, #{item.idempotentId}, #{item.bizNo}, #{item.executorName}, #{item.argsStr}, - #{item.extAttrs}, #{item.nextTriggerAt}, #{item.taskType}, #{item.retryStatus}, #{item.createDt} + #{item.namespaceId}, #{item.uniqueId}, #{item.groupName}, + #{item.sceneName}, #{item.idempotentId}, #{item.bizNo}, #{item.executorName}, #{item.argsStr}, + #{item.extAttrs}, #{item.nextTriggerAt}, #{item.taskType}, #{item.retryStatus}, #{item.createDt}, + #{item.bucketIndex}, #{item.parentId}, + #{item.deleted} ) - UPDATE sj_retry_task_${partition} AS rt + UPDATE sj_retry AS rt SET next_trigger_at = tt.next_trigger_at, update_dt = CURRENT_TIMESTAMP FROM ( diff --git a/snail-job-datasource/snail-job-kingbase-datasource/src/main/resources/kingbase/mapper/RetryTaskLogMapper.xml b/snail-job-datasource/snail-job-kingbase-datasource/src/main/resources/kingbase/mapper/RetryTaskLogMapper.xml deleted file mode 100644 index 04d3f5b6c..000000000 --- a/snail-job-datasource/snail-job-kingbase-datasource/src/main/resources/kingbase/mapper/RetryTaskLogMapper.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - INSERT INTO sj_retry_task_log (unique_id, group_name, scene_name, idempotent_id, biz_no, executor_name, - args_str, ext_attrs, task_type, create_dt, namespace_id) - VALUES - - ( - #{item.uniqueId}, - #{item.groupName}, - #{item.sceneName}, - #{item.idempotentId}, - #{item.bizNo}, - #{item.executorName}, - #{item.argsStr}, - #{item.extAttrs}, - #{item.taskType}, - #{item.createDt}, - #{item.namespaceId} - ) - - - - diff --git a/snail-job-datasource/snail-job-mariadb-datasource/src/main/resources/mariadb/mapper/RetryDeadLetterMapper.xml b/snail-job-datasource/snail-job-mariadb-datasource/src/main/resources/mariadb/mapper/RetryDeadLetterMapper.xml index a15916ef4..dadc23ddd 100644 --- a/snail-job-datasource/snail-job-mariadb-datasource/src/main/resources/mariadb/mapper/RetryDeadLetterMapper.xml +++ b/snail-job-datasource/snail-job-mariadb-datasource/src/main/resources/mariadb/mapper/RetryDeadLetterMapper.xml @@ -3,13 +3,12 @@ - INSERT INTO sj_retry_dead_letter (namespace_id, unique_id, group_name, scene_name, idempotent_id, biz_no, + INSERT INTO sj_retry_dead_letter (namespace_id, group_name, scene_name, idempotent_id, biz_no, executor_name, args_str, ext_attrs, create_dt) VALUES ( #{item.namespaceId,jdbcType=VARCHAR}, - #{item.uniqueId,jdbcType=VARCHAR}, #{item.groupName,jdbcType=VARCHAR}, #{item.sceneName,jdbcType=VARCHAR}, #{item.idempotentId,jdbcType=VARCHAR}, diff --git a/snail-job-datasource/snail-job-mariadb-datasource/src/main/resources/mariadb/mapper/RetryTaskMapper.xml b/snail-job-datasource/snail-job-mariadb-datasource/src/main/resources/mariadb/mapper/RetryMapper.xml similarity index 55% rename from snail-job-datasource/snail-job-mariadb-datasource/src/main/resources/mariadb/mapper/RetryTaskMapper.xml rename to snail-job-datasource/snail-job-mariadb-datasource/src/main/resources/mariadb/mapper/RetryMapper.xml index a3eaf5333..8cd3d9594 100644 --- a/snail-job-datasource/snail-job-mariadb-datasource/src/main/resources/mariadb/mapper/RetryTaskMapper.xml +++ b/snail-job-datasource/snail-job-mariadb-datasource/src/main/resources/mariadb/mapper/RetryMapper.xml @@ -3,31 +3,33 @@ - INSERT INTO sj_retry_task (namespace_id, unique_id, group_name, scene_name, idempotent_id, biz_no, - executor_name, args_str, ext_attrs, next_trigger_at, task_type, retry_status, - create_dt) + INSERT INTO sj_retry (namespace_id, group_name, scene_name, idempotent_id, biz_no, + executor_name, args_str, ext_attrs, next_trigger_at, task_type, retry_status, + create_dt, bucket_index, parent_id, deleted) VALUES ( - #{item.namespaceId}, - #{item.uniqueId}, - #{item.groupName}, - #{item.sceneName}, - #{item.idempotentId}, - #{item.bizNo}, - #{item.executorName}, - #{item.argsStr}, - #{item.extAttrs}, - #{item.nextTriggerAt}, - #{item.taskType}, - #{item.retryStatus}, - #{item.createDt} + #{item.namespaceId}, + #{item.groupName}, + #{item.sceneName}, + #{item.idempotentId}, + #{item.bizNo}, + #{item.executorName}, + #{item.argsStr}, + #{item.extAttrs}, + #{item.nextTriggerAt}, + #{item.taskType}, + #{item.retryStatus}, + #{item.createDt}, + #{item.bucketIndex}, + #{item.parentId}, + #{item.deleted} ) - UPDATE sj_retry_task_${partition} rt, + UPDATE sj_retry rt, ( SELECT diff --git a/snail-job-datasource/snail-job-mariadb-datasource/src/main/resources/mariadb/mapper/RetryTaskLogMapper.xml b/snail-job-datasource/snail-job-mariadb-datasource/src/main/resources/mariadb/mapper/RetryTaskLogMapper.xml deleted file mode 100644 index 04d3f5b6c..000000000 --- a/snail-job-datasource/snail-job-mariadb-datasource/src/main/resources/mariadb/mapper/RetryTaskLogMapper.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - INSERT INTO sj_retry_task_log (unique_id, group_name, scene_name, idempotent_id, biz_no, executor_name, - args_str, ext_attrs, task_type, create_dt, namespace_id) - VALUES - - ( - #{item.uniqueId}, - #{item.groupName}, - #{item.sceneName}, - #{item.idempotentId}, - #{item.bizNo}, - #{item.executorName}, - #{item.argsStr}, - #{item.extAttrs}, - #{item.taskType}, - #{item.createDt}, - #{item.namespaceId} - ) - - - - diff --git a/snail-job-datasource/snail-job-mysql-datasource/src/main/resources/mysql/mapper/RetryMapper.xml b/snail-job-datasource/snail-job-mysql-datasource/src/main/resources/mysql/mapper/RetryMapper.xml index 5d6e47237..037324015 100644 --- a/snail-job-datasource/snail-job-mysql-datasource/src/main/resources/mysql/mapper/RetryMapper.xml +++ b/snail-job-datasource/snail-job-mysql-datasource/src/main/resources/mysql/mapper/RetryMapper.xml @@ -5,7 +5,7 @@ INSERT INTO sj_retry (namespace_id, group_name, scene_name, idempotent_id, biz_no, executor_name, args_str, ext_attrs, next_trigger_at, task_type, retry_status, - create_dt) + create_dt, bucket_index, parent_id, deleted) VALUES ( @@ -20,7 +20,10 @@ #{item.nextTriggerAt}, #{item.taskType}, #{item.retryStatus}, - #{item.createDt} + #{item.createDt}, + #{item.bucketIndex}, + #{item.parentId}, + #{item.deleted} ) diff --git a/snail-job-datasource/snail-job-mysql-datasource/src/main/resources/mysql/mapper/RetryTaskLogMapper.xml b/snail-job-datasource/snail-job-mysql-datasource/src/main/resources/mysql/mapper/RetryTaskLogMapper.xml deleted file mode 100644 index 04d3f5b6c..000000000 --- a/snail-job-datasource/snail-job-mysql-datasource/src/main/resources/mysql/mapper/RetryTaskLogMapper.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - INSERT INTO sj_retry_task_log (unique_id, group_name, scene_name, idempotent_id, biz_no, executor_name, - args_str, ext_attrs, task_type, create_dt, namespace_id) - VALUES - - ( - #{item.uniqueId}, - #{item.groupName}, - #{item.sceneName}, - #{item.idempotentId}, - #{item.bizNo}, - #{item.executorName}, - #{item.argsStr}, - #{item.extAttrs}, - #{item.taskType}, - #{item.createDt}, - #{item.namespaceId} - ) - - - - diff --git a/snail-job-datasource/snail-job-mysql-datasource/src/main/resources/mysql/mapper/RetryTaskMapper.xml b/snail-job-datasource/snail-job-mysql-datasource/src/main/resources/mysql/mapper/RetryTaskMapper.xml deleted file mode 100644 index ff75795cd..000000000 --- a/snail-job-datasource/snail-job-mysql-datasource/src/main/resources/mysql/mapper/RetryTaskMapper.xml +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - INSERT INTO sj_retry (namespace_id, unique_id, group_name, scene_name, idempotent_id, biz_no, - executor_name, args_str, ext_attrs, next_trigger_at, task_type, retry_status, - create_dt) - VALUES - - ( - #{item.namespaceId}, - #{item.uniqueId}, - #{item.groupName}, - #{item.sceneName}, - #{item.idempotentId}, - #{item.bizNo}, - #{item.executorName}, - #{item.argsStr}, - #{item.extAttrs}, - #{item.nextTriggerAt}, - #{item.taskType}, - #{item.retryStatus}, - #{item.createDt} - ) - - - - - UPDATE sj_retry_task_${partition} rt, - ( - - SELECT - #{item.id} AS id, - #{item.nextTriggerAt} AS next_trigger_at - - ) tt - SET rt.next_trigger_at = tt.next_trigger_at - WHERE rt.id = tt.id - - - diff --git a/snail-job-datasource/snail-job-oracle-datasource/src/main/resources/oracle/mapper/RetryDeadLetterMapper.xml b/snail-job-datasource/snail-job-oracle-datasource/src/main/resources/oracle/mapper/RetryDeadLetterMapper.xml index 30f2a7a9e..ee7ca8d9c 100644 --- a/snail-job-datasource/snail-job-oracle-datasource/src/main/resources/oracle/mapper/RetryDeadLetterMapper.xml +++ b/snail-job-datasource/snail-job-oracle-datasource/src/main/resources/oracle/mapper/RetryDeadLetterMapper.xml @@ -3,12 +3,11 @@ - INSERT INTO sj_retry_dead_letter (namespace_id, unique_id, group_name, scene_name, idempotent_id, biz_no, + INSERT INTO sj_retry_dead_letter (namespace_id, group_name, scene_name, idempotent_id, biz_no, executor_name, args_str, ext_attrs, create_dt) SELECT #{item.namespaceId,jdbcType=VARCHAR}, - #{item.uniqueId,jdbcType=VARCHAR}, #{item.groupName,jdbcType=VARCHAR}, #{item.sceneName,jdbcType=VARCHAR}, #{item.idempotentId,jdbcType=VARCHAR}, diff --git a/snail-job-datasource/snail-job-oracle-datasource/src/main/resources/oracle/mapper/RetryTaskMapper.xml b/snail-job-datasource/snail-job-oracle-datasource/src/main/resources/oracle/mapper/RetryMapper.xml similarity index 57% rename from snail-job-datasource/snail-job-oracle-datasource/src/main/resources/oracle/mapper/RetryTaskMapper.xml rename to snail-job-datasource/snail-job-oracle-datasource/src/main/resources/oracle/mapper/RetryMapper.xml index 4bf302cab..f76a7d960 100644 --- a/snail-job-datasource/snail-job-oracle-datasource/src/main/resources/oracle/mapper/RetryTaskMapper.xml +++ b/snail-job-datasource/snail-job-oracle-datasource/src/main/resources/oracle/mapper/RetryMapper.xml @@ -3,20 +3,22 @@ - INSERT INTO sj_retry_task (namespace_id, unique_id, group_name, scene_name, idempotent_id, biz_no, - executor_name, args_str, ext_attrs, next_trigger_at, task_type, retry_status, create_dt) + INSERT INTO sj_retry (namespace_id, unique_id, group_name, scene_name, idempotent_id, biz_no, + executor_name, args_str, ext_attrs, next_trigger_at, task_type, retry_status, create_dt + , bucket_index, parent_id, deleted) SELECT - #{item.namespaceId}, #{item.uniqueId}, #{item.groupName}, #{item.sceneName}, #{item.idempotentId}, - #{item.bizNo}, #{item.executorName}, #{item.argsStr}, #{item.extAttrs}, #{item.nextTriggerAt}, - #{item.taskType}, #{item.retryStatus}, #{item.createDt} + #{item.namespaceId}, #{item.uniqueId}, #{item.groupName}, #{item.sceneName}, #{item.idempotentId}, + #{item.bizNo}, #{item.executorName}, #{item.argsStr}, #{item.extAttrs}, #{item.nextTriggerAt}, + #{item.taskType}, #{item.retryStatus}, #{item.createDt}, #{item.bucketIndex}, #{item.parentId}, + #{item.deleted} FROM DUAL - UPDATE sj_retry_task_${partition} + UPDATE sj_retry SET next_trigger_at = #{item.nextTriggerAt}, update_dt = CURRENT_TIMESTAMP WHERE id = #{item.id} diff --git a/snail-job-datasource/snail-job-oracle-datasource/src/main/resources/oracle/mapper/RetryTaskLogMapper.xml b/snail-job-datasource/snail-job-oracle-datasource/src/main/resources/oracle/mapper/RetryTaskLogMapper.xml deleted file mode 100644 index 44af35a9a..000000000 --- a/snail-job-datasource/snail-job-oracle-datasource/src/main/resources/oracle/mapper/RetryTaskLogMapper.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - INSERT INTO sj_retry_task_log (unique_id, group_name, scene_name, idempotent_id, biz_no, executor_name, - args_str, ext_attrs, task_type, create_dt, namespace_id) - - SELECT - #{item.uniqueId}, #{item.groupName}, #{item.sceneName}, #{item.idempotentId}, - #{item.bizNo}, #{item.executorName}, #{item.argsStr}, #{item.extAttrs}, - #{item.taskType}, #{item.createDt}, #{item.namespaceId} - FROM DUAL - - - - diff --git a/snail-job-datasource/snail-job-postgres-datasource/src/main/resources/postgresql/mapper/RetryDeadLetterMapper.xml b/snail-job-datasource/snail-job-postgres-datasource/src/main/resources/postgresql/mapper/RetryDeadLetterMapper.xml index 0a1d1deca..e62db0f87 100644 --- a/snail-job-datasource/snail-job-postgres-datasource/src/main/resources/postgresql/mapper/RetryDeadLetterMapper.xml +++ b/snail-job-datasource/snail-job-postgres-datasource/src/main/resources/postgresql/mapper/RetryDeadLetterMapper.xml @@ -3,13 +3,12 @@ - INSERT INTO sj_retry_dead_letter (namespace_id, unique_id, group_name, scene_name, idempotent_id, biz_no, + INSERT INTO sj_retry_dead_letter (namespace_id, group_name, scene_name, idempotent_id, biz_no, executor_name, args_str, ext_attrs, create_dt) VALUES ( #{item.namespaceId,jdbcType=VARCHAR}, - #{item.uniqueId,jdbcType=VARCHAR}, #{item.groupName,jdbcType=VARCHAR}, #{item.sceneName,jdbcType=VARCHAR}, #{item.idempotentId,jdbcType=VARCHAR}, diff --git a/snail-job-datasource/snail-job-postgres-datasource/src/main/resources/postgresql/mapper/RetryTaskMapper.xml b/snail-job-datasource/snail-job-postgres-datasource/src/main/resources/postgresql/mapper/RetryMapper.xml similarity index 62% rename from snail-job-datasource/snail-job-postgres-datasource/src/main/resources/postgresql/mapper/RetryTaskMapper.xml rename to snail-job-datasource/snail-job-postgres-datasource/src/main/resources/postgresql/mapper/RetryMapper.xml index adb01159b..79f1d4e4c 100644 --- a/snail-job-datasource/snail-job-postgres-datasource/src/main/resources/postgresql/mapper/RetryTaskMapper.xml +++ b/snail-job-datasource/snail-job-postgres-datasource/src/main/resources/postgresql/mapper/RetryMapper.xml @@ -4,21 +4,22 @@ - INSERT INTO sj_retry_task (namespace_id, unique_id, group_name, scene_name, - idempotent_id, biz_no, executor_name, args_str, ext_attrs, - next_trigger_at, task_type, retry_status, create_dt) + INSERT INTO sj_retry (namespace_id, unique_id, group_name, scene_name, + idempotent_id, biz_no, executor_name, args_str, ext_attrs, + next_trigger_at, task_type, retry_status, create_dt, bucket_index, parent_id, deleted) VALUES ( - #{item.namespaceId}, #{item.uniqueId}, #{item.groupName}, - #{item.sceneName}, #{item.idempotentId}, #{item.bizNo}, #{item.executorName}, #{item.argsStr}, - #{item.extAttrs}, #{item.nextTriggerAt}, #{item.taskType}, #{item.retryStatus}, #{item.createDt} + #{item.namespaceId}, #{item.uniqueId}, #{item.groupName}, + #{item.sceneName}, #{item.idempotentId}, #{item.bizNo}, #{item.executorName}, #{item.argsStr}, + #{item.extAttrs}, #{item.nextTriggerAt}, #{item.taskType}, #{item.retryStatus}, #{item.createDt}, + #{item.bucketIndex}, #{item.parentId}, #{item.deleted} ) - UPDATE sj_retry_task_${partition} AS rt + UPDATE sj_retry AS rt SET next_trigger_at = tt.next_trigger_at, update_dt = CURRENT_TIMESTAMP FROM ( diff --git a/snail-job-datasource/snail-job-postgres-datasource/src/main/resources/postgresql/mapper/RetryTaskLogMapper.xml b/snail-job-datasource/snail-job-postgres-datasource/src/main/resources/postgresql/mapper/RetryTaskLogMapper.xml deleted file mode 100644 index 04d3f5b6c..000000000 --- a/snail-job-datasource/snail-job-postgres-datasource/src/main/resources/postgresql/mapper/RetryTaskLogMapper.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - INSERT INTO sj_retry_task_log (unique_id, group_name, scene_name, idempotent_id, biz_no, executor_name, - args_str, ext_attrs, task_type, create_dt, namespace_id) - VALUES - - ( - #{item.uniqueId}, - #{item.groupName}, - #{item.sceneName}, - #{item.idempotentId}, - #{item.bizNo}, - #{item.executorName}, - #{item.argsStr}, - #{item.extAttrs}, - #{item.taskType}, - #{item.createDt}, - #{item.namespaceId} - ) - - - - diff --git a/snail-job-datasource/snail-job-sqlserver-datasource/src/main/resources/sqlserver/mapper/RetryDeadLetterMapper.xml b/snail-job-datasource/snail-job-sqlserver-datasource/src/main/resources/sqlserver/mapper/RetryDeadLetterMapper.xml index 0a1d1deca..e62db0f87 100644 --- a/snail-job-datasource/snail-job-sqlserver-datasource/src/main/resources/sqlserver/mapper/RetryDeadLetterMapper.xml +++ b/snail-job-datasource/snail-job-sqlserver-datasource/src/main/resources/sqlserver/mapper/RetryDeadLetterMapper.xml @@ -3,13 +3,12 @@ - INSERT INTO sj_retry_dead_letter (namespace_id, unique_id, group_name, scene_name, idempotent_id, biz_no, + INSERT INTO sj_retry_dead_letter (namespace_id, group_name, scene_name, idempotent_id, biz_no, executor_name, args_str, ext_attrs, create_dt) VALUES ( #{item.namespaceId,jdbcType=VARCHAR}, - #{item.uniqueId,jdbcType=VARCHAR}, #{item.groupName,jdbcType=VARCHAR}, #{item.sceneName,jdbcType=VARCHAR}, #{item.idempotentId,jdbcType=VARCHAR}, diff --git a/snail-job-datasource/snail-job-sqlserver-datasource/src/main/resources/sqlserver/mapper/RetryTaskMapper.xml b/snail-job-datasource/snail-job-sqlserver-datasource/src/main/resources/sqlserver/mapper/RetryMapper.xml similarity index 65% rename from snail-job-datasource/snail-job-sqlserver-datasource/src/main/resources/sqlserver/mapper/RetryTaskMapper.xml rename to snail-job-datasource/snail-job-sqlserver-datasource/src/main/resources/sqlserver/mapper/RetryMapper.xml index 3b9c27d22..c9376a8a0 100644 --- a/snail-job-datasource/snail-job-sqlserver-datasource/src/main/resources/sqlserver/mapper/RetryTaskMapper.xml +++ b/snail-job-datasource/snail-job-sqlserver-datasource/src/main/resources/sqlserver/mapper/RetryMapper.xml @@ -4,24 +4,27 @@ INSERT INTO sj_retry_task (namespace_id, unique_id, group_name, scene_name, idempotent_id, biz_no, - executor_name, args_str, ext_attrs, next_trigger_at, task_type, retry_status, - create_dt) + executor_name, args_str, ext_attrs, next_trigger_at, task_type, retry_status, + create_dt, bucket_index, parent_id, deleted) VALUES ( - #{item.namespaceId}, - #{item.uniqueId}, - #{item.groupName}, - #{item.sceneName}, - #{item.idempotentId}, - #{item.bizNo}, - #{item.executorName}, - #{item.argsStr}, - #{item.extAttrs}, - #{item.nextTriggerAt}, - #{item.taskType}, - #{item.retryStatus}, - #{item.createDt} + #{item.namespaceId}, + #{item.uniqueId}, + #{item.groupName}, + #{item.sceneName}, + #{item.idempotentId}, + #{item.bizNo}, + #{item.executorName}, + #{item.argsStr}, + #{item.extAttrs}, + #{item.nextTriggerAt}, + #{item.taskType}, + #{item.retryStatus}, + #{item.createDt}, + #{item.bucketIndex}, + #{item.parentId}, + #{item.deleted} ) diff --git a/snail-job-datasource/snail-job-sqlserver-datasource/src/main/resources/sqlserver/mapper/RetryTaskLogMapper.xml b/snail-job-datasource/snail-job-sqlserver-datasource/src/main/resources/sqlserver/mapper/RetryTaskLogMapper.xml deleted file mode 100644 index 405049934..000000000 --- a/snail-job-datasource/snail-job-sqlserver-datasource/src/main/resources/sqlserver/mapper/RetryTaskLogMapper.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - INSERT INTO sj_retry_task (unique_id, group_name, scene_name, idempotent_id, biz_no, executor_name, - args_str, ext_attrs, task_type, create_dt, namespace_id) - VALUES - - ( - #{item.uniqueId}, - #{item.groupName}, - #{item.sceneName}, - #{item.idempotentId}, - #{item.bizNo}, - #{item.executorName}, - #{item.argsStr}, - #{item.extAttrs}, - #{item.taskType}, - #{item.createDt}, - #{item.namespaceId} - ) - - - -