This is an automated email from the ASF dual-hosted git repository.
jianbin pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/incubator-seata.git
The following commit(s) were added to refs/heads/develop by this push:
new 158991b65a bugfix: fix dameng rollback info un compress fail (#6715)
158991b65a is described below
commit 158991b65a5e7c1f737c8353aec2398580b1dbf2
Author: chd <[email protected]>
AuthorDate: Thu Aug 1 17:19:19 2024 +0800
bugfix: fix dameng rollback info un compress fail (#6715)
---
changes/en-us/develop.md | 2 ++
changes/zh-cn/develop.md | 4 +++-
.../java/io/seata/rm/datasource/undo/dm/DmUndoLogManager.java | 10 ----------
3 files changed, 5 insertions(+), 11 deletions(-)
diff --git a/changes/en-us/develop.md b/changes/en-us/develop.md
index e29d625f6e..ae018ce099 100644
--- a/changes/en-us/develop.md
+++ b/changes/en-us/develop.md
@@ -16,6 +16,7 @@ Add changes here for all PR submitted to the develop branch.
- [[#6628](https://github.com/seata/seata/pull/6628)] fix Alibaba Dubbo
convert error.
- [[#6632](https://github.com/seata/seata/pull/6632)] fix hsf ConsumerModel
convert error.
- [[#6661](https://github.com/seata/seata/pull/6661)] fix `tableMeta` cache
scheduled refresh issue
+- [[#6715](https://github.com/apache/incubator-seata/pull/6715)] fix dameng
rollback info un compress fail
### optimize:
- [[#6044](https://github.com/seata/seata/pull/6044)] optimize derivative
product check base on mysql
@@ -37,5 +38,6 @@ Thanks to these contributors for their code commits. Please
report an unintended
- [funky-eyes](https://github.com/funky-eyes)
- [laywin](https://github.com/laywin)
- [wuwen5](https://github.com/wuwen5)
+- [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/develop.md b/changes/zh-cn/develop.md
index b8e5a9b844..b4878622da 100644
--- a/changes/zh-cn/develop.md
+++ b/changes/zh-cn/develop.md
@@ -16,7 +16,8 @@
- [[#6628](https://github.com/seata/seata/pull/6628)] 修复 Alibaba Dubbo 转换错误
- [[#6632](https://github.com/seata/seata/pull/6632)] 修复 hsf ConsumerModel 转换错误
- [[#6661](https://github.com/seata/seata/pull/6661)] 修复`tableMeta`缓存定时刷新失效问题
-
+- [[#6715](https://github.com/apache/incubator-seata/pull/6715)]
修复达梦数据库的getRollbackInfo没有解压缩的问题
+-
### optimize:
- [[#6044](https://github.com/seata/seata/pull/6044)] 优化MySQL衍生数据库判断逻辑
- [[#6361](https://github.com/seata/seata/pull/6361)] 优化部分链接 401 的问题
@@ -37,5 +38,6 @@
- [funky-eyes](https://github.com/funky-eyes)
- [laywin](https://github.com/laywin)
- [wuwen5](https://github.com/wuwen5)
+- [caohdgege](https://github.com/caohdgege)
同时，我们收到了社区反馈的很多有价值的issue和建议，非常感谢大家。
diff --git
a/rm-datasource/src/main/java/io/seata/rm/datasource/undo/dm/DmUndoLogManager.java
b/rm-datasource/src/main/java/io/seata/rm/datasource/undo/dm/DmUndoLogManager.java
index 39053e8b17..b35b34bd88 100644
---
a/rm-datasource/src/main/java/io/seata/rm/datasource/undo/dm/DmUndoLogManager.java
+++
b/rm-datasource/src/main/java/io/seata/rm/datasource/undo/dm/DmUndoLogManager.java
@@ -17,7 +17,6 @@ package io.seata.rm.datasource.undo.dm;
import io.seata.common.loader.LoadLevel;
-import io.seata.common.util.BlobUtils;
import io.seata.core.compressor.CompressorType;
import io.seata.core.constants.ClientTableColumnsName;
import io.seata.rm.datasource.undo.AbstractUndoLogManager;
@@ -26,10 +25,8 @@ import io.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;
@@ -82,13 +79,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: [email protected]
For additional commands, e-mail: [email protected]
