From be9bdefc4daa3348279a2335fb21ccef886d7a04 Mon Sep 17 00:00:00 2001 From: dhb52 Date: Mon, 18 Mar 2024 23:52:07 +0800 Subject: [PATCH] =?UTF-8?q?style:=20=E6=A0=BC=E5=BC=8F=E5=8C=96SQL?= =?UTF-8?q?=E8=84=9A=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../oracle/mapper/JobLogMessageMapper.xml | 29 +++++++-------- .../resources/oracle/mapper/JobMapper.xml | 4 +-- .../oracle/mapper/JobNotifyConfigMapper.xml | 26 +++++++------- .../oracle/mapper/JobSummaryMapper.xml | 7 ++-- .../oracle/mapper/JobTaskBatchMapper.xml | 35 ++++++++++++------- .../oracle/mapper/RetryDeadLetterMapper.xml | 32 ++++++++++------- .../oracle/mapper/RetrySummaryMapper.xml | 24 ++++++------- .../oracle/mapper/RetryTaskLogMapper.xml | 17 +++++---- .../oracle/mapper/RetryTaskMapper.xml | 11 ++++-- .../oracle/mapper/SceneConfigMapper.xml | 1 + .../oracle/mapper/SequenceAllocMapper.xml | 8 ++--- .../oracle/mapper/ServerNodeMapper.xml | 25 +++++++------ .../oracle/mapper/WorkflowMapper.xml | 5 ++- .../oracle/mapper/WorkflowTaskBatchMapper.xml | 16 +++++---- 14 files changed, 138 insertions(+), 102 deletions(-) diff --git a/easy-retry-datasource/easy-retry-oracle-datasource/src/main/resources/oracle/mapper/JobLogMessageMapper.xml b/easy-retry-datasource/easy-retry-oracle-datasource/src/main/resources/oracle/mapper/JobLogMessageMapper.xml index d935a181..8ce99158 100644 --- a/easy-retry-datasource/easy-retry-oracle-datasource/src/main/resources/oracle/mapper/JobLogMessageMapper.xml +++ b/easy-retry-datasource/easy-retry-oracle-datasource/src/main/resources/oracle/mapper/JobLogMessageMapper.xml @@ -15,23 +15,24 @@ + INSERT INTO job_log_message (namespace_id, group_name, job_id, task_batch_id, task_id, log_num, message, - create_dt, real_time) + create_dt, real_time) VALUES - - ( - #{item.namespaceId}, - #{item.groupName}, - #{item.jobId}, - #{item.taskBatchId}, - #{item.taskId}, - #{item.logNum}, - #{item.message}, - #{item.createDt}, - #{item.realTime} - ) - + + ( + #{item.namespaceId}, + #{item.groupName}, + #{item.jobId}, + #{item.taskBatchId}, + #{item.taskId}, + #{item.logNum}, + #{item.message}, + #{item.createDt}, + #{item.realTime} + ) + diff --git a/easy-retry-datasource/easy-retry-oracle-datasource/src/main/resources/oracle/mapper/JobMapper.xml b/easy-retry-datasource/easy-retry-oracle-datasource/src/main/resources/oracle/mapper/JobMapper.xml index 15df4528..a3fe9943 100644 --- a/easy-retry-datasource/easy-retry-oracle-datasource/src/main/resources/oracle/mapper/JobMapper.xml +++ b/easy-retry-datasource/easy-retry-oracle-datasource/src/main/resources/oracle/mapper/JobMapper.xml @@ -31,8 +31,8 @@ USING ( SELECT - #{item.nextTriggerAt} AS next_trigger_at, - #{item.id} AS id + #{item.nextTriggerAt} AS next_trigger_at, + #{item.id} AS id FROM DUAL ) src diff --git a/easy-retry-datasource/easy-retry-oracle-datasource/src/main/resources/oracle/mapper/JobNotifyConfigMapper.xml b/easy-retry-datasource/easy-retry-oracle-datasource/src/main/resources/oracle/mapper/JobNotifyConfigMapper.xml index 751e37b8..a5fb2470 100644 --- a/easy-retry-datasource/easy-retry-oracle-datasource/src/main/resources/oracle/mapper/JobNotifyConfigMapper.xml +++ b/easy-retry-datasource/easy-retry-oracle-datasource/src/main/resources/oracle/mapper/JobNotifyConfigMapper.xml @@ -25,19 +25,21 @@ diff --git a/easy-retry-datasource/easy-retry-oracle-datasource/src/main/resources/oracle/mapper/JobSummaryMapper.xml b/easy-retry-datasource/easy-retry-oracle-datasource/src/main/resources/oracle/mapper/JobSummaryMapper.xml index 9dbe252c..d20d7291 100644 --- a/easy-retry-datasource/easy-retry-oracle-datasource/src/main/resources/oracle/mapper/JobSummaryMapper.xml +++ b/easy-retry-datasource/easy-retry-oracle-datasource/src/main/resources/oracle/mapper/JobSummaryMapper.xml @@ -39,7 +39,8 @@ ) src ON (dest.job_id = src.job_id AND dest.trigger_at = src.trigger_at) WHEN MATCHED THEN - SET dest.success_num = src.success_num, + UPDATE SET + dest.success_num = src.success_num, dest.fail_num = src.fail_num, dest.fail_reason = src.fail_reason, dest.stop_num = src.stop_num, @@ -47,7 +48,7 @@ dest.cancel_num = src.cancel_num, dest.cancel_reason = src.cancel_reason WHEN NOT MATCHED THEN - INSERT job_summary (namespace_id, group_name, job_id, trigger_at, + INSERT (namespace_id, group_name, job_id, trigger_at, success_num,fail_num,fail_reason,stop_num,stop_reason, cancel_num,cancel_reason) VALUES @@ -167,7 +168,7 @@ resultType="com.aizuda.easy.retry.template.datasource.persistence.dataobject.DashboardRetryLineResponseDO$Task"> SELECT group_name AS groupName, SUM(CASE WHEN (job_status = 1) THEN 1 ELSE 0 END) AS run, - count(*) AS total + COUNT(*) AS total FROM job WHERE namespace_id = #{namespaceId} diff --git a/easy-retry-datasource/easy-retry-oracle-datasource/src/main/resources/oracle/mapper/JobTaskBatchMapper.xml b/easy-retry-datasource/easy-retry-oracle-datasource/src/main/resources/oracle/mapper/JobTaskBatchMapper.xml index 1364b047..16a0198f 100644 --- a/easy-retry-datasource/easy-retry-oracle-datasource/src/main/resources/oracle/mapper/JobTaskBatchMapper.xml +++ b/easy-retry-datasource/easy-retry-oracle-datasource/src/main/resources/oracle/mapper/JobTaskBatchMapper.xml @@ -13,32 +13,34 @@ + + + diff --git a/easy-retry-datasource/easy-retry-oracle-datasource/src/main/resources/oracle/mapper/RetryDeadLetterMapper.xml b/easy-retry-datasource/easy-retry-oracle-datasource/src/main/resources/oracle/mapper/RetryDeadLetterMapper.xml index 528c39e8..8779e06c 100644 --- a/easy-retry-datasource/easy-retry-oracle-datasource/src/main/resources/oracle/mapper/RetryDeadLetterMapper.xml +++ b/easy-retry-datasource/easy-retry-oracle-datasource/src/main/resources/oracle/mapper/RetryDeadLetterMapper.xml @@ -15,25 +15,31 @@ + id, namespace_id, unique_id, group_name, scene_name, idempotent_id, biz_no, executor_name, args_str, ext_attrs, create_dt, task_type + - insert into 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}) - + INSERT INTO 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/easy-retry-datasource/easy-retry-oracle-datasource/src/main/resources/oracle/mapper/RetrySummaryMapper.xml b/easy-retry-datasource/easy-retry-oracle-datasource/src/main/resources/oracle/mapper/RetrySummaryMapper.xml index 758bce07..62a332d3 100644 --- a/easy-retry-datasource/easy-retry-oracle-datasource/src/main/resources/oracle/mapper/RetrySummaryMapper.xml +++ b/easy-retry-datasource/easy-retry-oracle-datasource/src/main/resources/oracle/mapper/RetrySummaryMapper.xml @@ -36,25 +36,25 @@ AND dest.scene_name = src.scene_name AND dest.trigger_at = src.trigger_at) WHEN MATCHED THEN - SET dest.running_num = src.running_num, + UPDATE SET + dest.running_num = src.running_num, dest.finish_num = src.finish_num, dest.max_count_num = src.max_count_num, dest.suspend_num = src.suspend_num WHEN NOT MATCHED THEN - INSERT - retry_summary (namespace_id, group_name, scene_name, trigger_at, - running_num, finish_num, max_count_num, suspend_num) + INSERT (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} + #{item.namespaceId}, + #{item.groupName}, + #{item.sceneName}, + #{item.triggerAt}, + #{item.runningNum}, + #{item.finishNum}, + #{item.maxCountNum}, + #{item.suspendNum} ) diff --git a/easy-retry-datasource/easy-retry-oracle-datasource/src/main/resources/oracle/mapper/RetryTaskLogMapper.xml b/easy-retry-datasource/easy-retry-oracle-datasource/src/main/resources/oracle/mapper/RetryTaskLogMapper.xml index d476c178..1f55ac10 100644 --- a/easy-retry-datasource/easy-retry-oracle-datasource/src/main/resources/oracle/mapper/RetryTaskLogMapper.xml +++ b/easy-retry-datasource/easy-retry-oracle-datasource/src/main/resources/oracle/mapper/RetryTaskLogMapper.xml @@ -16,20 +16,23 @@ + - id - , unique_id, group_name, scene_name, idempotent_id, biz_no, executor_name, args_str, ext_attrs, retry_status, - create_dt, task_type, namespace_id + id, unique_id, group_name, scene_name, idempotent_id, biz_no, executor_name, args_str, ext_attrs, retry_status, + create_dt, task_type, namespace_id + INSERT INTO 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) + 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}) + ( + #{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/easy-retry-datasource/easy-retry-oracle-datasource/src/main/resources/oracle/mapper/RetryTaskMapper.xml b/easy-retry-datasource/easy-retry-oracle-datasource/src/main/resources/oracle/mapper/RetryTaskMapper.xml index 7e2089e0..cbf87f98 100644 --- a/easy-retry-datasource/easy-retry-oracle-datasource/src/main/resources/oracle/mapper/RetryTaskMapper.xml +++ b/easy-retry-datasource/easy-retry-oracle-datasource/src/main/resources/oracle/mapper/RetryTaskMapper.xml @@ -19,16 +19,23 @@ + id, namespace_id, unique_id, group_name, scene_name, idempotent_id, biz_no, executor_name, args_str, ext_attrs, next_trigger_at, retry_count, retry_status, create_dt, update_dt, task_type + - INSERT INTO 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 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}) + ( + #{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} + ) diff --git a/easy-retry-datasource/easy-retry-oracle-datasource/src/main/resources/oracle/mapper/SceneConfigMapper.xml b/easy-retry-datasource/easy-retry-oracle-datasource/src/main/resources/oracle/mapper/SceneConfigMapper.xml index 4158a513..cad5f79e 100644 --- a/easy-retry-datasource/easy-retry-oracle-datasource/src/main/resources/oracle/mapper/SceneConfigMapper.xml +++ b/easy-retry-datasource/easy-retry-oracle-datasource/src/main/resources/oracle/mapper/SceneConfigMapper.xml @@ -14,6 +14,7 @@ + id, scene_name, group_name, scene_status, max_retry_count, back_off, trigger_interval, deadline_request, description, create_dt, update_dt diff --git a/easy-retry-datasource/easy-retry-oracle-datasource/src/main/resources/oracle/mapper/SequenceAllocMapper.xml b/easy-retry-datasource/easy-retry-oracle-datasource/src/main/resources/oracle/mapper/SequenceAllocMapper.xml index 2131f9cd..6461e8d6 100644 --- a/easy-retry-datasource/easy-retry-oracle-datasource/src/main/resources/oracle/mapper/SequenceAllocMapper.xml +++ b/easy-retry-datasource/easy-retry-oracle-datasource/src/main/resources/oracle/mapper/SequenceAllocMapper.xml @@ -13,13 +13,13 @@ UPDATE sequence_alloc - SET max_id = max_id + #{step}, update_dt = now() - WHERE group_name = #{groupName} and namespace_id = #{namespaceId} + SET max_id = max_id + #{step}, update_dt = CURRENT_TIMESTAMP + WHERE group_name = #{groupName} AND namespace_id = #{namespaceId} UPDATE sequence_alloc - SET max_id = max_id + step, update_dt = now() - WHERE group_name = #{groupName} and namespace_id = #{namespaceId} + SET max_id = max_id + step, update_dt = CURRENT_TIMESTAMP + WHERE group_name = #{groupName} AND namespace_id = #{namespaceId} diff --git a/easy-retry-datasource/easy-retry-oracle-datasource/src/main/resources/oracle/mapper/ServerNodeMapper.xml b/easy-retry-datasource/easy-retry-oracle-datasource/src/main/resources/oracle/mapper/ServerNodeMapper.xml index f88caca2..eaa51a6e 100644 --- a/easy-retry-datasource/easy-retry-oracle-datasource/src/main/resources/oracle/mapper/ServerNodeMapper.xml +++ b/easy-retry-datasource/easy-retry-oracle-datasource/src/main/resources/oracle/mapper/ServerNodeMapper.xml @@ -47,26 +47,29 @@ 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.contextPath,jdbcType=VARCHAR}, #{item.createDt,jdbcType=TIMESTAMP}) + #{item.hostPort,jdbcType=INTEGER}, #{item.expireAt,jdbcType=TIMESTAMP}, #{item.nodeType,jdbcType=TINYINT}, + #{item.extAttrs,jdbcType=VARCHAR}, #{item.contextPath,jdbcType=VARCHAR}, #{item.createDt,jdbcType=TIMESTAMP}) - delete - from server_node - where expire_at <= #{endTime,jdbcType=TIMESTAMP} + DELETE + FROM server_node + WHERE expire_at <= #{endTime,jdbcType=TIMESTAMP} diff --git a/easy-retry-datasource/easy-retry-oracle-datasource/src/main/resources/oracle/mapper/WorkflowMapper.xml b/easy-retry-datasource/easy-retry-oracle-datasource/src/main/resources/oracle/mapper/WorkflowMapper.xml index b7d6ba46..d8e73012 100644 --- a/easy-retry-datasource/easy-retry-oracle-datasource/src/main/resources/oracle/mapper/WorkflowMapper.xml +++ b/easy-retry-datasource/easy-retry-oracle-datasource/src/main/resources/oracle/mapper/WorkflowMapper.xml @@ -28,8 +28,7 @@ ) src ON (dest.id = src.id) WHEN MATCHED THEN - UPDATE SET dest.next_trigger_at = src.next_trigger_at + UPDATE SET + dest.next_trigger_at = src.next_trigger_at - - diff --git a/easy-retry-datasource/easy-retry-oracle-datasource/src/main/resources/oracle/mapper/WorkflowTaskBatchMapper.xml b/easy-retry-datasource/easy-retry-oracle-datasource/src/main/resources/oracle/mapper/WorkflowTaskBatchMapper.xml index 9b59b27d..0829cf9b 100644 --- a/easy-retry-datasource/easy-retry-oracle-datasource/src/main/resources/oracle/mapper/WorkflowTaskBatchMapper.xml +++ b/easy-retry-datasource/easy-retry-oracle-datasource/src/main/resources/oracle/mapper/WorkflowTaskBatchMapper.xml @@ -16,31 +16,33 @@ +