diff --git a/snail-job-datasource/snail-job-datasource-template/src/main/resources/template/mapper/JobLogMessageMapper.xml b/snail-job-datasource/snail-job-datasource-template/src/main/resources/template/mapper/JobLogMessageMapper.xml deleted file mode 100644 index f21a7502..00000000 --- a/snail-job-datasource/snail-job-datasource-template/src/main/resources/template/mapper/JobLogMessageMapper.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - #{item.namespaceId}, - #{item.groupName}, - #{item.jobId}, - #{item.taskBatchId}, - #{item.taskId}, - #{item.logNum}, - #{item.message}, - #{item.createDt}, - #{item.realTime} - - - - 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 - - - - - - - SELECT - - FROM DUAL - - - - - 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 1b4aba04..1aa85763 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,39 +2,6 @@ - - #{item.namespaceId}, - #{item.groupName}, - #{item.businessId}, - #{item.triggerAt}, - #{item.systemTaskType}, - #{item.successNum}, - #{item.failNum}, - #{item.failReason}, - #{item.stopNum}, - #{item.stopReason}, - #{item.cancelNum}, - #{item.cancelReason} - - - - 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 - - - - - - - SELECT - - FROM DUAL - - - - 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 47f53e8f..be7a450a 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,39 +2,6 @@ - - #{item.uniqueId}, - #{item.groupName}, - #{item.sceneName}, - #{item.idempotentId}, - #{item.bizNo}, - #{item.executorName}, - #{item.argsStr}, - #{item.extAttrs}, - #{item.taskType}, - #{item.createDt}, - #{item.namespaceId} - - - - 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 - - - - - - - SELECT - - FROM DUAL - - - - - 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 new file mode 100644 index 00000000..c205fdf9 --- /dev/null +++ b/snail-job-datasource/snail-job-dm8-datasource/src/main/resources/dm/mapper/JobLogMessageMapper.xml @@ -0,0 +1,24 @@ + + + + + + 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 c6da109e..a39f09f3 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,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} + ) + + + UPDATE sj_job_summary diff --git a/snail-job-datasource/snail-job-dm8-datasource/src/main/resources/dm/mapper/JobTaskMapper.xml b/snail-job-datasource/snail-job-dm8-datasource/src/main/resources/dm/mapper/JobTaskMapper.xml new file mode 100644 index 00000000..8bbc243e --- /dev/null +++ b/snail-job-datasource/snail-job-dm8-datasource/src/main/resources/dm/mapper/JobTaskMapper.xml @@ -0,0 +1,34 @@ + + + + + + INSERT INTO sj_job_task (namespace_id, group_name, job_id, task_batch_id, parent_id, task_status, + retry_count, mr_stage, leaf, task_name, client_info, wf_context, args_str, + result_message, args_type, ext_attrs, create_dt, update_dt) + VALUES + + ( + #{item.namespaceId}, + #{item.groupName}, + #{item.jobId}, + #{item.taskBatchId}, + #{item.parentId}, + #{item.taskStatus}, + #{item.retryCount}, + #{item.mrStage}, + #{item.leaf}, + #{item.taskName}, + #{item.clientInfo}, + #{item.wfContext}, + #{item.argsStr}, + #{item.resultMessage}, + #{item.argsType}, + #{item.extAttrs}, + #{item.createDt}, + #{item.updateDt} + ) + + + + 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 new file mode 100644 index 00000000..0a1d1dec --- /dev/null +++ b/snail-job-datasource/snail-job-dm8-datasource/src/main/resources/dm/mapper/RetryDeadLetterMapper.xml @@ -0,0 +1,25 @@ + + + + + + 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 + + ( + #{item.namespaceId,jdbcType=VARCHAR}, + #{item.uniqueId,jdbcType=VARCHAR}, + #{item.groupName,jdbcType=VARCHAR}, + #{item.sceneName,jdbcType=VARCHAR}, + #{item.idempotentId,jdbcType=VARCHAR}, + #{item.bizNo,jdbcType=VARCHAR}, + #{item.executorName,jdbcType=VARCHAR}, + #{item.argsStr,jdbcType=VARCHAR}, + #{item.extAttrs,jdbcType=VARCHAR}, + #{item.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 6ccc037b..156b1b46 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,6 +2,24 @@ + + 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 new file mode 100644 index 00000000..f125d52e --- /dev/null +++ b/snail-job-datasource/snail-job-dm8-datasource/src/main/resources/dm/mapper/RetryTaskLogMapper.xml @@ -0,0 +1,26 @@ + + + + + + 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 61e81f84..6b226bb0 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,6 +2,23 @@ + + 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 2c904a37..deec3629 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,6 +2,19 @@ + + 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} @@ -10,5 +23,4 @@ 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 1e7a1b21..314eb4a7 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,6 +2,25 @@ + + 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-mariadb-datasource/src/main/resources/mariadb/mapper/JobLogMessageMapper.xml b/snail-job-datasource/snail-job-mariadb-datasource/src/main/resources/mariadb/mapper/JobLogMessageMapper.xml new file mode 100644 index 00000000..0ed00d3a --- /dev/null +++ b/snail-job-datasource/snail-job-mariadb-datasource/src/main/resources/mariadb/mapper/JobLogMessageMapper.xml @@ -0,0 +1,24 @@ + + + + + + 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-mariadb-datasource/src/main/resources/mariadb/mapper/JobMapper.xml b/snail-job-datasource/snail-job-mariadb-datasource/src/main/resources/mariadb/mapper/JobMapper.xml index 7b2d103b..342d148e 100644 --- a/snail-job-datasource/snail-job-mariadb-datasource/src/main/resources/mariadb/mapper/JobMapper.xml +++ b/snail-job-datasource/snail-job-mariadb-datasource/src/main/resources/mariadb/mapper/JobMapper.xml @@ -11,8 +11,8 @@ #{item.nextTriggerAt} AS next_trigger_at ) tt - SET rt.next_trigger_at = tt.next_trigger_at - WHERE rt.id = tt.id + SET rt.next_trigger_at = tt.next_trigger_at + WHERE rt.id = tt.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 96d870e7..efe4ead7 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,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} + ) + + + UPDATE sj_job_summary rt, ( diff --git a/snail-job-datasource/snail-job-mariadb-datasource/src/main/resources/mariadb/mapper/JobTaskMapper.xml b/snail-job-datasource/snail-job-mariadb-datasource/src/main/resources/mariadb/mapper/JobTaskMapper.xml new file mode 100644 index 00000000..8bbc243e --- /dev/null +++ b/snail-job-datasource/snail-job-mariadb-datasource/src/main/resources/mariadb/mapper/JobTaskMapper.xml @@ -0,0 +1,34 @@ + + + + + + INSERT INTO sj_job_task (namespace_id, group_name, job_id, task_batch_id, parent_id, task_status, + retry_count, mr_stage, leaf, task_name, client_info, wf_context, args_str, + result_message, args_type, ext_attrs, create_dt, update_dt) + VALUES + + ( + #{item.namespaceId}, + #{item.groupName}, + #{item.jobId}, + #{item.taskBatchId}, + #{item.parentId}, + #{item.taskStatus}, + #{item.retryCount}, + #{item.mrStage}, + #{item.leaf}, + #{item.taskName}, + #{item.clientInfo}, + #{item.wfContext}, + #{item.argsStr}, + #{item.resultMessage}, + #{item.argsType}, + #{item.extAttrs}, + #{item.createDt}, + #{item.updateDt} + ) + + + + 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 new file mode 100644 index 00000000..a15916ef --- /dev/null +++ b/snail-job-datasource/snail-job-mariadb-datasource/src/main/resources/mariadb/mapper/RetryDeadLetterMapper.xml @@ -0,0 +1,25 @@ + + + + + + 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 + + ( + #{item.namespaceId,jdbcType=VARCHAR}, + #{item.uniqueId,jdbcType=VARCHAR}, + #{item.groupName,jdbcType=VARCHAR}, + #{item.sceneName,jdbcType=VARCHAR}, + #{item.idempotentId,jdbcType=VARCHAR}, + #{item.bizNo,jdbcType=VARCHAR}, + #{item.executorName,jdbcType=VARCHAR}, + #{item.argsStr,jdbcType=VARCHAR}, + #{item.extAttrs,jdbcType=VARCHAR}, + #{item.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 8bf79c90..e3780ae5 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,6 +2,24 @@ + + 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 new file mode 100644 index 00000000..f125d52e --- /dev/null +++ b/snail-job-datasource/snail-job-mariadb-datasource/src/main/resources/mariadb/mapper/RetryTaskLogMapper.xml @@ -0,0 +1,26 @@ + + + + + + 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 c6b4b553..905d548d 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,6 +2,23 @@ + + 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 3a2327c1..cc23016e 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,6 +2,30 @@ + + 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, ( @@ -14,4 +38,5 @@ SET rt.next_trigger_at = tt.next_trigger_at WHERE rt.id = tt.id + 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 a059f005..8ba29fcd 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,6 +2,25 @@ + + 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/JobLogMessageMapper.xml b/snail-job-datasource/snail-job-mysql-datasource/src/main/resources/mysql/mapper/JobLogMessageMapper.xml new file mode 100644 index 00000000..0ed00d3a --- /dev/null +++ b/snail-job-datasource/snail-job-mysql-datasource/src/main/resources/mysql/mapper/JobLogMessageMapper.xml @@ -0,0 +1,24 @@ + + + + + + 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-mysql-datasource/src/main/resources/mysql/mapper/JobMapper.xml b/snail-job-datasource/snail-job-mysql-datasource/src/main/resources/mysql/mapper/JobMapper.xml index 7b2d103b..342d148e 100644 --- a/snail-job-datasource/snail-job-mysql-datasource/src/main/resources/mysql/mapper/JobMapper.xml +++ b/snail-job-datasource/snail-job-mysql-datasource/src/main/resources/mysql/mapper/JobMapper.xml @@ -11,8 +11,8 @@ #{item.nextTriggerAt} AS next_trigger_at ) tt - SET rt.next_trigger_at = tt.next_trigger_at - WHERE rt.id = tt.id + 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/JobSummaryMapper.xml b/snail-job-datasource/snail-job-mysql-datasource/src/main/resources/mysql/mapper/JobSummaryMapper.xml index 96d870e7..efe4ead7 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,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} + ) + + + UPDATE sj_job_summary rt, ( diff --git a/snail-job-datasource/snail-job-mysql-datasource/src/main/resources/mysql/mapper/JobTaskMapper.xml b/snail-job-datasource/snail-job-mysql-datasource/src/main/resources/mysql/mapper/JobTaskMapper.xml new file mode 100644 index 00000000..8bbc243e --- /dev/null +++ b/snail-job-datasource/snail-job-mysql-datasource/src/main/resources/mysql/mapper/JobTaskMapper.xml @@ -0,0 +1,34 @@ + + + + + + INSERT INTO sj_job_task (namespace_id, group_name, job_id, task_batch_id, parent_id, task_status, + retry_count, mr_stage, leaf, task_name, client_info, wf_context, args_str, + result_message, args_type, ext_attrs, create_dt, update_dt) + VALUES + + ( + #{item.namespaceId}, + #{item.groupName}, + #{item.jobId}, + #{item.taskBatchId}, + #{item.parentId}, + #{item.taskStatus}, + #{item.retryCount}, + #{item.mrStage}, + #{item.leaf}, + #{item.taskName}, + #{item.clientInfo}, + #{item.wfContext}, + #{item.argsStr}, + #{item.resultMessage}, + #{item.argsType}, + #{item.extAttrs}, + #{item.createDt}, + #{item.updateDt} + ) + + + + 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 new file mode 100644 index 00000000..a15916ef --- /dev/null +++ b/snail-job-datasource/snail-job-mysql-datasource/src/main/resources/mysql/mapper/RetryDeadLetterMapper.xml @@ -0,0 +1,25 @@ + + + + + + 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 + + ( + #{item.namespaceId,jdbcType=VARCHAR}, + #{item.uniqueId,jdbcType=VARCHAR}, + #{item.groupName,jdbcType=VARCHAR}, + #{item.sceneName,jdbcType=VARCHAR}, + #{item.idempotentId,jdbcType=VARCHAR}, + #{item.bizNo,jdbcType=VARCHAR}, + #{item.executorName,jdbcType=VARCHAR}, + #{item.argsStr,jdbcType=VARCHAR}, + #{item.extAttrs,jdbcType=VARCHAR}, + #{item.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 8bf79c90..e3780ae5 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,6 +2,24 @@ + + 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 new file mode 100644 index 00000000..f125d52e --- /dev/null +++ b/snail-job-datasource/snail-job-mysql-datasource/src/main/resources/mysql/mapper/RetryTaskLogMapper.xml @@ -0,0 +1,26 @@ + + + + + + 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 c6b4b553..905d548d 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,6 +2,23 @@ + + 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 97f82e3e..cc23016e 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,6 +2,30 @@ + + 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-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 a059f005..8ba29fcd 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,6 +2,25 @@ + + 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 new file mode 100644 index 00000000..e4d87047 --- /dev/null +++ b/snail-job-datasource/snail-job-oracle-datasource/src/main/resources/oracle/mapper/JobLogMessageMapper.xml @@ -0,0 +1,23 @@ + + + + + + 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 c6da109e..55b6961f 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,6 +2,27 @@ + + 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/JobTaskMapper.xml b/snail-job-datasource/snail-job-oracle-datasource/src/main/resources/oracle/mapper/JobTaskMapper.xml new file mode 100644 index 00000000..8363de02 --- /dev/null +++ b/snail-job-datasource/snail-job-oracle-datasource/src/main/resources/oracle/mapper/JobTaskMapper.xml @@ -0,0 +1,33 @@ + + + + + + INSERT INTO sj_job_task (namespace_id, group_name, job_id, task_batch_id, parent_id, task_status, + retry_count, mr_stage, leaf, task_name, client_info, wf_context, args_str, + result_message, args_type, ext_attrs, create_dt, update_dt) + + SELECT + #{item.namespaceId}, + #{item.groupName}, + #{item.jobId}, + #{item.taskBatchId}, + #{item.parentId}, + #{item.taskStatus}, + #{item.retryCount}, + #{item.mrStage}, + #{item.leaf}, + #{item.taskName}, + #{item.clientInfo}, + #{item.wfContext}, + #{item.argsStr}, + #{item.resultMessage}, + #{item.argsType}, + #{item.extAttrs}, + #{item.createDt}, + #{item.updateDt} + FROM DUAL + + + + 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 new file mode 100644 index 00000000..30f2a7a9 --- /dev/null +++ b/snail-job-datasource/snail-job-oracle-datasource/src/main/resources/oracle/mapper/RetryDeadLetterMapper.xml @@ -0,0 +1,24 @@ + + + + + + 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 + #{item.namespaceId,jdbcType=VARCHAR}, + #{item.uniqueId,jdbcType=VARCHAR}, + #{item.groupName,jdbcType=VARCHAR}, + #{item.sceneName,jdbcType=VARCHAR}, + #{item.idempotentId,jdbcType=VARCHAR}, + #{item.bizNo,jdbcType=VARCHAR}, + #{item.executorName,jdbcType=VARCHAR}, + #{item.argsStr,jdbcType=VARCHAR}, + #{item.extAttrs,jdbcType=VARCHAR}, + #{item.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 6b85ab64..f463ef7b 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,7 +2,24 @@ - + + 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 new file mode 100644 index 00000000..ffd83fd2 --- /dev/null +++ b/snail-job-datasource/snail-job-oracle-datasource/src/main/resources/oracle/mapper/RetryTaskLogMapper.xml @@ -0,0 +1,17 @@ + + + + + + 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 61e81f84..c37e50cb 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,6 +2,22 @@ + + 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 2c904a37..4d9951f5 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,6 +2,18 @@ + + 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} @@ -10,5 +22,4 @@ 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 1e7a1b21..b97e4483 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,6 +2,24 @@ + + 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-oracle-datasource/src/main/resources/oracle/mapper/WorkflowMapper.xml b/snail-job-datasource/snail-job-oracle-datasource/src/main/resources/oracle/mapper/WorkflowMapper.xml index 20c9436c..5b8ac1e9 100644 --- a/snail-job-datasource/snail-job-oracle-datasource/src/main/resources/oracle/mapper/WorkflowMapper.xml +++ b/snail-job-datasource/snail-job-oracle-datasource/src/main/resources/oracle/mapper/WorkflowMapper.xml @@ -10,4 +10,5 @@ WHERE id = #{item.id} + 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 new file mode 100644 index 00000000..c205fdf9 --- /dev/null +++ b/snail-job-datasource/snail-job-postgres-datasource/src/main/resources/postgresql/mapper/JobLogMessageMapper.xml @@ -0,0 +1,24 @@ + + + + + + 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 ecb5725d..eeb66251 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,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} + ) + + + 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/JobTaskMapper.xml b/snail-job-datasource/snail-job-postgres-datasource/src/main/resources/postgresql/mapper/JobTaskMapper.xml new file mode 100644 index 00000000..8bbc243e --- /dev/null +++ b/snail-job-datasource/snail-job-postgres-datasource/src/main/resources/postgresql/mapper/JobTaskMapper.xml @@ -0,0 +1,34 @@ + + + + + + INSERT INTO sj_job_task (namespace_id, group_name, job_id, task_batch_id, parent_id, task_status, + retry_count, mr_stage, leaf, task_name, client_info, wf_context, args_str, + result_message, args_type, ext_attrs, create_dt, update_dt) + VALUES + + ( + #{item.namespaceId}, + #{item.groupName}, + #{item.jobId}, + #{item.taskBatchId}, + #{item.parentId}, + #{item.taskStatus}, + #{item.retryCount}, + #{item.mrStage}, + #{item.leaf}, + #{item.taskName}, + #{item.clientInfo}, + #{item.wfContext}, + #{item.argsStr}, + #{item.resultMessage}, + #{item.argsType}, + #{item.extAttrs}, + #{item.createDt}, + #{item.updateDt} + ) + + + + 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 new file mode 100644 index 00000000..0a1d1dec --- /dev/null +++ b/snail-job-datasource/snail-job-postgres-datasource/src/main/resources/postgresql/mapper/RetryDeadLetterMapper.xml @@ -0,0 +1,25 @@ + + + + + + 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 + + ( + #{item.namespaceId,jdbcType=VARCHAR}, + #{item.uniqueId,jdbcType=VARCHAR}, + #{item.groupName,jdbcType=VARCHAR}, + #{item.sceneName,jdbcType=VARCHAR}, + #{item.idempotentId,jdbcType=VARCHAR}, + #{item.bizNo,jdbcType=VARCHAR}, + #{item.executorName,jdbcType=VARCHAR}, + #{item.argsStr,jdbcType=VARCHAR}, + #{item.extAttrs,jdbcType=VARCHAR}, + #{item.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 a94ce6dd..68f8a8a2 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,6 +2,24 @@ + + 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 new file mode 100644 index 00000000..f125d52e --- /dev/null +++ b/snail-job-datasource/snail-job-postgres-datasource/src/main/resources/postgresql/mapper/RetryTaskLogMapper.xml @@ -0,0 +1,26 @@ + + + + + + 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 c09eeb3d..7d020a05 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,6 +2,23 @@ + + 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 4c9bc35e..8ba3c7a1 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,6 +2,21 @@ + + + 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, @@ -15,5 +30,4 @@ ) 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 af84c9de..73344c11 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,6 +2,25 @@ + + 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 new file mode 100644 index 00000000..c205fdf9 --- /dev/null +++ b/snail-job-datasource/snail-job-sqlserver-datasource/src/main/resources/sqlserver/mapper/JobLogMessageMapper.xml @@ -0,0 +1,24 @@ + + + + + + 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 3518a2a5..5e67796b 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,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} + ) + + + 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/JobTaskMapper.xml b/snail-job-datasource/snail-job-sqlserver-datasource/src/main/resources/sqlserver/mapper/JobTaskMapper.xml new file mode 100644 index 00000000..8bbc243e --- /dev/null +++ b/snail-job-datasource/snail-job-sqlserver-datasource/src/main/resources/sqlserver/mapper/JobTaskMapper.xml @@ -0,0 +1,34 @@ + + + + + + INSERT INTO sj_job_task (namespace_id, group_name, job_id, task_batch_id, parent_id, task_status, + retry_count, mr_stage, leaf, task_name, client_info, wf_context, args_str, + result_message, args_type, ext_attrs, create_dt, update_dt) + VALUES + + ( + #{item.namespaceId}, + #{item.groupName}, + #{item.jobId}, + #{item.taskBatchId}, + #{item.parentId}, + #{item.taskStatus}, + #{item.retryCount}, + #{item.mrStage}, + #{item.leaf}, + #{item.taskName}, + #{item.clientInfo}, + #{item.wfContext}, + #{item.argsStr}, + #{item.resultMessage}, + #{item.argsType}, + #{item.extAttrs}, + #{item.createDt}, + #{item.updateDt} + ) + + + + 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 new file mode 100644 index 00000000..0a1d1dec --- /dev/null +++ b/snail-job-datasource/snail-job-sqlserver-datasource/src/main/resources/sqlserver/mapper/RetryDeadLetterMapper.xml @@ -0,0 +1,25 @@ + + + + + + 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 + + ( + #{item.namespaceId,jdbcType=VARCHAR}, + #{item.uniqueId,jdbcType=VARCHAR}, + #{item.groupName,jdbcType=VARCHAR}, + #{item.sceneName,jdbcType=VARCHAR}, + #{item.idempotentId,jdbcType=VARCHAR}, + #{item.bizNo,jdbcType=VARCHAR}, + #{item.executorName,jdbcType=VARCHAR}, + #{item.argsStr,jdbcType=VARCHAR}, + #{item.extAttrs,jdbcType=VARCHAR}, + #{item.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 75acc817..9b4fd6d8 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,6 +2,24 @@ + + 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, @@ -13,14 +31,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 new file mode 100644 index 00000000..f125d52e --- /dev/null +++ b/snail-job-datasource/snail-job-sqlserver-datasource/src/main/resources/sqlserver/mapper/RetryTaskLogMapper.xml @@ -0,0 +1,26 @@ + + + + + + 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 b170dec0..9dcdf98c 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,6 +2,23 @@ + + 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, 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 940b7427..79927dec 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,6 +2,30 @@ + + 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, @@ -15,5 +39,4 @@ ) 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 fad6e588..94fa805c 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,6 +2,25 @@ + + 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,