Merge branch '2.x' into 250625

Author: slievrly

changes/en-us/2.x.md

@@ -23,7 +23,9 @@ Add changes here for all PR submitted to the 2.x branch.
 - [[#7485](https://github.com/apache/incubator-seata/pull/7485)] Add http request filter for seata-server
 - [[#7509](https://github.com/apache/incubator-seata/pull/7509)] Reuse connection to merge branch transactions
 - [[#7492](https://github.com/apache/incubator-seata/pull/7492)] upgrade HTTP client in common module to support HTTP/2
-  [[#7551](https://github.com/apache/incubator-seata/pull/7551)] XAUtils add support for DM Database
+- [[#7551](https://github.com/apache/incubator-seata/pull/7551)] XAUtils add support for DM Database
+- [[#7559](https://github.com/apache/incubator-seata/pull/7559)] Introduce Cleanup API for TableMetaRefreshHolder Instance
+- [[#7669](https://github.com/apache/incubator-seata/pull/7669)] add support for Jackson serialization and deserialization of PostgreSQL array types
 
 ### bugfix:
 
@@ -37,6 +39,7 @@ Add changes here for all PR submitted to the 2.x branch.
 - [[#7596](https://github.com/apache/incubator-seata/pull/7596)] Fixed the issue where deserialization failed when the xss filter obtained the default keyword
 - [[#7613](https://github.com/apache/incubator-seata/pull/7613)] Fixed the SQL error in the datetime format time query in the global lock query
 - [[#7624](https://github.com/apache/incubator-seata/pull/7624)] fix the compatibility issue of yml configuration files
+- [[#7662](https://github.com/apache/incubator-seata/pull/7662)] ensure visibility of rm and The methods in MockTest are executed in order
 
 ### optimize:
 
@@ -50,10 +53,12 @@ Add changes here for all PR submitted to the 2.x branch.
 - [[#7603](https://github.com/seata/seata/pull/7603)] upgrade Apache Tomcat dependency from 9.0.106 to 9.0.108
 - [[#7614](https://github.com/seata/seata/pull/7614)] update README.md
 - [[#7443](https://github.com/seata/seata/pull/7443)] Replace @LocalTCC with @SagaTransactional in the saga annotation pattern
+- [[#7645](https://github.com/seata/seata/pull/7645)] simplifying the relevant transport.* configuration types
 
 ### security:
 
-- [[#PR_NO](https://github.com/seata/seata/pull/PR_NO)] upgrade XXX
+- [[#7632](https://github.com/apache/incubator-seata/pull/7632)] upgrade sha.js to version 2.4.12
+- [[#7633](https://github.com/apache/incubator-seata/pull/7633)] Upgrade cipher-base to version 1.0.6
 
 
 ### test:
@@ -63,6 +68,7 @@ Add changes here for all PR submitted to the 2.x branch.
 - [[#7580](https://github.com/seata/seata/pull/7580)]  fix the exception caused by the disorder of test case execution order
 - [[#7584](https://github.com/apache/incubator-seata/pull/7584)] deflake ConsulConfigurationTest#testInitSeataConfig with short await/retry to absorb CI timing delay
 - [[#7610](https://github.com/apache/incubator-seata/pull/7610)] Enable Nacos integration tests when nacosCaseEnabled is true
+- [[#7672](https://github.com/apache/incubator-seata/pull/7672)] Add unit tests for the `seata-common` module
 
 ### refactor:
 
@@ -71,9 +77,11 @@ Add changes here for all PR submitted to the 2.x branch.
 
 ### doc:
 
+- [[#7462](https://github.com/seata/seata/pull/7462)] improve TM module Javadoc with comprehensive English documentation
 - [[#7531](https://github.com/seata/seata/pull/7531)] Optimize the Readme and change documents
 - [[#7569](https://github.com/seata/seata/pull/7569)] Add hyperlink to CONTRIBUTING.md in pull request template
 - [[#7605](https://github.com/apache/incubator-seata/pull/7605)] Add the type of registry as seata in application.yml
+- [[#7625](https://github.com/apache/incubator-seata/pull/7625)] Polish Javadoc for @EnableAutoDataSourceProxy and DefaultFailureHandlerImpl
 
 
 Thanks to these contributors for their code commits. Please report an unintended omission.
@@ -91,6 +99,8 @@ Thanks to these contributors for their code commits. Please report an unintended
 - [sunheyi6](https://github.com/sunheyi6)
 - [WangzJi](https://github.com/WangzJi)
 - [unifolio0](https://github.com/unifolio0)
-
+- [Asuka-star](https://github.com/Asuka-star)
+- [YoWuwuuuw](https://github.com/YoWuwuuuw)
+- [psxjoy](https://github.com/psxjoy)
 
 Also, we receive many valuable issues, questions and advices from our community. Thanks for you all.

changes/zh-cn/2.x.md

@@ -24,6 +24,8 @@
 - [[#7509](https://github.com/apache/incubator-seata/pull/7509)] 复用连接合并分支事务
 - [[#7492](https://github.com/apache/incubator-seata/pull/7492)] 升级 common 模块中的 HTTP 客户端以支持 HTTP/2
 - [[#7551](https://github.com/apache/incubator-seata/pull/7551)] XAUtils支持达梦数据库
+- [[#7559](https://github.com/apache/incubator-seata/pull/7559)] 为 TableMetaRefreshHolder 实例引入清理 API
+- [[#7669](https://github.com/apache/incubator-seata/pull/7669)] 添加对 Jackson 序列化和反序列化 PostgreSQL 数组类型的支持
 
 
 ### bugfix:
@@ -38,6 +40,7 @@
 - [[#7596](https://github.com/apache/incubator-seata/pull/7596)] 修复xss过滤器获取默认关键字时反序列化失败的问题
 - [[#7613](https://github.com/apache/incubator-seata/pull/7613)] 修复全局锁查询中的datetime时间格式时间查询sql错误
 - [[#7624](https://github.com/apache/incubator-seata/pull/7624)] 修复yml配置文件中对于整数的兼容问题
+- [[#7662](https://github.com/apache/incubator-seata/pull/7662)] 确保 rm 的可见性，并且 MockTest 中的方法按顺序执行
 
 
 ### optimize:
@@ -51,10 +54,13 @@
 - [[#7603](https://github.com/seata/seata/pull/7603)] 将Apache Tomcat依赖项从9.0.106升级到9.0.108 
 - [[#7614](https://github.com/seata/seata/pull/7614)] 更新 README.md
 - [[#7443](https://github.com/seata/seata/pull/7443)] 将saga注释模式中的@LocalTCC替换为@SagaTransactional
+- [[#7645](https://github.com/seata/seata/pull/7645)] 简化相关的 transport.* 配置项类型
 
 ### security:
 
-- [[#PR_NO](https://github.com/seata/seata/pull/PR_NO)] 升级 XXX
+- [[#7632](https://github.com/apache/incubator-seata/pull/7632)] 升级sha.js为2.4.12
+- [[#7633](https://github.com/apache/incubator-seata/pull/7633)] 升级cipher-base为1.0.6
+
 
 ### test:
 
@@ -64,6 +70,7 @@
 - [[#7580](https://github.com/seata/seata/pull/7580)]  修复测试用例顺序错乱导致的异常
 - [[#7584](https://github.com/seata/seata/pull/7584)] 修复 ConsulConfigurationTest#testInitSeataConfig 在 CI 中由于等待/重试时间过短导致的不稳定问题
 - [[#7610](https://github.com/apache/incubator-seata/pull/7610)] 当nacosCaseEnabled为true时启用nacos集成测试
+- [[#7672](https://github.com/apache/incubator-seata/pull/7672)] 增加 `seata-common` 模块的测试用例
 
 
 ### refactor:
@@ -73,9 +80,11 @@
 
 ### doc:
 
+- [[#7462](https://github.com/seata/seata/pull/7462)] 完善 TM 模块的 Javadoc，补充全面的英文文档说明。
 - [[#7531](https://github.com/seata/seata/pull/7531)] 优化 Readme 和 change 文档
 - [[#7569](https://github.com/seata/seata/pull/7569)] 在拉取请求模板中添加 CONTRIBUTING.md 超链接
 - [[#7605](https://github.com/apache/incubator-seata/pull/7605)] 在application.yml中增加了seata作为注册中心的注释
+- [[#7625](https://github.com/apache/incubator-seata/pull/7625)] 改进 @EnableAutoDataSourceProxy 和 DefaultFailureHandlerImpl 的 Javadoc
 
 
 非常感谢以下 contributors 的代码贡献。若有无意遗漏，请报告。
@@ -93,6 +102,8 @@
 - [sunheyi6](https://github.com/sunheyi6)
 - [WangzJi](https://github.com/WangzJi)
 - [unifolio0](https://github.com/unifolio0)
-
+- [Asuka-star](https://github.com/Asuka-star)
+- [YoWuwuuuw](https://github.com/YoWuwuuuw)
+- [psxjoy](https://github.com/psxjoy)
 
 同时，我们收到了社区反馈的很多有价值的issue和建议，非常感谢大家。

common/src/main/java/org/apache/seata/common/ConfigurationKeys.java

@@ -667,11 +667,13 @@ public interface ConfigurationKeys {
     /**
      * The constant TRANSPORT_TYPE
      */
+    @Deprecated
     String TRANSPORT_TYPE = TRANSPORT_PREFIX + "type";
 
     /**
      * The constant TRANSPORT_SERVER
      */
+    @Deprecated
     String TRANSPORT_SERVER = TRANSPORT_PREFIX + "server";
 
     /**

common/src/test/java/org/apache/seata/common/util/PageUtilTest.java

@@ -34,6 +34,7 @@
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.doNothing;
 
 /**
@@ -74,6 +75,7 @@ public void testPageSql() {
         assertEquals(PageUtil.pageSql(sourceSql, "oceanbase", 1, 5), mysqlTargetSql);
         assertEquals(PageUtil.pageSql(sourceSql, "dm", 1, 5), mysqlTargetSql);
         assertEquals(PageUtil.pageSql(sourceSql, "oscar", 1, 5), mysqlTargetSql);
+        assertEquals(PageUtil.pageSql(sourceSql, "kingbase", 1, 5), mysqlTargetSql);
         assertEquals(PageUtil.pageSql(sourceSql, "oracle", 1, 5), oracleTargetSql);
         assertEquals(PageUtil.pageSql(sourceSql, "sqlserver", 1, 5), sqlserverTargetSql);
 
@@ -92,6 +94,7 @@ void testCountSql() {
         assertEquals(PageUtil.countSql(sourceSql, "oceanbase"), targetSql);
         assertEquals(PageUtil.countSql(sourceSql, "dm"), targetSql);
         assertEquals(PageUtil.countSql(sourceSql, "oscar"), targetSql);
+        assertEquals(PageUtil.countSql(sourceSql, "kingbase"), targetSql);
         assertEquals(PageUtil.countSql(sourceSql, "oracle"), targetSql);
         assertEquals(PageUtil.countSql(sourceSql, "sqlserver"), targetSql);
 
@@ -189,4 +192,166 @@ public void getTimeStartSqlNotSupportedDBType() {
                 IllegalArgumentException.class,
                 () -> PageUtil.getTimeStartSql(notSupportedDBType, validTimeColumnName));
     }
+
+    @Test
+    public void testGetTimeEndSqlSupportedDBTypes() {
+        String[] supportedDBTypes = {"mysql", "oracle", "postgresql", "sqlserver", "dm", "oscar"};
+        String expectedSQL = " and FLOOR(gmt_create/1000) <= ? ";
+
+        for (String dbType : supportedDBTypes) {
+            assertEquals(expectedSQL, PageUtil.getTimeEndSql(dbType, validTimeColumnName));
+        }
+    }
+
+    @Test
+    public void testGetTimeEndSqlNotSupportedDBType() {
+        String notSupportedDBType = "xxx";
+        assertThrows(
+                IllegalArgumentException.class, () -> PageUtil.getTimeEndSql(notSupportedDBType, validTimeColumnName));
+    }
+
+    @Test
+    public void testGetDateTimeStartSqlMySQL() {
+        String expectedSQL = " and UNIX_TIMESTAMP(gmt_create) >= ? ";
+        assertEquals(expectedSQL, PageUtil.getDateTimeStartSql("mysql", validTimeColumnName));
+    }
+
+    @Test
+    public void testGetDateTimeStartSqlPostgreSQL() {
+        String expectedSQL = " and gmt_create >= TO_TIMESTAMP(?) ";
+        assertEquals(expectedSQL, PageUtil.getDateTimeStartSql("postgresql", validTimeColumnName));
+    }
+
+    @Test
+    public void testGetDateTimeStartSqlOracle() {
+        String expectedSQL =
+                " and gmt_create >= TO_TIMESTAMP('1970-01-01 00:00:00', 'YYYY-MM-DD HH24:MI:SS') + NUMTODSINTERVAL(?, 'SECOND') ";
+        assertEquals(expectedSQL, PageUtil.getDateTimeStartSql("oracle", validTimeColumnName));
+    }
+
+    @Test
+    public void testGetDateTimeStartSqlSQLServer() {
+        String expectedSQL = " and gmt_create >= DATEADD(SECOND, ?, '1970-01-01 00:00:00') ";
+        assertEquals(expectedSQL, PageUtil.getDateTimeStartSql("sqlserver", validTimeColumnName));
+    }
+
+    @Test
+    public void testGetDateTimeStartSqlDM() {
+        String expectedSQL =
+                " and gmt_create >= TO_TIMESTAMP('1970-01-01 00:00:00', 'YYYY-MM-DD HH24:MI:SS') + NUMTODSINTERVAL(?, 'SECOND') ";
+        assertEquals(expectedSQL, PageUtil.getDateTimeStartSql("dm", validTimeColumnName));
+    }
+
+    @Test
+    public void testGetDateTimeStartSqlOscar() {
+        String expectedSQL =
+                " and gmt_create >= TO_TIMESTAMP('1970-01-01 00:00:00', 'YYYY-MM-DD HH24:MI:SS') + NUMTODSINTERVAL(?, 'SECOND') ";
+        assertEquals(expectedSQL, PageUtil.getDateTimeStartSql("oscar", validTimeColumnName));
+    }
+
+    @Test
+    public void testGetDateTimeStartSqlNotSupportedDBType() {
+        String notSupportedDBType = "xxx";
+        assertThrows(
+                IllegalArgumentException.class,
+                () -> PageUtil.getDateTimeStartSql(notSupportedDBType, validTimeColumnName));
+    }
+
+    @Test
+    public void testGetDateTimeEndSqlMySQL() {
+        String expectedSQL = " and UNIX_TIMESTAMP(gmt_create) <= ? ";
+        assertEquals(expectedSQL, PageUtil.getDateTimeEndSql("mysql", validTimeColumnName));
+    }
+
+    @Test
+    public void testGetDateTimeEndSqlPostgreSQL() {
+        String expectedSQL = " and gmt_create <= TO_TIMESTAMP(?) ";
+        assertEquals(expectedSQL, PageUtil.getDateTimeEndSql("postgresql", validTimeColumnName));
+    }
+
+    @Test
+    public void testGetDateTimeEndSqlOracle() {
+        String expectedSQL =
+                " and gmt_create <= TO_TIMESTAMP('1970-01-01 00:00:00', 'YYYY-MM-DD HH24:MI:SS') + NUMTODSINTERVAL(?, 'SECOND') ";
+        assertEquals(expectedSQL, PageUtil.getDateTimeEndSql("oracle", validTimeColumnName));
+    }
+
+    @Test
+    public void testGetDateTimeEndSqlSQLServer() {
+        String expectedSQL = " and gmt_create <= DATEADD(SECOND, ?, '1970-01-01 00:00:00') ";
+        assertEquals(expectedSQL, PageUtil.getDateTimeEndSql("sqlserver", validTimeColumnName));
+    }
+
+    @Test
+    public void testGetDateTimeEndSqlDM() {
+        String expectedSQL =
+                " and gmt_create <= TO_TIMESTAMP('1970-01-01 00:00:00', 'YYYY-MM-DD HH24:MI:SS') + NUMTODSINTERVAL(?, 'SECOND') ";
+        assertEquals(expectedSQL, PageUtil.getDateTimeEndSql("dm", validTimeColumnName));
+    }
+
+    @Test
+    public void testGetDateTimeEndSqlOscar() {
+        String expectedSQL =
+                " and gmt_create <= TO_TIMESTAMP('1970-01-01 00:00:00', 'YYYY-MM-DD HH24:MI:SS') + NUMTODSINTERVAL(?, 'SECOND') ";
+        assertEquals(expectedSQL, PageUtil.getDateTimeEndSql("oscar", validTimeColumnName));
+    }
+
+    @Test
+    public void testGetDateTimeEndSqlNotSupportedDBType() {
+        String notSupportedDBType = "xxx";
+        assertThrows(
+                IllegalArgumentException.class,
+                () -> PageUtil.getDateTimeEndSql(notSupportedDBType, validTimeColumnName));
+    }
+
+    @Test
+    public void testCountSqlWithOrderByPostgreSQL() {
+        String sourceSqlWithOrderBy = "select * from test where a = 1 order by id desc";
+        String expectedSql = "select count(1) from test where a = 1 ";
+
+        assertEquals(expectedSql, PageUtil.countSql(sourceSqlWithOrderBy, "postgresql"));
+        assertEquals(expectedSql, PageUtil.countSql(sourceSqlWithOrderBy, "kingbase"));
+        assertEquals(expectedSql, PageUtil.countSql(sourceSqlWithOrderBy, "sqlserver"));
+    }
+
+    @Test
+    public void testCountSqlWithoutOrderByPostgreSQL() {
+        String sourceSqlWithoutOrderBy = "select * from test where a = 1";
+        String expectedSql = "select count(1) from test where a = 1";
+
+        assertEquals(expectedSql, PageUtil.countSql(sourceSqlWithoutOrderBy, "postgresql"));
+        assertEquals(expectedSql, PageUtil.countSql(sourceSqlWithoutOrderBy, "kingbase"));
+        assertEquals(expectedSql, PageUtil.countSql(sourceSqlWithoutOrderBy, "sqlserver"));
+    }
+
+    @Test
+    public void testSetObjectWithSQLException() throws SQLException {
+        List<Object> params = new ArrayList<>();
+        params.add("test");
+
+        PreparedStatement preparedStatement = Mockito.mock(PreparedStatement.class);
+        Mockito.doThrow(new SQLException("Test exception"))
+                .when(preparedStatement)
+                .setObject(anyInt(), any());
+
+        assertThrows(SQLException.class, () -> PageUtil.setObject(preparedStatement, params));
+    }
+
+    @Test
+    public void testSetObjectWithMultipleTypes() throws SQLException {
+        List<Object> params = new ArrayList<>();
+        params.add(new Date(System.currentTimeMillis()));
+        params.add("testString");
+        params.add(123);
+        params.add(null);
+
+        PreparedStatement preparedStatement = Mockito.mock(PreparedStatement.class);
+        doNothing().when(preparedStatement).setDate(anyInt(), any(java.sql.Date.class));
+        doNothing().when(preparedStatement).setObject(anyInt(), any());
+
+        PageUtil.setObject(preparedStatement, params);
+
+        Mockito.verify(preparedStatement, Mockito.times(1)).setDate(eq(1), any(java.sql.Date.class));
+        Mockito.verify(preparedStatement, Mockito.times(3)).setObject(anyInt(), any());
+    }
 }

compatible/src/test/java/io/seata/spi/SPITest.java

@@ -37,7 +37,7 @@ public void testRmSPIOrder() {
         Assertions.assertNotNull(list);
         ResourceManager resourceManager = list.get(list.size() - 1);
         Assertions.assertEquals(
-                "io.seata.saga.rm.SagaResourceManager",
+                "org.apache.seata.saga.rm.SagaResourceManager",
                 resourceManager.getClass().getName());
     }
 }

compressor/seata-compressor-deflater/src/main/java/org/apache/seata/compressor/deflater/DeflaterUtil.java

@@ -31,15 +31,15 @@ public static byte[] compress(byte[] bytes) {
         if (bytes == null) {
             throw new NullPointerException("bytes is null");
         }
-        int lenght = 0;
+        int length = 0;
         Deflater deflater = new Deflater();
         deflater.setInput(bytes);
         deflater.finish();
         byte[] outputBytes = new byte[BUFFER_SIZE];
         try (ByteArrayOutputStream bos = new ByteArrayOutputStream()) {
             while (!deflater.finished()) {
-                lenght = deflater.deflate(outputBytes);
-                bos.write(outputBytes, 0, lenght);
+                length = deflater.deflate(outputBytes);
+                bos.write(outputBytes, 0, length);
             }
             deflater.end();
             return bos.toByteArray();