This is an automated email from the ASF dual-hosted git repository.
jimin 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 1053cdd307 test: add UT for fastjson2 for PostgreSQL Array type (#7723)
1053cdd307 is described below
commit 1053cdd3079e7b4b420b534ed4c42d5837d41f33
Author: maple <[email protected]>
AuthorDate: Thu Oct 23 22:07:56 2025 +0800
test: add UT for fastjson2 for PostgreSQL Array type (#7723)
---
changes/en-us/2.x.md | 1 +
changes/zh-cn/2.x.md | 1 +
.../undo/parser/Fastjson2UndoLogParser.java | 3 +
.../undo/parser/Fastjson2UndoLogParserTest.java | 231 +++++++++++++++++++++
4 files changed, 236 insertions(+)
diff --git a/changes/en-us/2.x.md b/changes/en-us/2.x.md
index 6562739656..f255888491 100644
--- a/changes/en-us/2.x.md
+++ b/changes/en-us/2.x.md
@@ -88,6 +88,7 @@ Add changes here for all PR submitted to the 2.x branch.
- [[#7679](https://github.com/apache/incubator-seata/pull/7679)] fix old
version connect timeout
- [[#7638](https://github.com/apache/incubator-seata/pull/7638)]Add unit tests
for the `seata-common` module and remove a todo
- [[#7709](https://github.com/apache/incubator-seata/pull/7709)] add UT for dm
module
+- [[#7723](https://github.com/apache/incubator-seata/pull/7723)] add UT for
fastjson2 to test PostgreSQL Array type
### refactor:
diff --git a/changes/zh-cn/2.x.md b/changes/zh-cn/2.x.md
index f2e76beb19..64cdeefb27 100644
--- a/changes/zh-cn/2.x.md
+++ b/changes/zh-cn/2.x.md
@@ -87,6 +87,7 @@
- [[#7679](https://github.com/apache/incubator-seata/pull/7679)] 修复旧版本协议测试超时问题
- [[#7638](https://github.com/apache/incubator-seata/pull/7638)] 增加了
`seata-common` 模块的测试用例,删去了一个todo
- [[#7709](https://github.com/apache/incubator-seata/pull/7709)] 为dm模块增加单测
+- [[#7723](https://github.com/apache/incubator-seata/pull/7723)] 添加 fastjson2
的 UT 来测试 PostgreSQL 数组类型
### refactor:
diff --git
a/rm-datasource/src/main/java/org/apache/seata/rm/datasource/undo/parser/Fastjson2UndoLogParser.java
b/rm-datasource/src/main/java/org/apache/seata/rm/datasource/undo/parser/Fastjson2UndoLogParser.java
index 1ded0bf445..d56ba16bc2 100644
---
a/rm-datasource/src/main/java/org/apache/seata/rm/datasource/undo/parser/Fastjson2UndoLogParser.java
+++
b/rm-datasource/src/main/java/org/apache/seata/rm/datasource/undo/parser/Fastjson2UndoLogParser.java
@@ -53,6 +53,9 @@ public class Fastjson2UndoLogParser implements UndoLogParser,
Initialize {
JSONWriter.Feature.NotWriteHashMapArrayListClassName,
JSONWriter.Feature.WriteNameAsSymbol
};
+
+ // SerialArray support: Fastjson2 with FieldBased and SupportAutoType
features
+ // can handle SerialArray serialization automatically through field
access
}
@Override
diff --git
a/rm-datasource/src/test/java/org/apache/seata/rm/datasource/undo/parser/Fastjson2UndoLogParserTest.java
b/rm-datasource/src/test/java/org/apache/seata/rm/datasource/undo/parser/Fastjson2UndoLogParserTest.java
index a7f9dae6ab..e8d80147b6 100644
---
a/rm-datasource/src/test/java/org/apache/seata/rm/datasource/undo/parser/Fastjson2UndoLogParserTest.java
+++
b/rm-datasource/src/test/java/org/apache/seata/rm/datasource/undo/parser/Fastjson2UndoLogParserTest.java
@@ -17,8 +17,29 @@
package org.apache.seata.rm.datasource.undo.parser;
import org.apache.seata.common.loader.EnhancedServiceLoader;
+import org.apache.seata.rm.datasource.DataCompareUtils;
+import org.apache.seata.rm.datasource.sql.serial.SerialArray;
+import org.apache.seata.rm.datasource.sql.struct.Field;
+import org.apache.seata.rm.datasource.sql.struct.Row;
+import org.apache.seata.rm.datasource.sql.struct.TableRecords;
import org.apache.seata.rm.datasource.undo.BaseUndoLogParserTest;
+import org.apache.seata.rm.datasource.undo.BranchUndoLog;
+import org.apache.seata.rm.datasource.undo.SQLUndoLog;
import org.apache.seata.rm.datasource.undo.UndoLogParser;
+import org.apache.seata.sqlparser.SQLType;
+import org.apache.seata.sqlparser.struct.TableMeta;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+import java.io.IOException;
+import java.sql.Array;
+import java.sql.JDBCType;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Types;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
public class Fastjson2UndoLogParserTest extends BaseUndoLogParserTest {
@@ -32,4 +53,214 @@ public class Fastjson2UndoLogParserTest extends
BaseUndoLogParserTest {
@Override
public void testTimestampEncodeAndDecode() {}
+
+ @Test
+ public void testSerializeAndDeserializeSerialArray() throws IOException,
SQLException {
+ // create a mock Array object for testing SerialArray
+ Array mockArray = new MockArray();
+ SerialArray serialArray = new SerialArray(mockArray);
+
+ // test SerialArray with BIGINT array (PostgreSQL _int8 type)
+ Field field = new Field("dept_ids",
JDBCType.ARRAY.getVendorTypeNumber(), serialArray);
+ byte[] bytes = getParser().encode(createTestUndoLog(field));
+
+ BranchUndoLog decodedLog = getParser().decode(bytes);
+ Field decodedField = getFieldFromLog(decodedLog);
+
+ Assertions.assertTrue(
+ DataCompareUtils.isFieldEquals(field,
decodedField).getResult());
+
+ // verify the SerialArray properties are correctly
serialized/deserialized
+ SerialArray deserializedArray = (SerialArray) decodedField.getValue();
+ Assertions.assertEquals(serialArray.getBaseType(),
deserializedArray.getBaseType());
+ Assertions.assertEquals(serialArray.getBaseTypeName(),
deserializedArray.getBaseTypeName());
+ Assertions.assertArrayEquals(serialArray.getElements(),
deserializedArray.getElements());
+ }
+
+ @Test
+ public void testSerializeAndDeserializeSerialArrayWithNulls() throws
IOException, SQLException {
+ // create SerialArray with null elements
+ Array mockArrayWithNulls = new MockArrayWithNulls();
+ SerialArray serialArray = new SerialArray(mockArrayWithNulls);
+
+ Field field = new Field("nullable_array",
JDBCType.ARRAY.getVendorTypeNumber(), serialArray);
+ byte[] bytes = getParser().encode(createTestUndoLog(field));
+ BranchUndoLog decodedLog = getParser().decode(bytes);
+ Field decodedField = getFieldFromLog(decodedLog);
+
+ Assertions.assertTrue(
+ DataCompareUtils.isFieldEquals(field,
decodedField).getResult());
+
+ // verify null elements are handled correctly
+ SerialArray deserializedArray = (SerialArray) decodedField.getValue();
+ Object[] elements = deserializedArray.getElements();
+ Assertions.assertEquals(3, elements.length);
+ Assertions.assertEquals(1L, elements[0]);
+ Assertions.assertNull(elements[1]);
+ Assertions.assertEquals(3L, elements[2]);
+ }
+
+ private BranchUndoLog createTestUndoLog(Field field) {
+ BranchUndoLog branchUndoLog = new BranchUndoLog();
+ branchUndoLog.setXid("192.168.0.1:8091:123456");
+ branchUndoLog.setBranchId(123457);
+
+ List<SQLUndoLog> sqlUndoLogs = new ArrayList<>();
+ SQLUndoLog sqlUndoLog = new SQLUndoLog();
+ sqlUndoLog.setSqlType(SQLType.UPDATE);
+ sqlUndoLog.setTableName("test_table");
+
+ // Create before image with the field
+ TableRecords beforeImage = new TableRecords();
+ List<Row> beforeRows = new ArrayList<>();
+ Row beforeRow = new Row();
+ beforeRow.add(field);
+ beforeRows.add(beforeRow);
+ beforeImage.setRows(beforeRows);
+ beforeImage.setTableMeta(new TableMeta());
+ beforeImage.setTableName("test_table");
+ sqlUndoLog.setBeforeImage(beforeImage);
+
+ // Create empty after image
+ sqlUndoLog.setAfterImage(TableRecords.empty(new TableMeta()));
+
+ sqlUndoLogs.add(sqlUndoLog);
+ branchUndoLog.setSqlUndoLogs(sqlUndoLogs);
+
+ return branchUndoLog;
+ }
+
+ private Field getFieldFromLog(BranchUndoLog undoLog) {
+ return undoLog.getSqlUndoLogs()
+ .get(0)
+ .getBeforeImage()
+ .getRows()
+ .get(0)
+ .getFields()
+ .get(0);
+ }
+
+ /**
+ * Mock Array class for testing SerialArray serialization
+ */
+ private static class MockArray implements Array {
+ private final Object[] elements = {1L, 2L, 3L, 4L, 5L};
+
+ @Override
+ public String getBaseTypeName() throws SQLException {
+ return "int8";
+ }
+
+ @Override
+ public int getBaseType() throws SQLException {
+ return Types.BIGINT;
+ }
+
+ @Override
+ public Object getArray() throws SQLException {
+ return elements;
+ }
+
+ @Override
+ public Object getArray(Map<String, Class<?>> map) throws SQLException {
+ return elements;
+ }
+
+ @Override
+ public Object getArray(long index, int count) throws SQLException {
+ return elements;
+ }
+
+ @Override
+ public Object getArray(long index, int count, Map<String, Class<?>>
map) throws SQLException {
+ return elements;
+ }
+
+ @Override
+ public ResultSet getResultSet() throws SQLException {
+ return null;
+ }
+
+ @Override
+ public ResultSet getResultSet(Map<String, Class<?>> map) throws
SQLException {
+ return null;
+ }
+
+ @Override
+ public ResultSet getResultSet(long index, int count) throws
SQLException {
+ return null;
+ }
+
+ @Override
+ public ResultSet getResultSet(long index, int count, Map<String,
Class<?>> map) throws SQLException {
+ return null;
+ }
+
+ @Override
+ public void free() throws SQLException {
+ // do nothing
+ }
+ }
+
+ /**
+ * Mock Array class with null elements for testing edge cases
+ */
+ private static class MockArrayWithNulls implements Array {
+ private final Object[] elements = {1L, null, 3L};
+
+ @Override
+ public String getBaseTypeName() throws SQLException {
+ return "int8";
+ }
+
+ @Override
+ public int getBaseType() throws SQLException {
+ return Types.BIGINT;
+ }
+
+ @Override
+ public Object getArray() throws SQLException {
+ return elements;
+ }
+
+ @Override
+ public Object getArray(Map<String, Class<?>> map) throws SQLException {
+ return elements;
+ }
+
+ @Override
+ public Object getArray(long index, int count) throws SQLException {
+ return elements;
+ }
+
+ @Override
+ public Object getArray(long index, int count, Map<String, Class<?>>
map) throws SQLException {
+ return elements;
+ }
+
+ @Override
+ public ResultSet getResultSet() throws SQLException {
+ return null;
+ }
+
+ @Override
+ public ResultSet getResultSet(Map<String, Class<?>> map) throws
SQLException {
+ return null;
+ }
+
+ @Override
+ public ResultSet getResultSet(long index, int count) throws
SQLException {
+ return null;
+ }
+
+ @Override
+ public ResultSet getResultSet(long index, int count, Map<String,
Class<?>> map) throws SQLException {
+ return null;
+ }
+
+ @Override
+ public void free() throws SQLException {
+ // do nothing
+ }
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
