Merge branch '2.x' into 20250926

Author: funky-eyes

.github/workflows/test-druid.yml

@@ -42,6 +42,11 @@ jobs:
       fail-fast: false
       matrix:
         druid: [
+          1.2.25,
+#          1.2.24, #The source code depends on guava, resulting in a class not found, see the commit https://github.com/alibaba/druid/commit/f060c2701587948380bd0d07d5baf4f774c06e8a#diff-5200f514252efbc0c4b2dc51ebad5d840b4b3065b9556eb4368bd3476d4c220eR25
+          1.2.23,
+          1.2.22,
+          1.2.21,
           1.2.20,
           1.2.19,
           #1.2.18, # Unit test triggered a bug in Druid, see the commit https://github.com/alibaba/druid/commit/6c493f852852fb287ed5fd31ee16c27ead0ea5cf

changes/en-us/2.x.md

@@ -26,9 +26,11 @@ Add changes here for all PR submitted to the 2.x branch.
 - [[#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
+- [[#7664](https://github.com/apache/incubator-seata/pull/7664)] support shentongdatabase XA mode
 
 ### bugfix:
 
+- [[#6476](https://github.com/apache/seata/issues/6476)] Fix SerialArray equals() method for multi-dimensional array comparison in Phase 2 rollback
 - [[#7482](https://github.com/apache/incubator-seata/pull/7482)] Github Action workflow does not run the corresponding Kotlin test
 - [[#7538](https://github.com/apache/incubator-seata/pull/7538)] unify DmdbTimestamp comparison via UTC Instant to prevent rollback failure
 - [[#7546](https://github.com/seata/seata/pull/7546)] fix client spring version compatible
@@ -38,12 +40,13 @@ 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
+- [[#7644](https://github.com/apache/incubator-seata/pull/7644)] fix the compatibility issue of spotless when java 25
 - [[#7662](https://github.com/apache/incubator-seata/pull/7662)] ensure visibility of rm and The methods in MockTest are executed in order
 
 
-
 ### optimize:
 
+- [[#7460](https://github.com/apache/incubator-seata/pull/7460)] Remove hardcoded port configuration in core module test classes
 - [[#7478](https://github.com/apache/incubator-seata/pull/7484)] optimize: remove client id metric
 - [[#7557](https://github.com/seata/seata/pull/7557)] upgrade some npmjs dependencies
 - [[#7576](https://github.com/seata/seata/pull/7576)] Add empty push protection for Configuration
@@ -55,6 +58,8 @@ Add changes here for all PR submitted to the 2.x branch.
 - [[#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
+- [[#7673](https://github.com/apache/incubator-seata/pull/7673)] bump @babel/runtime from ^7.26.10 to ^7.27.0
+
 
 ### security:
 
@@ -69,6 +74,8 @@ 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
+- [[#7679](https://github.com/apache/incubator-seata/pull/7679)] fix old version connect timeout
 
 ### refactor:
 
@@ -77,6 +84,7 @@ 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
@@ -97,8 +105,12 @@ Thanks to these contributors for their code commits. Please report an unintended
 - [keepConcentration](https://github.com/keepConcentration)
 - [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)
-
+- [jongmin-chung](https://github.com/jongmin-chung)
+- [jihun4452](https://github.com/jihun4452)
+- [psxjoy](https://github.com/psxjoy)
+- [dsomehan](https://github.com/dsomehan)
 
 Also, we receive many valuable issues, questions and advices from our community. Thanks for you all.

changes/zh-cn/2.x.md

@@ -26,10 +26,12 @@
 - [[#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 数组类型的支持
+- [[#7664](https://github.com/apache/incubator-seata/pull/7565)] 支持神通数据库的XA模式
 
 
 ### bugfix:
 
+- [[#6476](https://github.com/apache/seata/issues/6476)] 修复SerialArray equals()方法在二阶段回滚中多维数组比较的问题
 - [[#7482](https://github.com/apache/incubator-seata/pull/7482)] Github Action 工作流未运行相应的 Kotlin 测试
 - [[#7538](https://github.com/apache/incubator-seata/pull/7538)] 统一DmdbTimestamp比较方式，通过UTC比较，以防止回滚失败
 - [[#7546](https://github.com/seata/seata/pull/7546)] 修复客户端spring版本兼容
@@ -39,11 +41,13 @@
 - [[#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配置文件中对于整数的兼容问题
+- [[#7644](https://github.com/apache/incubator-seata/pull/7644)] 修复JAVA25时spotless的兼容性问题
 - [[#7662](https://github.com/apache/incubator-seata/pull/7662)] 确保 rm 的可见性，并且 MockTest 中的方法按顺序执行
 
 
 ### optimize:
 
+- [[#7460](https://github.com/apache/incubator-seata/pull/7460)] 移除 core 模块测试类中的硬编码端口配置
 - [[#7478](https://github.com/apache/incubator-seata/pull/7484)] 删除client id指标
 - [[#7557](https://github.com/seata/seata/pull/7557)] 升级 npmjs 依赖
 - [[#7576](https://github.com/seata/seata/pull/7576)] 针对配置变更增加空推保护
@@ -54,6 +58,8 @@
 - [[#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.* 配置项类型
+- [[#7673](https://github.com/apache/incubator-seata/pull/7673)] 升级 @babel/runtime ^7.26.10 到 ^7.27.0
+
 
 ### security:
 
@@ -69,7 +75,8 @@
 - [[#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` 模块的测试用例
+- [[#7679](https://github.com/apache/incubator-seata/pull/7679)] 修复旧版本协议测试超时问题
 
 ### refactor:
 
@@ -78,6 +85,7 @@
 
 ### 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作为注册中心的注释
@@ -98,8 +106,13 @@
 - [keepConcentration](https://github.com/keepConcentration)
 - [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)
+- [jongmin-chung](https://github.com/jongmin-chung)
+- [jihun4452](https://github.com/jihun4452)
+- [psxjoy](https://github.com/psxjoy)
+- [dsomehan](https://github.com/dsomehan)
 
 
 同时，我们收到了社区反馈的很多有价值的issue和建议，非常感谢大家。

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/rm/datasource/xa/DataSourceProxyXATest.java

@@ -17,6 +17,7 @@
 package io.seata.rm.datasource.xa;
 
 import com.alibaba.druid.pool.DruidDataSource;
+import com.alibaba.druid.pool.DruidStatementConnection;
 import com.mysql.jdbc.JDBC4MySQLConnection;
 import com.mysql.jdbc.jdbc2.optional.JDBC4ConnectionWrapper;
 import io.seata.core.context.RootContext;
@@ -66,6 +67,7 @@ public void testGetConnection() throws SQLException {
 
         DruidDataSource druidDataSource = new DruidDataSource();
         druidDataSource.setDriver(driver);
+        druidDataSource.setUrl("jdbc:mysql:xxx");
         DataSourceProxyXA dataSourceProxyXA = new DataSourceProxyXA(druidDataSource);
         RootContext.unbind();
         Connection connFromDataSourceProxyXA = dataSourceProxyXA.getConnection();
@@ -79,6 +81,9 @@ public void testGetConnection() throws SQLException {
         Assertions.assertTrue(wrappedConnection instanceof PooledConnection);
 
         Connection wrappedPhysicalConn = ((PooledConnection) wrappedConnection).getConnection();
+        if (wrappedPhysicalConn instanceof DruidStatementConnection) {
+            wrappedPhysicalConn = ((DruidStatementConnection) wrappedPhysicalConn).getConnection();
+        }
         Assertions.assertSame(wrappedPhysicalConn, connection);
 
         XAConnection xaConnection = connectionProxyXA.getWrappedXAConnection();
@@ -101,6 +106,7 @@ public void testGetMariaXaConnection() throws SQLException, ClassNotFoundExcepti
 
         DruidDataSource druidDataSource = new DruidDataSource();
         druidDataSource.setDriver(driver);
+        druidDataSource.setUrl("jdbc:mariadb:xxx");
         DataSourceProxyXA dataSourceProxyXA = new DataSourceProxyXA(druidDataSource);
         RootContext.unbind();
         Connection connFromDataSourceProxyXA = dataSourceProxyXA.getConnection();
@@ -115,6 +121,9 @@ public void testGetMariaXaConnection() throws SQLException, ClassNotFoundExcepti
         Assertions.assertTrue(wrappedConnection instanceof PooledConnection);
 
         Connection wrappedPhysicalConn = ((PooledConnection) wrappedConnection).getConnection();
+        if (wrappedPhysicalConn instanceof DruidStatementConnection) {
+            wrappedPhysicalConn = ((DruidStatementConnection) wrappedPhysicalConn).getConnection();
+        }
         Assertions.assertSame(wrappedPhysicalConn, connection);
 
         XAConnection xaConnection = connectionProxyXA.getWrappedXAConnection();