Skip to content

bugfix: undo log table name dynamic derivation #7747

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
YvCeung merged 15 commits into from
Oct 31, 2025
Merged

bugfix: undo log table name dynamic derivation #7747

Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
6a7c49d
opt: enables dynamic derivation of the undo log table name while reta…
Oct 29, 2025
b3234ff
opt: repair other types of databases with the same problem
Oct 29, 2025
bbce935
test: add UT
Oct 29, 2025
f547fc1
test: add UT
Oct 29, 2025
f06f9d1
change log
Oct 29, 2025
4c4e431
spotless apply
Oct 29, 2025
54b7ff2
fix
Oct 29, 2025
365b51c
fix tests
Oct 29, 2025
552ae04
spotless:apply
Oct 29, 2025
026565b
Merge branch '2.x' into bugfix/251029
maple525866 Oct 30, 2025
2fa8e55
change log
Oct 30, 2025
4bea639
remove wildcards *
Oct 30, 2025
aecc684
Merge branch '2.x' into bugfix/251029
YvCeung Oct 30, 2025
f4bba23
Merge branch '2.x' into bugfix/251029
maple525866 Oct 31, 2025
896f019
Merge branch '2.x' into bugfix/251029
YvCeung Oct 31, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changes/en-us/2.x.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ Add changes here for all PR submitted to the 2.x branch.
- [[#7662](https://github.com/apache/incubator-seata/pull/7662)] ensure visibility of rm and The methods in MockTest are executed in order
- [[#7683](https://github.com/apache/incubator-seata/pull/7683)] Override XABranchXid equals() and hashCode() to fix memory leak in mysql driver
- [[#7643](https://github.com/apache/incubator-seata/pull/7643)] fix DM transaction rollback not using database auto-increment primary keys
- [[#7747](https://github.com/apache/incubator-seata/pull/7747)] undo log table name dynamic derivation


### optimize:
Expand Down
1 change: 1 addition & 0 deletions changes/zh-cn/2.x.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@
- [[#7722](https://github.com/apache/incubator-seata/pull/7722)] 优化 SerializerType 枚举含义
- [[#7741](https://github.com/apache/incubator-seata/pull/7741)] 支持发布基于JDK 25的镜像
- [[#7743](https://github.com/seata/seata/pull/7743)] 将 Apache Tomcat 依赖项从 9.0.108 升级到 9.0.109
- [[#7747](https://github.com/apache/incubator-seata/pull/7747)] 撤销日志表名称动态派生

- [[#7740](https://github.com/apache/incubator-seata/pull/7740)] 优化http工具类使之支持h2c协议

Expand Down
2 changes: 1 addition & 1 deletion ...ce/src/main/java/org/apache/seata/rm/datasource/undo/kingbase/KingbaseUndoLogManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ public class KingbaseUndoLogManager extends AbstractUndoLogManager {
+ ClientTableColumnsName.UNDO_LOG_XID + ", " + ClientTableColumnsName.UNDO_LOG_CONTEXT + ", "
+ ClientTableColumnsName.UNDO_LOG_ROLLBACK_INFO + ", " + ClientTableColumnsName.UNDO_LOG_LOG_STATUS + ", "
+ ClientTableColumnsName.UNDO_LOG_LOG_CREATED + ", " + ClientTableColumnsName.UNDO_LOG_LOG_MODIFIED + ")"
+ "VALUES (UNDO_LOG_SEQ.nextval, ?, ?, ?, ?, ?, sysdate, sysdate)";
+ "VALUES (" + UNDO_LOG_TABLE_NAME.toUpperCase() + "_SEQ.nextval, ?, ?, ?, ?, ?, sysdate, sysdate)";

private static final String DELETE_UNDO_LOG_BY_CREATE_SQL = "DELETE FROM " + UNDO_LOG_TABLE_NAME + " WHERE "
+ ClientTableColumnsName.UNDO_LOG_LOG_CREATED + " <= to_date(?,'yyyy-mm-dd hh24:mi:ss') and ROWNUM <= ?";
Expand Down
2 changes: 1 addition & 1 deletion ...source/src/main/java/org/apache/seata/rm/datasource/undo/oracle/OracleUndoLogManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ public class OracleUndoLogManager extends AbstractUndoLogManager {
+ ClientTableColumnsName.UNDO_LOG_XID + ", " + ClientTableColumnsName.UNDO_LOG_CONTEXT + ", "
+ ClientTableColumnsName.UNDO_LOG_ROLLBACK_INFO + ", " + ClientTableColumnsName.UNDO_LOG_LOG_STATUS + ", "
+ ClientTableColumnsName.UNDO_LOG_LOG_CREATED + ", " + ClientTableColumnsName.UNDO_LOG_LOG_MODIFIED + ")"
+ "VALUES (UNDO_LOG_SEQ.nextval, ?, ?, ?, ?, ?, sysdate, sysdate)";
+ "VALUES (" + UNDO_LOG_TABLE_NAME.toUpperCase() + "_SEQ.nextval, ?, ?, ?, ?, ?, sysdate, sysdate)";

private static final String DELETE_UNDO_LOG_BY_CREATE_SQL = "DELETE FROM " + UNDO_LOG_TABLE_NAME + " WHERE "
+ ClientTableColumnsName.UNDO_LOG_LOG_CREATED + " <= to_date(?,'yyyy-mm-dd hh24:mi:ss') and ROWNUM <= ?";
Expand Down
2 changes: 1 addition & 1 deletion ...tasource/src/main/java/org/apache/seata/rm/datasource/undo/oscar/OscarUndoLogManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ public class OscarUndoLogManager extends AbstractUndoLogManager {
+ ClientTableColumnsName.UNDO_LOG_XID + ", " + ClientTableColumnsName.UNDO_LOG_CONTEXT + ", "
+ ClientTableColumnsName.UNDO_LOG_ROLLBACK_INFO + ", " + ClientTableColumnsName.UNDO_LOG_LOG_STATUS + ", "
+ ClientTableColumnsName.UNDO_LOG_LOG_CREATED + ", " + ClientTableColumnsName.UNDO_LOG_LOG_MODIFIED + ")"
+ "VALUES (UNDO_LOG_SEQ.nextval, ?, ?, ?, ?, ?, sysdate, sysdate)";
+ "VALUES (" + UNDO_LOG_TABLE_NAME.toUpperCase() + "_SEQ.nextval, ?, ?, ?, ?, ?, sysdate, sysdate)";

private static final String DELETE_UNDO_LOG_BY_CREATE_SQL = "DELETE FROM " + UNDO_LOG_TABLE_NAME + " WHERE "
+ ClientTableColumnsName.UNDO_LOG_LOG_CREATED + " <= to_date(?,'yyyy-mm-dd hh24:mi:ss') and ROWNUM <= ?";
Expand Down
2 changes: 1 addition & 1 deletion ...rc/main/java/org/apache/seata/rm/datasource/undo/postgresql/PostgresqlUndoLogManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ public class PostgresqlUndoLogManager extends AbstractUndoLogManager {
+ ClientTableColumnsName.UNDO_LOG_XID + ", " + ClientTableColumnsName.UNDO_LOG_CONTEXT + ", "
+ ClientTableColumnsName.UNDO_LOG_ROLLBACK_INFO + ", " + ClientTableColumnsName.UNDO_LOG_LOG_STATUS + ", "
+ ClientTableColumnsName.UNDO_LOG_LOG_CREATED + ", " + ClientTableColumnsName.UNDO_LOG_LOG_MODIFIED + ")"
+ "VALUES (nextval('undo_log_id_seq'), ?, ?, ?, ?, ?, now(), now())";
+ "VALUES (nextval('" + UNDO_LOG_TABLE_NAME + "_id_seq'), ?, ?, ?, ?, ?, now(), now())";

private static final String DELETE_UNDO_LOG_BY_CREATE_SQL = "DELETE FROM " + UNDO_LOG_TABLE_NAME + " WHERE "
+ ClientTableColumnsName.UNDO_LOG_ID + " IN ("
Expand Down
Loading
Loading