This is an automated email from the ASF dual-hosted git repository.
jianbin pushed a commit to branch 2.x
in repository https://gitbox.apache.org/repos/asf/incubator-seata.git
The following commit(s) were added to refs/heads/2.x by this push:
new 939655a205 bugfix: fix dameng rollback info un compress fail (#6711)
939655a205 is described below
commit 939655a20533e69174fbdb28be3f6dc8b177ee12
Author: chd <caohuadong...@ke.com>
AuthorDate: Thu Aug 1 16:40:14 2024 +0800
bugfix: fix dameng rollback info un compress fail (#6711)
---
changes/en-us/2.x.md | 2 ++
changes/zh-cn/2.x.md | 2 ++
.../apache/seata/rm/datasource/undo/dm/DmUndoLogManager.java | 10 ----------
3 files changed, 4 insertions(+), 10 deletions(-)
diff --git a/changes/en-us/2.x.md b/changes/en-us/2.x.md
index 17be2ff15e..55693f1bbf 100644
--- a/changes/en-us/2.x.md
+++ b/changes/en-us/2.x.md
@@ -18,6 +18,7 @@ Add changes here for all PR submitted to the 2.x branch.
- [[#6678](https://github.com/apache/incubator-seata/pull/6678)] fix the same
record has different lowkeys due to mixed case of table names yesterday
- [[#6697](https://github.com/apache/incubator-seata/pull/6697)] v0 ByteBuf
should not decode by super class
- [[#6707](https://github.com/apache/incubator-seata/pull/6707)] fix readonly
branch commit errors in Oracle XA transactions
+- [[#6711](https://github.com/apache/incubator-seata/pull/6711)] fix dameng
rollback info un compress fail
### optimize:
@@ -69,6 +70,7 @@ Thanks to these contributors for their code commits. Please
report an unintended
- [iAmClever](https://github.com/iAmClever)
- [GoodBoyCoder](https://github.com/GoodBoyCoder)
- [liuqiufeng](https://github.com/liuqiufeng)
+- [caohdgege](https://github.com/caohdgege)
Also, we receive many valuable issues, questions and advices from our
community. Thanks for you all.
diff --git a/changes/zh-cn/2.x.md b/changes/zh-cn/2.x.md
index ac21a3cd7f..1fb70fcca3 100644
--- a/changes/zh-cn/2.x.md
+++ b/changes/zh-cn/2.x.md
@@ -20,6 +20,7 @@
- [[#6678](https://github.com/apache/incubator-seata/pull/6678)]
修复由于表名大小写问题导致的相同记录生成不同RowKey的问题
- [[#6697](https://github.com/apache/incubator-seata/pull/6697)]
v0版本的ByteBuf不应由父类先解码
- [[#6707](https://github.com/apache/incubator-seata/pull/6707)] 修复Oracle
XA事务中只读分支提交出错的问题
+- [[#6711](https://github.com/apache/incubator-seata/pull/6711)]
修复达梦数据库的getRollbackInfo没有解压缩的问题
### optimize:
- [[#6499](https://github.com/apache/incubator-seata/pull/6499)] 拆分 committing
和 rollbacking 状态的任务线程池
@@ -73,6 +74,7 @@
- [iAmClever](https://github.com/iAmClever)
- [GoodBoyCoder](https://github.com/GoodBoyCoder)
- [liuqiufeng](https://github.com/liuqiufeng)
+- [caohdgege](https://github.com/caohdgege)
diff --git
a/rm-datasource/src/main/java/org/apache/seata/rm/datasource/undo/dm/DmUndoLogManager.java
b/rm-datasource/src/main/java/org/apache/seata/rm/datasource/undo/dm/DmUndoLogManager.java
index 255b366334..e267e83213 100644
---
a/rm-datasource/src/main/java/org/apache/seata/rm/datasource/undo/dm/DmUndoLogManager.java
+++
b/rm-datasource/src/main/java/org/apache/seata/rm/datasource/undo/dm/DmUndoLogManager.java
@@ -18,7 +18,6 @@ package org.apache.seata.rm.datasource.undo.dm;
import org.apache.seata.common.loader.LoadLevel;
-import org.apache.seata.common.util.BlobUtils;
import org.apache.seata.core.compressor.CompressorType;
import org.apache.seata.core.constants.ClientTableColumnsName;
import org.apache.seata.rm.datasource.undo.AbstractUndoLogManager;
@@ -27,10 +26,8 @@ import org.apache.seata.sqlparser.util.JdbcConstants;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.sql.Blob;
import java.sql.Connection;
import java.sql.PreparedStatement;
-import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.Date;
@@ -81,13 +78,6 @@ public class DmUndoLogManager extends AbstractUndoLogManager
{
State.GlobalFinished, conn);
}
- @Override
- protected byte[] getRollbackInfo(ResultSet rs) throws SQLException {
- Blob b = rs.getBlob(ClientTableColumnsName.UNDO_LOG_ROLLBACK_INFO);
- byte[] rollbackInfo = BlobUtils.blob2Bytes(b);
- return rollbackInfo;
- }
-
private void insertUndoLog(String xid, long branchID, String rollbackCtx,
byte[] undoLogContent,
State state, Connection conn) throws
SQLException {
try (PreparedStatement pst =
conn.prepareStatement(INSERT_UNDO_LOG_SQL)) {
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscr...@seata.apache.org
For additional commands, e-mail: notifications-h...@seata.apache.org
