diff --git a/doc/docker/docker-compose.yaml b/doc/docker/docker-compose.yaml
index 137e40b2b..c22809f87 100644
--- a/doc/docker/docker-compose.yaml
+++ b/doc/docker/docker-compose.yaml
@@ -7,6 +7,7 @@ volumes:
postgres: { }
oracle: { }
sqlserver: { }
+ mariadb: { }
services:
mysql:
@@ -69,3 +70,17 @@ services:
- ../sql/easy_retry_sqlserver.sql:/tmp/schema.sql:ro
# docker compose exec sqlserver bash /tmp/create_schema.sh
- ./sqlserver/create_schema.sh:/tmp/create_schema.sh:ro
+
+ mariadb:
+ image: mariadb:10.11.7
+ restart: unless-stopped
+ environment:
+ TZ: Asia/Shanghai
+ MARIADB_ROOT_PASSWORD: root
+ MARIADB_DATABASE: easy_retry
+ ports:
+ - "3308:3306"
+ volumes:
+ - mariadb:/var/lib/mysql/
+ # 注入初始化脚本, mysql
+ - ../sql/easy_retry_mysql.sql:/docker-entrypoint-initdb.d/init.sql:ro
\ No newline at end of file
diff --git a/easy-retry-datasource/easy-retry-mariadb-datasource/src/main/resources/mariadb/mapper/JobLogMessageMapper.xml b/easy-retry-datasource/easy-retry-mariadb-datasource/src/main/resources/mariadb/mapper/JobLogMessageMapper.xml
index 11f0b99a0..61363a6fc 100644
--- a/easy-retry-datasource/easy-retry-mariadb-datasource/src/main/resources/mariadb/mapper/JobLogMessageMapper.xml
+++ b/easy-retry-datasource/easy-retry-mariadb-datasource/src/main/resources/mariadb/mapper/JobLogMessageMapper.xml
@@ -19,30 +19,30 @@
INSERT INTO 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}
+ 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/easy-retry-datasource/easy-retry-mariadb-datasource/src/main/resources/mariadb/mapper/JobMapper.xml b/easy-retry-datasource/easy-retry-mariadb-datasource/src/main/resources/mariadb/mapper/JobMapper.xml
index de263ea08..518a0c239 100644
--- a/easy-retry-datasource/easy-retry-mariadb-datasource/src/main/resources/mariadb/mapper/JobMapper.xml
+++ b/easy-retry-datasource/easy-retry-mariadb-datasource/src/main/resources/mariadb/mapper/JobMapper.xml
@@ -27,17 +27,16 @@
- update job rt,
- (
-
- select
- #{item.nextTriggerAt} as next_trigger_at,
- #{item.id} as id
-
- ) tt
- set
- rt.next_trigger_at = tt.next_trigger_at
- where rt.id = tt.id
+ UPDATE job rt,
+ (
+
+ SELECT
+ #{item.nextTriggerAt} AS next_trigger_at,
+ #{item.id} AS id
+
+ ) tt
+ SET rt.next_trigger_at = tt.next_trigger_at
+ WHERE rt.id = tt.id
diff --git a/easy-retry-datasource/easy-retry-mariadb-datasource/src/main/resources/mariadb/mapper/JobSummaryMapper.xml b/easy-retry-datasource/easy-retry-mariadb-datasource/src/main/resources/mariadb/mapper/JobSummaryMapper.xml
index ac27f9adc..d0b4e7287 100644
--- a/easy-retry-datasource/easy-retry-mariadb-datasource/src/main/resources/mariadb/mapper/JobSummaryMapper.xml
+++ b/easy-retry-datasource/easy-retry-mariadb-datasource/src/main/resources/mariadb/mapper/JobSummaryMapper.xml
@@ -23,50 +23,49 @@
INSERT INTO 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}
- )
-
+
+ (
+ #{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 job_summary rt,
- (
-
- SELECT
- #{item.successNum} AS success_num,
- #{item.failNum} AS fail_num,
- #{item.failReason} AS fail_reason,
- #{item.stopNum} AS stop_num,
- #{item.stopReason} AS stop_reason,
- #{item.cancelNum} AS cancel_num,
- #{item.cancelReason} AS cancel_reason,
- #{item.triggerAt} AS trigger_at,
- #{item.businessId} AS business_id
-
- ) tt
- SET
- rt.success_num = tt.success_num,
- rt.fail_num = tt.fail_num,
- rt.fail_reason = tt.fail_reason,
- rt.stop_num = tt.stop_num,
- rt.stop_reason = tt.stop_reason,
- rt.cancel_num = tt.cancel_num,
- rt.cancel_reason = tt.cancel_reason
- WHERE rt.trigger_at = tt.trigger_at
- AND rt.business_id = tt.business_id
+ (
+
+ SELECT
+ #{item.successNum} AS success_num,
+ #{item.failNum} AS fail_num,
+ #{item.failReason} AS fail_reason,
+ #{item.stopNum} AS stop_num,
+ #{item.stopReason} AS stop_reason,
+ #{item.cancelNum} AS cancel_num,
+ #{item.cancelReason} AS cancel_reason,
+ #{item.triggerAt} AS trigger_at,
+ #{item.businessId} AS business_id
+
+ ) tt
+ SET rt.success_num = tt.success_num,
+ rt.fail_num = tt.fail_num,
+ rt.fail_reason = tt.fail_reason,
+ rt.stop_num = tt.stop_num,
+ rt.stop_reason = tt.stop_reason,
+ rt.cancel_num = tt.cancel_num,
+ rt.cancel_reason = tt.cancel_reason
+ WHERE rt.trigger_at = tt.trigger_at
+ AND rt.business_id = tt.business_id
@@ -104,10 +103,12 @@
CONCAT(group_name, '/', (SELECT workflow_name FROM workflow WHERE id = business_id)) name,
- SUM(fail_num) AS total FROM job_summary
+ SUM(fail_num) AS total
+ FROM job_summary
${ew.customSqlSegment}
HAVING total > 0
- ORDER BY total DESC LIMIT 10
+ ORDER BY total DESC
+ LIMIT 10
+
- id, namespace_id, unique_id, group_name, scene_name, idempotent_id, biz_no, executor_name, args_str, ext_attrs, create_dt, task_type
+ 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
+ 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})
+ (
+ #{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-mariadb-datasource/src/main/resources/mariadb/mapper/RetrySummaryMapper.xml b/easy-retry-datasource/easy-retry-mariadb-datasource/src/main/resources/mariadb/mapper/RetrySummaryMapper.xml
index d19c8337f..4bb7ce47d 100644
--- a/easy-retry-datasource/easy-retry-mariadb-datasource/src/main/resources/mariadb/mapper/RetrySummaryMapper.xml
+++ b/easy-retry-datasource/easy-retry-mariadb-datasource/src/main/resources/mariadb/mapper/RetrySummaryMapper.xml
@@ -16,8 +16,9 @@
- INSERT INTO retry_summary (namespace_id, group_name, scene_name, trigger_at,
- running_num, finish_num, max_count_num, suspend_num)
+ INSERT INTO
+ retry_summary (namespace_id, group_name, scene_name, trigger_at, running_num, finish_num, max_count_num,
+ suspend_num)
VALUES
(
@@ -35,44 +36,47 @@
UPDATE retry_summary rt,
- (
-
- 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
-
- ) tt
- SET rt.running_num = tt.running_num,
- rt.finish_num = tt.finish_num,
- rt.max_count_num = tt.max_count_num,
- rt.suspend_num = tt.suspend_num
- WHERE rt.trigger_at = tt.trigger_at
- AND rt.group_name = tt.group_name
- AND rt.namespace_id = tt.namespace_id
- AND rt.scene_name = tt.scene_name
+ (
+
+ 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
+
+ ) tt
+ SET rt.running_num = tt.running_num,
+ rt.finish_num = tt.finish_num,
+ rt.max_count_num = tt.max_count_num,
+ rt.suspend_num = tt.suspend_num
+ WHERE rt.trigger_at = tt.trigger_at
+ AND rt.group_name = tt.group_name
+ AND rt.namespace_id = tt.namespace_id
+ AND rt.scene_name = tt.scene_name
-
- update retry_task_${partition} rt,
- (
-
- select
- #{item.nextTriggerAt} as next_trigger_at,
- #{item.id} as id
-
- ) tt
- set
- rt.next_trigger_at = tt.next_trigger_at
- where rt.id = tt.id
+ UPDATE retry_task_${partition} rt,
+ (
+
+ SELECT
+ #{item.nextTriggerAt} AS next_trigger_at,
+ #{item.id} AS id
+
+ ) tt
+ SET rt.next_trigger_at = tt.next_trigger_at
+ WHERE rt.id = tt.id
diff --git a/easy-retry-datasource/easy-retry-mariadb-datasource/src/main/resources/mariadb/mapper/ServerNodeMapper.xml b/easy-retry-datasource/easy-retry-mariadb-datasource/src/main/resources/mariadb/mapper/ServerNodeMapper.xml
index 4ddc66786..ecb830cb7 100644
--- a/easy-retry-datasource/easy-retry-mariadb-datasource/src/main/resources/mariadb/mapper/ServerNodeMapper.xml
+++ b/easy-retry-datasource/easy-retry-mariadb-datasource/src/main/resources/mariadb/mapper/ServerNodeMapper.xml
@@ -1,22 +1,25 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- id, group_name, context_path, host_id, host_ip, host_port, expire_at, node_type,create_dt,update_dt
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ id, namespace_id, group_name, context_path, host_id, host_ip, host_port,
+ expire_at, node_type,create_dt,update_dt
+
INSERT INTO server_node (namespace_id, group_name, host_id, host_ip, host_port,
@@ -40,23 +43,26 @@
UPDATE server_node rt,
- (
-
- SELECT
- #{item.expireAt} AS expire_at,
- #{item.contextPath} AS context_path,
- #{item.hostId} AS host_id,
- #{item.hostIp} AS host_ip
-
- ) tt
- SET rt.expire_at = tt.expire_at,
- rt.context_path = tt.context_path
- WHERE rt.host_id = tt.host_id and rt.host_ip = tt.host_ip
+ (
+
+ SELECT
+ #{item.expireAt} AS expire_at,
+ #{item.contextPath} AS context_path,
+ #{item.hostId} AS host_id,
+ #{item.hostIp} AS host_ip
+
+ ) tt
+ SET rt.expire_at = tt.expire_at,
+ rt.context_path = tt.context_path
+ WHERE rt.host_id = tt.host_id
+ AND rt.host_ip = tt.host_ip
-
- SELECT node_type as nodeType, count(*) as total
- from server_node
- ${ew.customSqlSegment}
-
+
+ SELECT node_type AS nodeType,
+ COUNT(*) AS total
+ FROM server_node
+ ${ew.customSqlSegment}
+
diff --git a/easy-retry-datasource/easy-retry-mariadb-datasource/src/main/resources/mariadb/mapper/WorkflowMapper.xml b/easy-retry-datasource/easy-retry-mariadb-datasource/src/main/resources/mariadb/mapper/WorkflowMapper.xml
index d957fb80a..23aad000e 100644
--- a/easy-retry-datasource/easy-retry-mariadb-datasource/src/main/resources/mariadb/mapper/WorkflowMapper.xml
+++ b/easy-retry-datasource/easy-retry-mariadb-datasource/src/main/resources/mariadb/mapper/WorkflowMapper.xml
@@ -15,19 +15,18 @@
+
- update workflow rt,
- (
-
- select
- #{item.nextTriggerAt} as next_trigger_at,
- #{item.id} as id
-
- ) tt
- set
- rt.next_trigger_at = tt.next_trigger_at
- where rt.id = tt.id
+ UPDATE workflow rt,
+ (
+
+ SELECT
+ #{item.nextTriggerAt} AS next_trigger_at,
+ #{item.id} AS id
+
+ ) tt
+ SET rt.next_trigger_at = tt.next_trigger_at
+ WHERE rt.id = tt.id
-
diff --git a/easy-retry-server/easy-retry-server-starter/src/main/resources/application.yml b/easy-retry-server/easy-retry-server-starter/src/main/resources/application.yml
index 2d7f26eea..04ca19d4d 100644
--- a/easy-retry-server/easy-retry-server-starter/src/main/resources/application.yml
+++ b/easy-retry-server/easy-retry-server-starter/src/main/resources/application.yml
@@ -27,6 +27,11 @@ spring:
# url: jdbc:sqlserver://localhost:1433;DatabaseName=easy_retry;SelectMethod=cursor;encrypt=false;rewriteBatchedStatements=true
# username: SA
# password: EasyRetry@24
+ ## mariadb
+# driver-class-name: org.mariadb.jdbc.Driver
+# url: jdbc:mariadb://localhost:3308/easy_retry?useSSL=false&characterEncoding=utf8&useUnicode=true
+# username: root
+# password: root
type: com.zaxxer.hikari.HikariDataSource
hikari:
connection-timeout: 30000