From 73543bcf436e88fefd94982f97f10b7711e3e77d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E6=B4=8B?= <734843455@qq.com>
Date: Sat, 26 Feb 2022 11:02:19 +0800
Subject: [PATCH 2/4] supply pr#4282 author info
---
changes/1.5.0.md | 1 +
changes/en-us/1.5.0.md | 5 +++--
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/changes/1.5.0.md b/changes/1.5.0.md
index a87dd02de78..2c19902122a 100644
--- a/changes/1.5.0.md
+++ b/changes/1.5.0.md
@@ -186,6 +186,7 @@ Seata 是一款开源的分布式事务解决方案，提供高性能和简单
- [[#4353](https://github.com/seata/seata/pull/4353)] 为 `seata-all.jar` 瘦身
- [[#4400](https://github.com/seata/seata/pull/4400)] 异步二阶段任务支持并行处理提升效率
- [[#4391](https://github.com/seata/seata/pull/4391)] commit/rollback 重试超时事件
+ - [[#4282](https://github.com/seata/seata/pull/4282)] 优化回滚镜像构建逻辑
### test：
diff --git a/changes/en-us/1.5.0.md b/changes/en-us/1.5.0.md
index 85ce65ed030..1c306d87786 100644
--- a/changes/en-us/1.5.0.md
+++ b/changes/en-us/1.5.0.md
@@ -44,7 +44,7 @@
- [[#4293](https://github.com/seata/seata/pull/4293)] get global lock in the file mode
- [[#4335](https://github.com/seata/seata/pull/4335)] Realize configuration center upload configuration interactive script (nacos,etcd3)
- [[#4332](https://github.com/seata/seata/pull/4332)] Realize configuration center upload configuration interactive script (apollo,consul,zk)
-
+
### bugfix：
- [[#3497](https://github.com/seata/seata/pull/3497)] fix tcc phase two response timeout exception
@@ -99,7 +99,7 @@
- [[#4355](https://github.com/seata/seata/pull/4355)] fix mysql-loadbalance resource id error
- [[#4310](https://github.com/seata/seata/pull/4310)] fix the problem that failed to obtain the self increment ID of MySQL database through "select last_insert_id"
- [[#4331](https://github.com/seata/seata/pull/4331)] fix dirty write check exception that may occur when using ONLY_CARE_UPDATE_COLUMNS configuration
-
+
### optimize：
@@ -190,6 +190,7 @@
- [[#4353](https://github.com/seata/seata/pull/4353)] Slimming down for the `seata-all.jar`
- [[#4400](https://github.com/seata/seata/pull/4400)] asynchronous tasks handle global transactions in parallel
- [[#4391](https://github.com/seata/seata/pull/4391)] commit/rollback retry timeout event
+ - [[#4282](https://github.com/seata/seata/pull/4282)] optimize build UndoItem logic
### test:
From 0a71602d4e2a7d09785c0b7397f07ab3288dc5e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E6=B4=8B?= <734843455@qq.com>
Date: Sat, 26 Feb 2022 11:38:29 +0800
Subject: [PATCH 3/4] update mysql utf8->utf8mb4
---
script/client/at/db/mysql.sql | 2 +-
script/client/saga/db/mysql.sql | 6 +++---
script/client/tcc/db/mysql.sql | 2 +-
script/server/db/mysql.sql | 6 +++---
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/script/client/at/db/mysql.sql b/script/client/at/db/mysql.sql
index 7f94c68ce51..cbddc35025c 100644
--- a/script/client/at/db/mysql.sql
+++ b/script/client/at/db/mysql.sql
@@ -11,4 +11,4 @@ CREATE TABLE IF NOT EXISTS `undo_log`
UNIQUE KEY `ux_undo_log` (`xid`, `branch_id`)
) ENGINE = InnoDB
AUTO_INCREMENT = 1
- DEFAULT CHARSET = utf8 COMMENT ='AT transaction mode undo table';
+ DEFAULT CHARSET = utf8mb4 COMMENT ='AT transaction mode undo table';
diff --git a/script/client/saga/db/mysql.sql b/script/client/saga/db/mysql.sql
index 429e04fb3c7..6cc0e603c6b 100644
--- a/script/client/saga/db/mysql.sql
+++ b/script/client/saga/db/mysql.sql
@@ -16,7 +16,7 @@ CREATE TABLE IF NOT EXISTS `seata_state_machine_def`
`recover_strategy` VARCHAR(16) COMMENT 'transaction recover strategy(compensate|retry)',
PRIMARY KEY (`id`)
) ENGINE = InnoDB
- DEFAULT CHARSET = utf8;
+ DEFAULT CHARSET = utf8mb4;
CREATE TABLE IF NOT EXISTS `seata_state_machine_inst`
(
@@ -37,7 +37,7 @@ CREATE TABLE IF NOT EXISTS `seata_state_machine_inst`
PRIMARY KEY (`id`),
UNIQUE KEY `unikey_buz_tenant` (`business_key`, `tenant_id`)
) ENGINE = InnoDB
- DEFAULT CHARSET = utf8;
+ DEFAULT CHARSET = utf8mb4;
CREATE TABLE IF NOT EXISTS `seata_state_inst`
(
@@ -61,4 +61,4 @@ CREATE TABLE IF NOT EXISTS `seata_state_inst`
`gmt_end` DATETIME(3) COMMENT 'end time',
PRIMARY KEY (`id`, `machine_inst_id`)
) ENGINE = InnoDB
- DEFAULT CHARSET = utf8;
\ No newline at end of file
+ DEFAULT CHARSET = utf8mb4;
\ No newline at end of file
diff --git a/script/client/tcc/db/mysql.sql b/script/client/tcc/db/mysql.sql
index d45c019c978..66b421f9b1a 100644
--- a/script/client/tcc/db/mysql.sql
+++ b/script/client/tcc/db/mysql.sql
@@ -11,4 +11,4 @@ CREATE TABLE IF NOT EXISTS `tcc_fence_log`
KEY `idx_gmt_modified` (`gmt_modified`),
KEY `idx_status` (`status`)
) ENGINE = InnoDB
-DEFAULT CHARSET = utf8;
\ No newline at end of file
+DEFAULT CHARSET = utf8mb4;
\ No newline at end of file
diff --git a/script/server/db/mysql.sql b/script/server/db/mysql.sql
index 6c8575b310a..0fed3626b1c 100644
--- a/script/server/db/mysql.sql
+++ b/script/server/db/mysql.sql
@@ -17,7 +17,7 @@ CREATE TABLE IF NOT EXISTS `global_table`
KEY `idx_status_gmt_modified` (`status` , `gmt_modified`),
KEY `idx_transaction_id` (`transaction_id`)
) ENGINE = InnoDB
- DEFAULT CHARSET = utf8;
+ DEFAULT CHARSET = utf8mb4;
-- the table to store BranchSession data
CREATE TABLE IF NOT EXISTS `branch_table`
@@ -36,7 +36,7 @@ CREATE TABLE IF NOT EXISTS `branch_table`
PRIMARY KEY (`branch_id`),
KEY `idx_xid` (`xid`)
) ENGINE = InnoDB
- DEFAULT CHARSET = utf8;
+ DEFAULT CHARSET = utf8mb4;
-- the table to store lock data
CREATE TABLE IF NOT EXISTS `lock_table`
@@ -55,7 +55,7 @@ CREATE TABLE IF NOT EXISTS `lock_table`
KEY `idx_status` (`status`),
KEY `idx_branch_id` (`branch_id`)
) ENGINE = InnoDB
- DEFAULT CHARSET = utf8;
+ DEFAULT CHARSET = utf8mb4;
CREATE TABLE IF NOT EXISTS `distributed_lock`
(
From 7f1c9b52fd5a07af704cf6077856a21ea2fd966c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E6=B4=8B?= <734843455@qq.com>
Date: Mon, 28 Feb 2022 21:52:15 +0800
Subject: [PATCH 4/4] add logo
---
README.md | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/README.md b/README.md
index 47ca0c1a725..d1639a5b957 100644
--- a/README.md
+++ b/README.md
@@ -292,6 +292,13 @@ here](https://github.com/seata/seata/issues/1246) to tell us your scenario to ma
+ 
- 
+ 
- 
- 
- 
- 
+ 
+ 
+ 
+ 
- 
+ 
@@ -164,48 +164,48 @@ here](https://github.com/seata/seata/issues/1246) to tell us your scenario to ma
- 
+ 
- 
- 
+ 
+ 
- 
+ 
- 
+ 
- 
+ 
- 
- 
- 
+ 
+ 
+ 
- 
+ 
- 
+ 
- 
+ 
- 
+ 
- 
+ 
@@ -216,10 +216,10 @@ here](https://github.com/seata/seata/issues/1246) to tell us your scenario to ma
- 
+ 
- 
+ 
@@ -235,25 +235,25 @@ here](https://github.com/seata/seata/issues/1246) to tell us your scenario to ma
- 
+ 
- 
+ 
- 
+ 
- 
- 
- 
+ 
+ 
+ 
- 
- 
+ 
+ 
- 
@@ -284,6 +284,15 @@ here](https://github.com/seata/seata/issues/1246) to tell us your scenario to ma
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
@@ -300,3 +307,4 @@ here](https://github.com/seata/seata/issues/1246) to tell us your scenario to ma
+