From cfc73e65f5a217581635f57e9a3368a8e41ff25e Mon Sep 17 00:00:00 2001 From: dhb52 Date: Thu, 20 Jun 2024 14:34:37 +0800 Subject: [PATCH] =?UTF-8?q?feat(sj=5F1.1.0-beta1):=E6=8F=90=E5=8F=96?= =?UTF-8?q?=E6=89=80=E6=9C=89insertBatch=20xml=E8=AF=AD=E5=8F=A5=E5=88=B0t?= =?UTF-8?q?emplate?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/RetryDeadLetterMapper.java | 2 +- .../mapper/RetryTaskLogMapper.java | 2 +- .../mapper/RetryTaskLogMessageMapper.java | 6 ++-- .../persistence/mapper/RetryTaskMapper.java | 1 + .../persistence/mapper/ServerNodeMapper.java | 4 +-- .../template}/mapper/JobLogMessageMapper.xml | 2 +- .../template/mapper/JobSummaryMapper.xml | 22 ++++++++++++ .../template/mapper/RetryDeadLetterMapper.xml | 27 +++++++++++++++ .../template/mapper/RetrySummaryMapper.xml | 18 ++++++++++ .../template/mapper/RetryTaskLogMapper.xml | 13 +++++++ .../mapper/RetryTaskLogMessageMapper.xml} | 12 +++---- .../template/mapper/RetryTaskMapper.xml | 29 ++++++++++++++++ .../template/mapper/ServerNodeMapper.xml | 19 +++++++++++ .../dm/mapper/JobLogMessageMapper.xml | 25 -------------- .../resources/dm/mapper/JobSummaryMapper.xml | 22 ------------ .../dm/mapper/RetryDeadLetterMapper.xml | 21 ------------ .../dm/mapper/RetrySummaryMapper.xml | 18 ---------- .../dm/mapper/RetryTaskLogMapper.xml | 19 ----------- .../dm/mapper/RetryTaskLogMessageMapper.xml | 17 ---------- .../resources/dm/mapper/RetryTaskMapper.xml | 15 +------- .../resources/dm/mapper/ServerNodeMapper.xml | 20 ----------- .../resources/dm/mapper/WorkflowMapper.xml | 1 + .../mariadb/mapper/JobSummaryMapper.xml | 22 ------------ .../mariadb/mapper/RetryDeadLetterMapper.xml | 27 --------------- .../mariadb/mapper/RetrySummaryMapper.xml | 18 ---------- .../mariadb/mapper/RetryTaskLogMapper.xml | 19 ----------- .../mapper/RetryTaskLogMessageMapper.xml | 18 ---------- .../mariadb/mapper/RetryTaskMapper.xml | 25 -------------- .../mariadb/mapper/ServerNodeMapper.xml | 19 ----------- .../mysql/mapper/JobSummaryMapper.xml | 22 ------------ .../mysql/mapper/RetryDeadLetterMapper.xml | 27 --------------- .../mysql/mapper/RetrySummaryMapper.xml | 18 ---------- .../mysql/mapper/RetryTaskLogMapper.xml | 19 ----------- .../mapper/RetryTaskLogMessageMapper.xml | 18 ---------- .../mysql/mapper/RetryTaskMapper.xml | 26 +------------- .../mysql/mapper/ServerNodeMapper.xml | 19 ----------- .../oracle/mapper/JobLogMessageMapper.xml | 24 ------------- .../oracle/mapper/JobSummaryMapper.xml | 21 ------------ .../oracle/mapper/RetryDeadLetterMapper.xml | 20 ----------- .../oracle/mapper/RetrySummaryMapper.xml | 19 +---------- .../oracle/mapper/RetryTaskLogMapper.xml | 18 ---------- .../mapper/RetryTaskLogMessageMapper.xml | 16 --------- .../oracle/mapper/RetryTaskMapper.xml | 14 +------- .../oracle/mapper/ServerNodeMapper.xml | 19 ----------- .../postgresql/mapper/JobLogMessageMapper.xml | 25 -------------- .../postgresql/mapper/JobSummaryMapper.xml | 22 ------------ .../mapper/RetryDeadLetterMapper.xml | 21 ------------ .../postgresql/mapper/RetrySummaryMapper.xml | 18 ---------- .../postgresql/mapper/RetryTaskLogMapper.xml | 19 ----------- .../mapper/RetryTaskLogMessageMapper.xml | 17 ---------- .../postgresql/mapper/RetryTaskMapper.xml | 16 +-------- .../postgresql/mapper/ServerNodeMapper.xml | 19 ----------- .../sqlserver/mapper/JobLogMessageMapper.xml | 24 ------------- .../sqlserver/mapper/JobSummaryMapper.xml | 22 ------------ .../mapper/RetryDeadLetterMapper.xml | 26 -------------- .../sqlserver/mapper/RetrySummaryMapper.xml | 34 +++++-------------- .../sqlserver/mapper/RetryTaskLogMapper.xml | 19 ----------- .../mapper/RetryTaskLogMessageMapper.xml | 18 ---------- .../sqlserver/mapper/RetryTaskMapper.xml | 24 +------------ .../sqlserver/mapper/ServerNodeMapper.xml | 19 ----------- 60 files changed, 158 insertions(+), 948 deletions(-) rename snail-job-datasource/{snail-job-mysql-datasource/src/main/resources/mysql => snail-job-datasource-template/src/main/resources/template}/mapper/JobLogMessageMapper.xml (91%) create mode 100644 snail-job-datasource/snail-job-datasource-template/src/main/resources/template/mapper/RetryDeadLetterMapper.xml rename snail-job-datasource/{snail-job-mariadb-datasource/src/main/resources/mariadb/mapper/JobLogMessageMapper.xml => snail-job-datasource-template/src/main/resources/template/mapper/RetryTaskLogMessageMapper.xml} (60%) create mode 100644 snail-job-datasource/snail-job-datasource-template/src/main/resources/template/mapper/RetryTaskMapper.xml delete mode 100644 snail-job-datasource/snail-job-dm8-datasource/src/main/resources/dm/mapper/JobLogMessageMapper.xml delete mode 100644 snail-job-datasource/snail-job-dm8-datasource/src/main/resources/dm/mapper/RetryDeadLetterMapper.xml delete mode 100644 snail-job-datasource/snail-job-dm8-datasource/src/main/resources/dm/mapper/RetryTaskLogMapper.xml delete mode 100644 snail-job-datasource/snail-job-mariadb-datasource/src/main/resources/mariadb/mapper/RetryDeadLetterMapper.xml 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/RetryDeadLetterMapper.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-oracle-datasource/src/main/resources/oracle/mapper/JobLogMessageMapper.xml delete mode 100644 snail-job-datasource/snail-job-oracle-datasource/src/main/resources/oracle/mapper/RetryDeadLetterMapper.xml delete mode 100644 snail-job-datasource/snail-job-oracle-datasource/src/main/resources/oracle/mapper/RetryTaskLogMapper.xml delete mode 100644 snail-job-datasource/snail-job-postgres-datasource/src/main/resources/postgresql/mapper/JobLogMessageMapper.xml delete mode 100644 snail-job-datasource/snail-job-postgres-datasource/src/main/resources/postgresql/mapper/RetryDeadLetterMapper.xml delete mode 100644 snail-job-datasource/snail-job-postgres-datasource/src/main/resources/postgresql/mapper/RetryTaskLogMapper.xml delete mode 100644 snail-job-datasource/snail-job-sqlserver-datasource/src/main/resources/sqlserver/mapper/JobLogMessageMapper.xml delete mode 100644 snail-job-datasource/snail-job-sqlserver-datasource/src/main/resources/sqlserver/mapper/RetryDeadLetterMapper.xml delete mode 100644 snail-job-datasource/snail-job-sqlserver-datasource/src/main/resources/sqlserver/mapper/RetryTaskLogMapper.xml diff --git a/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/persistence/mapper/RetryDeadLetterMapper.java b/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/persistence/mapper/RetryDeadLetterMapper.java index ee7fcbdf2..aa9b17c87 100644 --- a/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/persistence/mapper/RetryDeadLetterMapper.java +++ b/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/persistence/mapper/RetryDeadLetterMapper.java @@ -8,6 +8,6 @@ import java.util.List; public interface RetryDeadLetterMapper extends BaseMapper { - int insertBatch(@Param("retryDeadLetters") List retryDeadLetter); + int insertBatch(@Param("list") List list); } diff --git a/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/persistence/mapper/RetryTaskLogMapper.java b/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/persistence/mapper/RetryTaskLogMapper.java index 5238a6b18..77d27b6e2 100644 --- a/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/persistence/mapper/RetryTaskLogMapper.java +++ b/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/persistence/mapper/RetryTaskLogMapper.java @@ -11,7 +11,7 @@ import java.util.List; public interface RetryTaskLogMapper extends BaseMapper { - int insertBatch(List list); + int insertBatch(@Param("list") List list); List selectRetryRetryTaskLogSummaryList(@Param("ew") Wrapper wrapper); } diff --git a/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/persistence/mapper/RetryTaskLogMessageMapper.java b/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/persistence/mapper/RetryTaskLogMessageMapper.java index 820baf4f2..9957d819c 100644 --- a/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/persistence/mapper/RetryTaskLogMessageMapper.java +++ b/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/persistence/mapper/RetryTaskLogMessageMapper.java @@ -3,6 +3,7 @@ package com.aizuda.snailjob.template.datasource.persistence.mapper; import com.aizuda.snailjob.template.datasource.persistence.po.RetryTaskLogMessage; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -17,7 +18,8 @@ import java.util.List; @Mapper public interface RetryTaskLogMessageMapper extends BaseMapper { - int insertBatch(List list); + int insertBatch(@Param("list") List list); + + int updateBatch(@Param("list") List list); - int updateBatch(List list); } 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 d769f9ed8..d5ce7e75a 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 @@ -11,4 +11,5 @@ public interface RetryTaskMapper extends BaseMapper { int insertBatch(@Param("list") List list); int updateBatchNextTriggerAtById(@Param("partition") Integer partition, @Param("list") List list); + } diff --git a/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/persistence/mapper/ServerNodeMapper.java b/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/persistence/mapper/ServerNodeMapper.java index 07da7d028..325daba9c 100644 --- a/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/persistence/mapper/ServerNodeMapper.java +++ b/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/persistence/mapper/ServerNodeMapper.java @@ -12,9 +12,9 @@ import java.util.List; @Mapper public interface ServerNodeMapper extends BaseMapper { - int updateBatchExpireAt(@Param("list") List list); + int insertBatch(@Param("list") List list); - int insertBatch(@Param("records") List records); + int updateBatchExpireAt(@Param("list") List list); List selectActivePodCount(@Param("ew") Wrapper wrapper); diff --git a/snail-job-datasource/snail-job-mysql-datasource/src/main/resources/mysql/mapper/JobLogMessageMapper.xml b/snail-job-datasource/snail-job-datasource-template/src/main/resources/template/mapper/JobLogMessageMapper.xml similarity index 91% rename from snail-job-datasource/snail-job-mysql-datasource/src/main/resources/mysql/mapper/JobLogMessageMapper.xml rename to snail-job-datasource/snail-job-datasource-template/src/main/resources/template/mapper/JobLogMessageMapper.xml index 8c764b8e6..26ef776a8 100644 --- a/snail-job-datasource/snail-job-mysql-datasource/src/main/resources/mysql/mapper/JobLogMessageMapper.xml +++ b/snail-job-datasource/snail-job-datasource-template/src/main/resources/template/mapper/JobLogMessageMapper.xml @@ -2,7 +2,7 @@ - + INSERT INTO sj_job_log_message (namespace_id, group_name, job_id, task_batch_id, task_id, log_num, message, create_dt, real_time) VALUES diff --git a/snail-job-datasource/snail-job-datasource-template/src/main/resources/template/mapper/JobSummaryMapper.xml b/snail-job-datasource/snail-job-datasource-template/src/main/resources/template/mapper/JobSummaryMapper.xml index 1aa857635..baeb22421 100644 --- a/snail-job-datasource/snail-job-datasource-template/src/main/resources/template/mapper/JobSummaryMapper.xml +++ b/snail-job-datasource/snail-job-datasource-template/src/main/resources/template/mapper/JobSummaryMapper.xml @@ -2,6 +2,28 @@ + + INSERT INTO sj_job_summary (namespace_id, group_name, business_id, trigger_at, system_task_type, + success_num,fail_num,fail_reason,stop_num,stop_reason, cancel_num,cancel_reason) + VALUES + + ( + #{item.namespaceId}, + #{item.groupName}, + #{item.businessId}, + #{item.triggerAt}, + #{item.systemTaskType}, + #{item.successNum}, + #{item.failNum}, + #{item.failReason}, + #{item.stopNum}, + #{item.stopReason}, + #{item.cancelNum}, + #{item.cancelReason} + ) + + + SELECT group_name AS groupName, diff --git a/snail-job-datasource/snail-job-datasource-template/src/main/resources/template/mapper/RetryTaskLogMapper.xml b/snail-job-datasource/snail-job-datasource-template/src/main/resources/template/mapper/RetryTaskLogMapper.xml index 9004a1e4f..5fcb5c925 100644 --- a/snail-job-datasource/snail-job-datasource-template/src/main/resources/template/mapper/RetryTaskLogMapper.xml +++ b/snail-job-datasource/snail-job-datasource-template/src/main/resources/template/mapper/RetryTaskLogMapper.xml @@ -2,6 +2,19 @@ + + 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} + ) + + + SELECT node_type AS nodeType, diff --git a/snail-job-datasource/snail-job-dm8-datasource/src/main/resources/dm/mapper/JobLogMessageMapper.xml b/snail-job-datasource/snail-job-dm8-datasource/src/main/resources/dm/mapper/JobLogMessageMapper.xml deleted file mode 100644 index a3a0ab598..000000000 --- a/snail-job-datasource/snail-job-dm8-datasource/src/main/resources/dm/mapper/JobLogMessageMapper.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - INSERT INTO sj_job_log_message (namespace_id, group_name, job_id, task_batch_id, task_id, - log_num, message, create_dt, real_time) - VALUES - - ( - #{item.namespaceId}, - #{item.groupName}, - #{item.jobId}, - #{item.taskBatchId}, - #{item.taskId}, - #{item.logNum}, - #{item.message}, - #{item.createDt}, - #{item.realTime} - ) - - - - diff --git a/snail-job-datasource/snail-job-dm8-datasource/src/main/resources/dm/mapper/JobSummaryMapper.xml b/snail-job-datasource/snail-job-dm8-datasource/src/main/resources/dm/mapper/JobSummaryMapper.xml index bb3c94dc9..f55cf5297 100644 --- a/snail-job-datasource/snail-job-dm8-datasource/src/main/resources/dm/mapper/JobSummaryMapper.xml +++ b/snail-job-datasource/snail-job-dm8-datasource/src/main/resources/dm/mapper/JobSummaryMapper.xml @@ -2,28 +2,6 @@ - - INSERT INTO sj_job_summary (namespace_id, group_name, business_id, trigger_at, system_task_type, - success_num,fail_num,fail_reason,stop_num,stop_reason, cancel_num,cancel_reason) - VALUES - - ( - #{item.namespaceId}, - #{item.groupName}, - #{item.businessId}, - #{item.triggerAt}, - #{item.systemTaskType}, - #{item.successNum}, - #{item.failNum}, - #{item.failReason}, - #{item.stopNum}, - #{item.stopReason}, - #{item.cancelNum}, - #{item.cancelReason} - ) - - - UPDATE sj_job_summary 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 deleted file mode 100644 index 14525c135..000000000 --- a/snail-job-datasource/snail-job-dm8-datasource/src/main/resources/dm/mapper/RetryDeadLetterMapper.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - INSERT INTO sj_retry_dead_letter (namespace_id, unique_id, group_name, scene_name, - idempotent_id, biz_no, executor_name, args_str, - ext_attrs, create_dt) - VALUES - - ( - #{retryDeadLetter.namespaceId,jdbcType=VARCHAR}, #{retryDeadLetter.uniqueId,jdbcType=VARCHAR}, - #{retryDeadLetter.groupName,jdbcType=VARCHAR}, #{retryDeadLetter.sceneName,jdbcType=VARCHAR}, - #{retryDeadLetter.idempotentId,jdbcType=VARCHAR}, #{retryDeadLetter.bizNo,jdbcType=VARCHAR}, - #{retryDeadLetter.executorName,jdbcType=VARCHAR}, #{retryDeadLetter.argsStr,jdbcType=VARCHAR}, - #{retryDeadLetter.extAttrs,jdbcType=VARCHAR}, #{retryDeadLetter.createDt,jdbcType=TIMESTAMP} - ) - - - - diff --git a/snail-job-datasource/snail-job-dm8-datasource/src/main/resources/dm/mapper/RetrySummaryMapper.xml b/snail-job-datasource/snail-job-dm8-datasource/src/main/resources/dm/mapper/RetrySummaryMapper.xml index 616249e81..0831c9dd7 100644 --- a/snail-job-datasource/snail-job-dm8-datasource/src/main/resources/dm/mapper/RetrySummaryMapper.xml +++ b/snail-job-datasource/snail-job-dm8-datasource/src/main/resources/dm/mapper/RetrySummaryMapper.xml @@ -2,24 +2,6 @@ - - INSERT INTO sj_retry_summary (namespace_id, group_name, scene_name, trigger_at, - running_num, finish_num, max_count_num, suspend_num) - VALUES - - ( - #{item.namespaceId}, - #{item.groupName}, - #{item.sceneName}, - #{item.triggerAt}, - #{item.runningNum}, - #{item.finishNum}, - #{item.maxCountNum}, - #{item.suspendNum} - ) - - - UPDATE sj_retry_summary 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 879dc1864..000000000 --- a/snail-job-datasource/snail-job-dm8-datasource/src/main/resources/dm/mapper/RetryTaskLogMapper.xml +++ /dev/null @@ -1,19 +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-dm8-datasource/src/main/resources/dm/mapper/RetryTaskLogMessageMapper.xml b/snail-job-datasource/snail-job-dm8-datasource/src/main/resources/dm/mapper/RetryTaskLogMessageMapper.xml index 96ea4c4b1..4baa7e444 100644 --- a/snail-job-datasource/snail-job-dm8-datasource/src/main/resources/dm/mapper/RetryTaskLogMessageMapper.xml +++ b/snail-job-datasource/snail-job-dm8-datasource/src/main/resources/dm/mapper/RetryTaskLogMessageMapper.xml @@ -2,23 +2,6 @@ - - INSERT INTO sj_retry_task_log_message (namespace_id, group_name, unique_id, log_num, message, - create_dt, real_time) - VALUES - - ( - #{item.namespaceId}, - #{item.groupName}, - #{item.uniqueId}, - #{item.logNum}, - #{item.message}, - #{item.createDt}, - #{item.realTime} - ) - - - UPDATE sj_retry_task_log_message 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/RetryTaskMapper.xml index f0515fcbf..28af87c18 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/RetryTaskMapper.xml @@ -2,20 +2,6 @@ - - - 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) - 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} @@ -23,4 +9,5 @@ WHERE id = #{item.id} + diff --git a/snail-job-datasource/snail-job-dm8-datasource/src/main/resources/dm/mapper/ServerNodeMapper.xml b/snail-job-datasource/snail-job-dm8-datasource/src/main/resources/dm/mapper/ServerNodeMapper.xml index 421576027..92f29cfa8 100644 --- a/snail-job-datasource/snail-job-dm8-datasource/src/main/resources/dm/mapper/ServerNodeMapper.xml +++ b/snail-job-datasource/snail-job-dm8-datasource/src/main/resources/dm/mapper/ServerNodeMapper.xml @@ -2,26 +2,6 @@ - - - INSERT INTO sj_server_node (namespace_id, group_name, host_id, host_ip, host_port, - expire_at, node_type, ext_attrs, create_dt) - VALUES - - ( - #{item.namespaceId,jdbcType=VARCHAR}, - #{item.groupName,jdbcType=VARCHAR}, - #{item.hostId,jdbcType=VARCHAR}, - #{item.hostIp,jdbcType=VARCHAR}, - #{item.hostPort,jdbcType=INTEGER}, - #{item.expireAt,jdbcType=TIMESTAMP}, - #{item.nodeType,jdbcType=TINYINT}, - #{item.extAttrs,jdbcType=VARCHAR}, - #{item.createDt,jdbcType=TIMESTAMP} - ) - - - UPDATE sj_server_node diff --git a/snail-job-datasource/snail-job-dm8-datasource/src/main/resources/dm/mapper/WorkflowMapper.xml b/snail-job-datasource/snail-job-dm8-datasource/src/main/resources/dm/mapper/WorkflowMapper.xml index 54abf2cb2..47eac4bb8 100644 --- a/snail-job-datasource/snail-job-dm8-datasource/src/main/resources/dm/mapper/WorkflowMapper.xml +++ b/snail-job-datasource/snail-job-dm8-datasource/src/main/resources/dm/mapper/WorkflowMapper.xml @@ -9,4 +9,5 @@ WHERE id = #{item.id} + diff --git a/snail-job-datasource/snail-job-mariadb-datasource/src/main/resources/mariadb/mapper/JobSummaryMapper.xml b/snail-job-datasource/snail-job-mariadb-datasource/src/main/resources/mariadb/mapper/JobSummaryMapper.xml index 45bb5deb7..96d870e75 100644 --- a/snail-job-datasource/snail-job-mariadb-datasource/src/main/resources/mariadb/mapper/JobSummaryMapper.xml +++ b/snail-job-datasource/snail-job-mariadb-datasource/src/main/resources/mariadb/mapper/JobSummaryMapper.xml @@ -2,28 +2,6 @@ - - INSERT INTO sj_job_summary (namespace_id, group_name, business_id, trigger_at, system_task_type, - success_num,fail_num,fail_reason,stop_num,stop_reason, cancel_num,cancel_reason) - VALUES - - ( - #{item.namespaceId}, - #{item.groupName}, - #{item.businessId}, - #{item.triggerAt}, - #{item.systemTaskType}, - #{item.successNum}, - #{item.failNum}, - #{item.failReason}, - #{item.stopNum}, - #{item.stopReason}, - #{item.cancelNum}, - #{item.cancelReason} - ) - - - UPDATE sj_job_summary rt, ( 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 deleted file mode 100644 index c91d86ff4..000000000 --- a/snail-job-datasource/snail-job-mariadb-datasource/src/main/resources/mariadb/mapper/RetryDeadLetterMapper.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - INSERT INTO sj_retry_dead_letter (namespace_id, unique_id, group_name, scene_name, - idempotent_id, biz_no, executor_name, args_str, - ext_attrs, create_dt - ) - VALUES - - ( - #{retryDeadLetter.namespaceId,jdbcType=VARCHAR}, - #{retryDeadLetter.uniqueId,jdbcType=VARCHAR}, - #{retryDeadLetter.groupName,jdbcType=VARCHAR}, - #{retryDeadLetter.sceneName,jdbcType=VARCHAR}, - #{retryDeadLetter.idempotentId,jdbcType=VARCHAR}, - #{retryDeadLetter.bizNo,jdbcType=VARCHAR}, - #{retryDeadLetter.executorName,jdbcType=VARCHAR}, - #{retryDeadLetter.argsStr,jdbcType=VARCHAR}, - #{retryDeadLetter.extAttrs,jdbcType=VARCHAR}, - #{retryDeadLetter.createDt,jdbcType=TIMESTAMP} - ) - - - - diff --git a/snail-job-datasource/snail-job-mariadb-datasource/src/main/resources/mariadb/mapper/RetrySummaryMapper.xml b/snail-job-datasource/snail-job-mariadb-datasource/src/main/resources/mariadb/mapper/RetrySummaryMapper.xml index c18f1b705..8bf79c907 100644 --- a/snail-job-datasource/snail-job-mariadb-datasource/src/main/resources/mariadb/mapper/RetrySummaryMapper.xml +++ b/snail-job-datasource/snail-job-mariadb-datasource/src/main/resources/mariadb/mapper/RetrySummaryMapper.xml @@ -2,24 +2,6 @@ - - INSERT INTO sj_retry_summary (namespace_id, group_name, scene_name, trigger_at, - running_num, finish_num, max_count_num, suspend_num) - VALUES - - ( - #{item.namespaceId}, - #{item.groupName}, - #{item.sceneName}, - #{item.triggerAt}, - #{item.runningNum}, - #{item.finishNum}, - #{item.maxCountNum}, - #{item.suspendNum} - ) - - - UPDATE sj_retry_summary rt, ( 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 a44588c96..000000000 --- a/snail-job-datasource/snail-job-mariadb-datasource/src/main/resources/mariadb/mapper/RetryTaskLogMapper.xml +++ /dev/null @@ -1,19 +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/RetryTaskLogMessageMapper.xml b/snail-job-datasource/snail-job-mariadb-datasource/src/main/resources/mariadb/mapper/RetryTaskLogMessageMapper.xml index 8b7f5884e..c6b4b553d 100644 --- a/snail-job-datasource/snail-job-mariadb-datasource/src/main/resources/mariadb/mapper/RetryTaskLogMessageMapper.xml +++ b/snail-job-datasource/snail-job-mariadb-datasource/src/main/resources/mariadb/mapper/RetryTaskLogMessageMapper.xml @@ -2,24 +2,6 @@ - - - INSERT INTO sj_retry_task_log_message (namespace_id, group_name, unique_id, log_num, message, - create_dt, real_time) - VALUES - - ( - #{item.namespaceId}, - #{item.groupName}, - #{item.uniqueId}, - #{item.logNum}, - #{item.message}, - #{item.createDt}, - #{item.realTime} - ) - - - UPDATE sj_retry_task_log_message rt, ( 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/RetryTaskMapper.xml index 0205e9747..3a2327c15 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/RetryTaskMapper.xml @@ -2,31 +2,6 @@ - - - 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) - 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, ( diff --git a/snail-job-datasource/snail-job-mariadb-datasource/src/main/resources/mariadb/mapper/ServerNodeMapper.xml b/snail-job-datasource/snail-job-mariadb-datasource/src/main/resources/mariadb/mapper/ServerNodeMapper.xml index 88425b73c..a059f0051 100644 --- a/snail-job-datasource/snail-job-mariadb-datasource/src/main/resources/mariadb/mapper/ServerNodeMapper.xml +++ b/snail-job-datasource/snail-job-mariadb-datasource/src/main/resources/mariadb/mapper/ServerNodeMapper.xml @@ -2,25 +2,6 @@ - - INSERT INTO sj_server_node (namespace_id, group_name, host_id, host_ip, host_port, - expire_at, node_type, ext_attrs, create_dt) - VALUES - - ( - #{item.namespaceId,jdbcType=VARCHAR}, - #{item.groupName,jdbcType=VARCHAR}, - #{item.hostId,jdbcType=VARCHAR}, - #{item.hostIp,jdbcType=VARCHAR}, - #{item.hostPort,jdbcType=INTEGER}, - #{item.expireAt,jdbcType=TIMESTAMP}, - #{item.nodeType,jdbcType=TINYINT}, - #{item.extAttrs,jdbcType=VARCHAR}, - #{item.createDt,jdbcType=TIMESTAMP} - ) - - - UPDATE sj_server_node rt, ( diff --git a/snail-job-datasource/snail-job-mysql-datasource/src/main/resources/mysql/mapper/JobSummaryMapper.xml b/snail-job-datasource/snail-job-mysql-datasource/src/main/resources/mysql/mapper/JobSummaryMapper.xml index 45bb5deb7..96d870e75 100644 --- a/snail-job-datasource/snail-job-mysql-datasource/src/main/resources/mysql/mapper/JobSummaryMapper.xml +++ b/snail-job-datasource/snail-job-mysql-datasource/src/main/resources/mysql/mapper/JobSummaryMapper.xml @@ -2,28 +2,6 @@ - - INSERT INTO sj_job_summary (namespace_id, group_name, business_id, trigger_at, system_task_type, - success_num,fail_num,fail_reason,stop_num,stop_reason, cancel_num,cancel_reason) - VALUES - - ( - #{item.namespaceId}, - #{item.groupName}, - #{item.businessId}, - #{item.triggerAt}, - #{item.systemTaskType}, - #{item.successNum}, - #{item.failNum}, - #{item.failReason}, - #{item.stopNum}, - #{item.stopReason}, - #{item.cancelNum}, - #{item.cancelReason} - ) - - - UPDATE sj_job_summary rt, ( diff --git a/snail-job-datasource/snail-job-mysql-datasource/src/main/resources/mysql/mapper/RetryDeadLetterMapper.xml b/snail-job-datasource/snail-job-mysql-datasource/src/main/resources/mysql/mapper/RetryDeadLetterMapper.xml deleted file mode 100644 index c91d86ff4..000000000 --- a/snail-job-datasource/snail-job-mysql-datasource/src/main/resources/mysql/mapper/RetryDeadLetterMapper.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - INSERT INTO sj_retry_dead_letter (namespace_id, unique_id, group_name, scene_name, - idempotent_id, biz_no, executor_name, args_str, - ext_attrs, create_dt - ) - VALUES - - ( - #{retryDeadLetter.namespaceId,jdbcType=VARCHAR}, - #{retryDeadLetter.uniqueId,jdbcType=VARCHAR}, - #{retryDeadLetter.groupName,jdbcType=VARCHAR}, - #{retryDeadLetter.sceneName,jdbcType=VARCHAR}, - #{retryDeadLetter.idempotentId,jdbcType=VARCHAR}, - #{retryDeadLetter.bizNo,jdbcType=VARCHAR}, - #{retryDeadLetter.executorName,jdbcType=VARCHAR}, - #{retryDeadLetter.argsStr,jdbcType=VARCHAR}, - #{retryDeadLetter.extAttrs,jdbcType=VARCHAR}, - #{retryDeadLetter.createDt,jdbcType=TIMESTAMP} - ) - - - - diff --git a/snail-job-datasource/snail-job-mysql-datasource/src/main/resources/mysql/mapper/RetrySummaryMapper.xml b/snail-job-datasource/snail-job-mysql-datasource/src/main/resources/mysql/mapper/RetrySummaryMapper.xml index c18f1b705..8bf79c907 100644 --- a/snail-job-datasource/snail-job-mysql-datasource/src/main/resources/mysql/mapper/RetrySummaryMapper.xml +++ b/snail-job-datasource/snail-job-mysql-datasource/src/main/resources/mysql/mapper/RetrySummaryMapper.xml @@ -2,24 +2,6 @@ - - INSERT INTO sj_retry_summary (namespace_id, group_name, scene_name, trigger_at, - running_num, finish_num, max_count_num, suspend_num) - VALUES - - ( - #{item.namespaceId}, - #{item.groupName}, - #{item.sceneName}, - #{item.triggerAt}, - #{item.runningNum}, - #{item.finishNum}, - #{item.maxCountNum}, - #{item.suspendNum} - ) - - - UPDATE sj_retry_summary rt, ( 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 a44588c96..000000000 --- a/snail-job-datasource/snail-job-mysql-datasource/src/main/resources/mysql/mapper/RetryTaskLogMapper.xml +++ /dev/null @@ -1,19 +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/RetryTaskLogMessageMapper.xml b/snail-job-datasource/snail-job-mysql-datasource/src/main/resources/mysql/mapper/RetryTaskLogMessageMapper.xml index 8b7f5884e..c6b4b553d 100644 --- a/snail-job-datasource/snail-job-mysql-datasource/src/main/resources/mysql/mapper/RetryTaskLogMessageMapper.xml +++ b/snail-job-datasource/snail-job-mysql-datasource/src/main/resources/mysql/mapper/RetryTaskLogMessageMapper.xml @@ -2,24 +2,6 @@ - - - INSERT INTO sj_retry_task_log_message (namespace_id, group_name, unique_id, log_num, message, - create_dt, real_time) - VALUES - - ( - #{item.namespaceId}, - #{item.groupName}, - #{item.uniqueId}, - #{item.logNum}, - #{item.message}, - #{item.createDt}, - #{item.realTime} - ) - - - UPDATE sj_retry_task_log_message rt, ( 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 index 0205e9747..97f82e3ea 100644 --- 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 @@ -2,31 +2,6 @@ - - - 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) - 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, ( @@ -39,4 +14,5 @@ SET rt.next_trigger_at = tt.next_trigger_at WHERE rt.id = tt.id + diff --git a/snail-job-datasource/snail-job-mysql-datasource/src/main/resources/mysql/mapper/ServerNodeMapper.xml b/snail-job-datasource/snail-job-mysql-datasource/src/main/resources/mysql/mapper/ServerNodeMapper.xml index 88425b73c..a059f0051 100644 --- a/snail-job-datasource/snail-job-mysql-datasource/src/main/resources/mysql/mapper/ServerNodeMapper.xml +++ b/snail-job-datasource/snail-job-mysql-datasource/src/main/resources/mysql/mapper/ServerNodeMapper.xml @@ -2,25 +2,6 @@ - - INSERT INTO sj_server_node (namespace_id, group_name, host_id, host_ip, host_port, - expire_at, node_type, ext_attrs, create_dt) - VALUES - - ( - #{item.namespaceId,jdbcType=VARCHAR}, - #{item.groupName,jdbcType=VARCHAR}, - #{item.hostId,jdbcType=VARCHAR}, - #{item.hostIp,jdbcType=VARCHAR}, - #{item.hostPort,jdbcType=INTEGER}, - #{item.expireAt,jdbcType=TIMESTAMP}, - #{item.nodeType,jdbcType=TINYINT}, - #{item.extAttrs,jdbcType=VARCHAR}, - #{item.createDt,jdbcType=TIMESTAMP} - ) - - - UPDATE sj_server_node rt, ( diff --git a/snail-job-datasource/snail-job-oracle-datasource/src/main/resources/oracle/mapper/JobLogMessageMapper.xml b/snail-job-datasource/snail-job-oracle-datasource/src/main/resources/oracle/mapper/JobLogMessageMapper.xml deleted file mode 100644 index 89e53c605..000000000 --- a/snail-job-datasource/snail-job-oracle-datasource/src/main/resources/oracle/mapper/JobLogMessageMapper.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - INSERT INTO sj_job_log_message (namespace_id, group_name, job_id, task_batch_id, task_id, - log_num, message, create_dt, real_time) - - SELECT - #{item.namespaceId}, - #{item.groupName}, - #{item.jobId}, - #{item.taskBatchId}, - #{item.taskId}, - #{item.logNum}, - #{item.message}, - #{item.createDt}, - #{item.realTime} - FROM DUAL - - - - diff --git a/snail-job-datasource/snail-job-oracle-datasource/src/main/resources/oracle/mapper/JobSummaryMapper.xml b/snail-job-datasource/snail-job-oracle-datasource/src/main/resources/oracle/mapper/JobSummaryMapper.xml index 3d7dececd..f55cf5297 100644 --- a/snail-job-datasource/snail-job-oracle-datasource/src/main/resources/oracle/mapper/JobSummaryMapper.xml +++ b/snail-job-datasource/snail-job-oracle-datasource/src/main/resources/oracle/mapper/JobSummaryMapper.xml @@ -2,27 +2,6 @@ - - INSERT INTO sj_job_summary (namespace_id, group_name, business_id, trigger_at, system_task_type, - success_num,fail_num,fail_reason,stop_num,stop_reason, cancel_num,cancel_reason) - - SELECT - #{item.namespaceId}, - #{item.groupName}, - #{item.businessId}, - #{item.triggerAt}, - #{item.systemTaskType}, - #{item.successNum}, - #{item.failNum}, - #{item.failReason}, - #{item.stopNum}, - #{item.stopReason}, - #{item.cancelNum}, - #{item.cancelReason} - FROM DUAL - - - UPDATE sj_job_summary 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 deleted file mode 100644 index 0cbad6660..000000000 --- a/snail-job-datasource/snail-job-oracle-datasource/src/main/resources/oracle/mapper/RetryDeadLetterMapper.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - INSERT INTO sj_retry_dead_letter (namespace_id, unique_id, group_name, scene_name, - idempotent_id, biz_no, executor_name, args_str, - ext_attrs, create_dt) - - SELECT - #{retryDeadLetter.namespaceId,jdbcType=VARCHAR}, #{retryDeadLetter.uniqueId,jdbcType=VARCHAR}, - #{retryDeadLetter.groupName,jdbcType=VARCHAR}, #{retryDeadLetter.sceneName,jdbcType=VARCHAR}, - #{retryDeadLetter.idempotentId,jdbcType=VARCHAR}, #{retryDeadLetter.bizNo,jdbcType=VARCHAR}, - #{retryDeadLetter.executorName,jdbcType=VARCHAR}, #{retryDeadLetter.argsStr,jdbcType=VARCHAR}, - #{retryDeadLetter.extAttrs,jdbcType=VARCHAR}, #{retryDeadLetter.createDt,jdbcType=TIMESTAMP} - FROM DUAL - - - - diff --git a/snail-job-datasource/snail-job-oracle-datasource/src/main/resources/oracle/mapper/RetrySummaryMapper.xml b/snail-job-datasource/snail-job-oracle-datasource/src/main/resources/oracle/mapper/RetrySummaryMapper.xml index 5d7f0854d..712d2a82a 100644 --- a/snail-job-datasource/snail-job-oracle-datasource/src/main/resources/oracle/mapper/RetrySummaryMapper.xml +++ b/snail-job-datasource/snail-job-oracle-datasource/src/main/resources/oracle/mapper/RetrySummaryMapper.xml @@ -2,24 +2,7 @@ - - INSERT INTO sj_retry_summary (namespace_id, group_name, scene_name, trigger_at, - running_num, finish_num, max_count_num, suspend_num) - - SELECT - #{item.namespaceId}, - #{item.groupName}, - #{item.sceneName}, - #{item.triggerAt}, - #{item.runningNum}, - #{item.finishNum}, - #{item.maxCountNum}, - #{item.suspendNum} - FROM DUAL - - - - + UPDATE sj_retry_summary SET running_num = #{item.runningNum}, 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 30d7f60f4..000000000 --- a/snail-job-datasource/snail-job-oracle-datasource/src/main/resources/oracle/mapper/RetryTaskLogMapper.xml +++ /dev/null @@ -1,18 +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-oracle-datasource/src/main/resources/oracle/mapper/RetryTaskLogMessageMapper.xml b/snail-job-datasource/snail-job-oracle-datasource/src/main/resources/oracle/mapper/RetryTaskLogMessageMapper.xml index ad60405e0..4baa7e444 100644 --- a/snail-job-datasource/snail-job-oracle-datasource/src/main/resources/oracle/mapper/RetryTaskLogMessageMapper.xml +++ b/snail-job-datasource/snail-job-oracle-datasource/src/main/resources/oracle/mapper/RetryTaskLogMessageMapper.xml @@ -2,22 +2,6 @@ - - INSERT INTO sj_retry_task_log_message (namespace_id, group_name, unique_id, log_num, message, - create_dt, real_time) - - SELECT - #{item.namespaceId}, - #{item.groupName}, - #{item.uniqueId}, - #{item.logNum}, - #{item.message}, - #{item.createDt}, - #{item.realTime} - FROM DUAL - - - UPDATE sj_retry_task_log_message 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/RetryTaskMapper.xml index 2c4f4d2ac..28af87c18 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/RetryTaskMapper.xml @@ -2,19 +2,6 @@ - - - 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) - - 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} - FROM DUAL - - - UPDATE sj_retry_task_${partition} @@ -22,4 +9,5 @@ WHERE id = #{item.id} + diff --git a/snail-job-datasource/snail-job-oracle-datasource/src/main/resources/oracle/mapper/ServerNodeMapper.xml b/snail-job-datasource/snail-job-oracle-datasource/src/main/resources/oracle/mapper/ServerNodeMapper.xml index 08b33fc43..92f29cfa8 100644 --- a/snail-job-datasource/snail-job-oracle-datasource/src/main/resources/oracle/mapper/ServerNodeMapper.xml +++ b/snail-job-datasource/snail-job-oracle-datasource/src/main/resources/oracle/mapper/ServerNodeMapper.xml @@ -2,25 +2,6 @@ - - - INSERT INTO sj_server_node (namespace_id, group_name, host_id, host_ip, host_port, - expire_at, node_type, ext_attrs, create_dt) - - SELECT - #{item.namespaceId,jdbcType=VARCHAR}, - #{item.groupName,jdbcType=VARCHAR}, - #{item.hostId,jdbcType=VARCHAR}, - #{item.hostIp,jdbcType=VARCHAR}, - #{item.hostPort,jdbcType=INTEGER}, - #{item.expireAt,jdbcType=TIMESTAMP}, - #{item.nodeType,jdbcType=TINYINT}, - #{item.extAttrs,jdbcType=VARCHAR}, - #{item.createDt,jdbcType=TIMESTAMP} - FROM DUAL - - - UPDATE sj_server_node diff --git a/snail-job-datasource/snail-job-postgres-datasource/src/main/resources/postgresql/mapper/JobLogMessageMapper.xml b/snail-job-datasource/snail-job-postgres-datasource/src/main/resources/postgresql/mapper/JobLogMessageMapper.xml deleted file mode 100644 index ea9d5a862..000000000 --- a/snail-job-datasource/snail-job-postgres-datasource/src/main/resources/postgresql/mapper/JobLogMessageMapper.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - INSERT INTO sj_job_log_message (namespace_id, group_name, job_id, task_batch_id, task_id, log_num, - message, create_dt, real_time) - VALUES - - ( - #{item.namespaceId}, - #{item.groupName}, - #{item.jobId}, - #{item.taskBatchId}, - #{item.taskId}, - #{item.logNum}, - #{item.message}, - #{item.createDt}, - #{item.realTime} - ) - - - - diff --git a/snail-job-datasource/snail-job-postgres-datasource/src/main/resources/postgresql/mapper/JobSummaryMapper.xml b/snail-job-datasource/snail-job-postgres-datasource/src/main/resources/postgresql/mapper/JobSummaryMapper.xml index 596923e34..cc91ee8dc 100644 --- a/snail-job-datasource/snail-job-postgres-datasource/src/main/resources/postgresql/mapper/JobSummaryMapper.xml +++ b/snail-job-datasource/snail-job-postgres-datasource/src/main/resources/postgresql/mapper/JobSummaryMapper.xml @@ -2,28 +2,6 @@ - - INSERT INTO sj_job_summary (namespace_id, group_name, business_id, trigger_at, system_task_type, - success_num,fail_num,fail_reason,stop_num,stop_reason, cancel_num,cancel_reason) - VALUES - - ( - #{item.namespaceId}, - #{item.groupName}, - #{item.businessId}, - #{item.triggerAt}, - #{item.systemTaskType}, - #{item.successNum}, - #{item.failNum}, - #{item.failReason}, - #{item.stopNum}, - #{item.stopReason}, - #{item.cancelNum}, - #{item.cancelReason} - ) - - - UPDATE sj_job_summary AS rt SET success_num = tt.success_num, 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 deleted file mode 100644 index 55a094f1e..000000000 --- a/snail-job-datasource/snail-job-postgres-datasource/src/main/resources/postgresql/mapper/RetryDeadLetterMapper.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - INSERT INTO sj_retry_dead_letter (namespace_id, unique_id, group_name, scene_name, - idempotent_id, biz_no, executor_name, args_str, - ext_attrs, create_dt) - VALUES - - ( - #{retryDeadLetter.namespaceId,jdbcType=VARCHAR}, #{retryDeadLetter.uniqueId,jdbcType=VARCHAR}, - #{retryDeadLetter.groupName,jdbcType=VARCHAR}, #{retryDeadLetter.sceneName,jdbcType=VARCHAR}, - #{retryDeadLetter.idempotentId,jdbcType=VARCHAR}, #{retryDeadLetter.bizNo,jdbcType=VARCHAR}, - #{retryDeadLetter.executorName,jdbcType=VARCHAR}, #{retryDeadLetter.argsStr,jdbcType=VARCHAR}, - #{retryDeadLetter.extAttrs,jdbcType=VARCHAR}, #{retryDeadLetter.createDt,jdbcType=TIMESTAMP} - ) - - - - diff --git a/snail-job-datasource/snail-job-postgres-datasource/src/main/resources/postgresql/mapper/RetrySummaryMapper.xml b/snail-job-datasource/snail-job-postgres-datasource/src/main/resources/postgresql/mapper/RetrySummaryMapper.xml index 52315f965..591a5605e 100644 --- a/snail-job-datasource/snail-job-postgres-datasource/src/main/resources/postgresql/mapper/RetrySummaryMapper.xml +++ b/snail-job-datasource/snail-job-postgres-datasource/src/main/resources/postgresql/mapper/RetrySummaryMapper.xml @@ -2,24 +2,6 @@ - - INSERT INTO sj_retry_summary (namespace_id, group_name, scene_name, trigger_at, - running_num, finish_num, max_count_num, suspend_num) - VALUES - - ( - #{item.namespaceId}, - #{item.groupName}, - #{item.sceneName}, - #{item.triggerAt}, - #{item.runningNum}, - #{item.finishNum}, - #{item.maxCountNum}, - #{item.suspendNum} - ) - - - UPDATE sj_retry_summary AS rt SET running_num = tt.running_num, 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 a44588c96..000000000 --- a/snail-job-datasource/snail-job-postgres-datasource/src/main/resources/postgresql/mapper/RetryTaskLogMapper.xml +++ /dev/null @@ -1,19 +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-postgres-datasource/src/main/resources/postgresql/mapper/RetryTaskLogMessageMapper.xml b/snail-job-datasource/snail-job-postgres-datasource/src/main/resources/postgresql/mapper/RetryTaskLogMessageMapper.xml index c9eeff64c..6f6a83f11 100644 --- a/snail-job-datasource/snail-job-postgres-datasource/src/main/resources/postgresql/mapper/RetryTaskLogMessageMapper.xml +++ b/snail-job-datasource/snail-job-postgres-datasource/src/main/resources/postgresql/mapper/RetryTaskLogMessageMapper.xml @@ -2,23 +2,6 @@ - - INSERT INTO sj_retry_task_log_message (namespace_id, group_name, unique_id, log_num, message, - create_dt, real_time) - VALUES - - ( - #{item.namespaceId}, - #{item.groupName}, - #{item.uniqueId}, - #{item.logNum}, - #{item.message}, - #{item.createDt}, - #{item.realTime} - ) - - - UPDATE sj_retry_task_log_message rt, ( 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/RetryTaskMapper.xml index 69071c03f..8eff6f325 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/RetryTaskMapper.xml @@ -2,21 +2,6 @@ - - - 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) - 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} AS rt SET next_trigger_at = tt.next_trigger_at @@ -29,4 +14,5 @@ ) AS tt WHERE rt.id = tt.id + diff --git a/snail-job-datasource/snail-job-postgres-datasource/src/main/resources/postgresql/mapper/ServerNodeMapper.xml b/snail-job-datasource/snail-job-postgres-datasource/src/main/resources/postgresql/mapper/ServerNodeMapper.xml index 29768c82b..4efad6eef 100644 --- a/snail-job-datasource/snail-job-postgres-datasource/src/main/resources/postgresql/mapper/ServerNodeMapper.xml +++ b/snail-job-datasource/snail-job-postgres-datasource/src/main/resources/postgresql/mapper/ServerNodeMapper.xml @@ -2,25 +2,6 @@ - - INSERT INTO sj_server_node (namespace_id, group_name, host_id, host_ip, host_port, - expire_at, node_type, ext_attrs, create_dt) - VALUES - - ( - #{item.namespaceId,jdbcType=VARCHAR}, - #{item.groupName,jdbcType=VARCHAR}, - #{item.hostId,jdbcType=VARCHAR}, - #{item.hostIp,jdbcType=VARCHAR}, - #{item.hostPort,jdbcType=INTEGER}, - #{item.expireAt,jdbcType=TIMESTAMP}, - #{item.nodeType,jdbcType=TINYINT}, - #{item.extAttrs,jdbcType=VARCHAR}, - #{item.createDt,jdbcType=TIMESTAMP} - ) - - - UPDATE sj_server_node AS rt SET expire_at = tt.expire_at diff --git a/snail-job-datasource/snail-job-sqlserver-datasource/src/main/resources/sqlserver/mapper/JobLogMessageMapper.xml b/snail-job-datasource/snail-job-sqlserver-datasource/src/main/resources/sqlserver/mapper/JobLogMessageMapper.xml deleted file mode 100644 index d115040a5..000000000 --- a/snail-job-datasource/snail-job-sqlserver-datasource/src/main/resources/sqlserver/mapper/JobLogMessageMapper.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - INSERT INTO sj_job_log_message (namespace_id, group_name, job_id, task_batch_id, task_id, - log_num, message, create_dt, real_time) - VALUES - - ( - #{item.namespaceId}, - #{item.groupName}, - #{item.jobId}, - #{item.taskBatchId}, - #{item.taskId}, - #{item.logNum}, - #{item.message}, - #{item.createDt}, - #{item.realTime} - ) - - - diff --git a/snail-job-datasource/snail-job-sqlserver-datasource/src/main/resources/sqlserver/mapper/JobSummaryMapper.xml b/snail-job-datasource/snail-job-sqlserver-datasource/src/main/resources/sqlserver/mapper/JobSummaryMapper.xml index 0c793fa86..f37c883e1 100644 --- a/snail-job-datasource/snail-job-sqlserver-datasource/src/main/resources/sqlserver/mapper/JobSummaryMapper.xml +++ b/snail-job-datasource/snail-job-sqlserver-datasource/src/main/resources/sqlserver/mapper/JobSummaryMapper.xml @@ -2,28 +2,6 @@ - - INSERT INTO sj_job_summary (namespace_id, group_name, business_id, trigger_at, system_task_type, - success_num,fail_num,fail_reason,stop_num,stop_reason, cancel_num,cancel_reason) - VALUES - - ( - #{item.namespaceId}, - #{item.groupName}, - #{item.businessId}, - #{item.triggerAt}, - #{item.systemTaskType}, - #{item.successNum}, - #{item.failNum}, - #{item.failReason}, - #{item.stopNum}, - #{item.stopReason}, - #{item.cancelNum}, - #{item.cancelReason} - ) - - - UPDATE sj_job_summary SET success_num = src.success_num, 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 deleted file mode 100644 index 1b2ce995a..000000000 --- a/snail-job-datasource/snail-job-sqlserver-datasource/src/main/resources/sqlserver/mapper/RetryDeadLetterMapper.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - INSERT INTO sj_retry_dead_letter (namespace_id, unique_id, group_name, scene_name, - idempotent_id, biz_no, executor_name, args_str, - ext_attrs, create_dt) - VALUES - - ( - #{retryDeadLetter.namespaceId,jdbcType=VARCHAR}, - #{retryDeadLetter.uniqueId,jdbcType=VARCHAR}, - #{retryDeadLetter.groupName,jdbcType=VARCHAR}, - #{retryDeadLetter.sceneName,jdbcType=VARCHAR}, - #{retryDeadLetter.idempotentId,jdbcType=VARCHAR}, - #{retryDeadLetter.bizNo,jdbcType=VARCHAR}, - #{retryDeadLetter.executorName,jdbcType=VARCHAR}, - #{retryDeadLetter.argsStr,jdbcType=VARCHAR}, - #{retryDeadLetter.extAttrs,jdbcType=VARCHAR}, - #{retryDeadLetter.createDt,jdbcType=TIMESTAMP} - ) - - - - diff --git a/snail-job-datasource/snail-job-sqlserver-datasource/src/main/resources/sqlserver/mapper/RetrySummaryMapper.xml b/snail-job-datasource/snail-job-sqlserver-datasource/src/main/resources/sqlserver/mapper/RetrySummaryMapper.xml index b669c2203..fd720d3f5 100644 --- a/snail-job-datasource/snail-job-sqlserver-datasource/src/main/resources/sqlserver/mapper/RetrySummaryMapper.xml +++ b/snail-job-datasource/snail-job-sqlserver-datasource/src/main/resources/sqlserver/mapper/RetrySummaryMapper.xml @@ -2,24 +2,6 @@ - - INSERT INTO sj_retry_summary (namespace_id, group_name, scene_name, trigger_at, - running_num, finish_num, max_count_num, suspend_num) - VALUES - - ( - #{item.namespaceId}, - #{item.groupName}, - #{item.sceneName}, - #{item.triggerAt}, - #{item.runningNum}, - #{item.finishNum}, - #{item.maxCountNum}, - #{item.suspendNum} - ) - - - UPDATE sj_retry_summary SET running_num = src.running_num, @@ -30,14 +12,14 @@ JOIN ( SELECT - #{item.runningNum} AS running_num, - #{item.finishNum} AS finish_num, - #{item.maxCountNum} AS max_count_num, - #{item.suspendNum} AS suspend_num, - #{item.triggerAt} AS trigger_at, - #{item.sceneName} AS scene_name, - #{item.namespaceId} AS namespace_id, - #{item.groupName} AS group_name + #{item.runningNum} AS running_num, + #{item.finishNum} AS finish_num, + #{item.maxCountNum} AS max_count_num, + #{item.suspendNum} AS suspend_num, + #{item.triggerAt} AS trigger_at, + #{item.sceneName} AS scene_name, + #{item.namespaceId} AS namespace_id, + #{item.groupName} AS group_name ) AS src ON (dest.trigger_at = src.trigger_at AND dest.group_name = src.group_name 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 a44588c96..000000000 --- a/snail-job-datasource/snail-job-sqlserver-datasource/src/main/resources/sqlserver/mapper/RetryTaskLogMapper.xml +++ /dev/null @@ -1,19 +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/RetryTaskLogMessageMapper.xml b/snail-job-datasource/snail-job-sqlserver-datasource/src/main/resources/sqlserver/mapper/RetryTaskLogMessageMapper.xml index 8053c5296..ab28b0c22 100644 --- a/snail-job-datasource/snail-job-sqlserver-datasource/src/main/resources/sqlserver/mapper/RetryTaskLogMessageMapper.xml +++ b/snail-job-datasource/snail-job-sqlserver-datasource/src/main/resources/sqlserver/mapper/RetryTaskLogMessageMapper.xml @@ -2,24 +2,6 @@ - - - INSERT INTO sj_retry_task_log_message (namespace_id, group_name, unique_id, log_num, message, - create_dt, real_time) - VALUES - - ( - #{item.namespaceId}, - #{item.groupName}, - #{item.uniqueId}, - #{item.logNum}, - #{item.message}, - #{item.createDt}, - #{item.realTime} - ) - - - UPDATE sj_retry_task_log_message SET message = src.message, log_num = src.log_num 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/RetryTaskMapper.xml index 15f1a878f..db5a0cdfe 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/RetryTaskMapper.xml @@ -2,29 +2,6 @@ - - - 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) - 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} SET next_trigger_at = src.next_trigger_at @@ -37,4 +14,5 @@ ) AS src ON target.id = src.id; + diff --git a/snail-job-datasource/snail-job-sqlserver-datasource/src/main/resources/sqlserver/mapper/ServerNodeMapper.xml b/snail-job-datasource/snail-job-sqlserver-datasource/src/main/resources/sqlserver/mapper/ServerNodeMapper.xml index 370ade79b..fd6b05b71 100644 --- a/snail-job-datasource/snail-job-sqlserver-datasource/src/main/resources/sqlserver/mapper/ServerNodeMapper.xml +++ b/snail-job-datasource/snail-job-sqlserver-datasource/src/main/resources/sqlserver/mapper/ServerNodeMapper.xml @@ -2,25 +2,6 @@ - - INSERT INTO sj_server_node (namespace_id, group_name, host_id, host_ip, host_port, - expire_at, node_type, ext_attrs, create_dt) - VALUES - - ( - #{item.namespaceId,jdbcType=VARCHAR}, - #{item.groupName,jdbcType=VARCHAR}, - #{item.hostId,jdbcType=VARCHAR}, - #{item.hostIp,jdbcType=VARCHAR}, - #{item.hostPort,jdbcType=INTEGER}, - #{item.expireAt,jdbcType=TIMESTAMP}, - #{item.nodeType,jdbcType=TINYINT}, - #{item.extAttrs,jdbcType=VARCHAR}, - #{item.createDt,jdbcType=TIMESTAMP} - ) - - - UPDATE sj_server_node SET expire_at = src.expire_at