Bump the minimum Seata Client version for Seata AT integration to 2.2.0

apache · Dec 1, 2024 · 16ba650 · 16ba650
1 parent 1671636
commit 16ba650
Show file tree

Hide file tree

Showing 23 changed files with 564 additions and 247 deletions.
diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
@@ -30,6 +30,7 @@
 1. Proxy Native: Support local transactions of ClickHouse under GraalVM Native Image - [#33801](https://github.com/apache/shardingsphere/pull/33801)
 1. Doc: Adds documentation for ClickHouse support - [#33779](https://github.com/apache/shardingsphere/pull/33779)
 1. Doc: Removes use of `iceberg.mr.schema.auto.conversion` from documentation due to HIVE-26507 - [#33828](https://github.com/apache/shardingsphere/pull/33828)
+1. Kernel: Bump the minimum Seata Client version for Seata AT integration to 2.2.0 - [#33872](https://github.com/apache/shardingsphere/pull/33872)
 
 ### Bug Fixes
 

diff --git a/...ent/content/user-manual/shardingsphere-jdbc/special-api/transaction/seata.cn.md b/...ent/content/user-manual/shardingsphere-jdbc/special-api/transaction/seata.cn.md
diff --git a/...ent/content/user-manual/shardingsphere-jdbc/special-api/transaction/seata.en.md b/...ent/content/user-manual/shardingsphere-jdbc/special-api/transaction/seata.en.md
diff --git a/...m.alibaba/druid/1.2.7/reflect-config.json → ....alibaba/druid/1.2.20/reflect-config.json b/...m.alibaba/druid/1.2.7/reflect-config.json → ....alibaba/druid/1.2.20/reflect-config.json
diff --git a/....alibaba/druid/1.2.7/resource-config.json → ...alibaba/druid/1.2.20/resource-config.json b/....alibaba/druid/1.2.7/resource-config.json → ...alibaba/druid/1.2.20/resource-config.json
diff --git a/...e.seata/seata-all/2.1.0/proxy-config.json → ...e.seata/seata-all/2.2.0/proxy-config.json b/...e.seata/seata-all/2.1.0/proxy-config.json → ...e.seata/seata-all/2.2.0/proxy-config.json
diff --git a/...seata/seata-all/2.1.0/reflect-config.json → ...seata/seata-all/2.2.0/reflect-config.json b/...seata/seata-all/2.1.0/reflect-config.json → ...seata/seata-all/2.2.0/reflect-config.json
@@ -28,7 +28,7 @@
   "name":"io.seata.core.rpc.hook.RpcHook"
 },
 {
-  "condition":{"typeReachable":"org.apache.seata.core.serializer.SerializerServiceLoader"},
+  "condition":{"typeReachable":"org.apache.seata.common.loader.EnhancedServiceLoader$InnerEnhancedServiceLoader"},
   "name":"io.seata.core.serializer.Serializer"
 },
 {
@@ -94,7 +94,7 @@
   "name":"org.apache.seata.config.Configuration"
 },
 {
-  "condition":{"typeReachable":"org.apache.seata.config.ConfigurationCache$$Lambda/0x00007fea13cd9cb0"},
+  "condition":{"typeReachable":"org.apache.seata.config.ConfigurationCache$$Lambda/0x00007fda3bd03530"},
   "name":"org.apache.seata.config.Configuration"
 },
 {
@@ -156,11 +156,11 @@
 },
 {
   "condition":{"typeReachable":"org.apache.seata.core.rpc.netty.NettyClientBootstrap$1"},
-  "name":"org.apache.seata.core.rpc.netty.v1.ProtocolV1Decoder"
+  "name":"org.apache.seata.core.rpc.netty.v1.ProtocolDecoderV1"
 },
 {
   "condition":{"typeReachable":"org.apache.seata.core.rpc.netty.NettyClientBootstrap$1"},
-  "name":"org.apache.seata.core.rpc.netty.v1.ProtocolV1Encoder"
+  "name":"org.apache.seata.core.rpc.netty.v1.ProtocolEncoderV1"
 },
 {
   "condition":{"typeReachable":"org.apache.seata.discovery.registry.RegistryFactory"},
@@ -187,6 +187,10 @@
   "condition":{"typeReachable":"org.apache.seata.discovery.registry.RegistryFactory"},
   "name":"org.apache.seata.discovery.registry.nacos.NacosRegistryProvider"
 },
+{
+  "condition":{"typeReachable":"org.apache.seata.discovery.registry.RegistryFactory"},
+  "name":"org.apache.seata.discovery.registry.namingserver.NamingserverRegistryProvider"
+},
 {
   "condition":{"typeReachable":"org.apache.seata.discovery.registry.RegistryFactory"},
   "name":"org.apache.seata.discovery.registry.raft.RaftRegistryProvider"
@@ -281,7 +285,7 @@
   "name":"org.apache.seata.rm.datasource.sql.struct.Field"
 },
 {
-  "condition":{"typeReachable":"org.apache.seata.rm.datasource.ConnectionProxy$$Lambda/0x00007fea13db8000"},
+  "condition":{"typeReachable":"org.apache.seata.rm.datasource.ConnectionProxy$$Lambda/0x00007fda3bdf6300"},
   "name":"org.apache.seata.rm.datasource.sql.struct.Field"
 },
 {
@@ -306,7 +310,7 @@
   "name":"org.apache.seata.rm.datasource.sql.struct.Field"
 },
 {
-  "condition":{"typeReachable":"org.apache.seata.rm.datasource.exec.AbstractDMLBaseExecutor$$Lambda/0x00007fea13d17d98"},
+  "condition":{"typeReachable":"org.apache.seata.rm.datasource.exec.AbstractDMLBaseExecutor$$Lambda/0x00007fda3bde4000"},
   "name":"org.apache.seata.rm.datasource.sql.struct.Field"
 },
 {
@@ -350,7 +354,7 @@
   "name":"org.apache.seata.rm.datasource.sql.struct.Row"
 },
 {
-  "condition":{"typeReachable":"org.apache.seata.rm.datasource.ConnectionProxy$$Lambda/0x00007fea13db8000"},
+  "condition":{"typeReachable":"org.apache.seata.rm.datasource.ConnectionProxy$$Lambda/0x00007fda3bdf6300"},
   "name":"org.apache.seata.rm.datasource.sql.struct.Row"
 },
 {
@@ -375,7 +379,7 @@
   "name":"org.apache.seata.rm.datasource.sql.struct.Row"
 },
 {
-  "condition":{"typeReachable":"org.apache.seata.rm.datasource.exec.AbstractDMLBaseExecutor$$Lambda/0x00007fea13d17d98"},
+  "condition":{"typeReachable":"org.apache.seata.rm.datasource.exec.AbstractDMLBaseExecutor$$Lambda/0x00007fda3bde4000"},
   "name":"org.apache.seata.rm.datasource.sql.struct.Row"
 },
 {
@@ -407,7 +411,7 @@
   "name":"org.apache.seata.rm.datasource.sql.struct.TableRecords"
 },
 {
-  "condition":{"typeReachable":"org.apache.seata.rm.datasource.ConnectionProxy$$Lambda/0x00007fea13db8000"},
+  "condition":{"typeReachable":"org.apache.seata.rm.datasource.ConnectionProxy$$Lambda/0x00007fda3bdf6300"},
   "name":"org.apache.seata.rm.datasource.sql.struct.TableRecords"
 },
 {
@@ -432,7 +436,7 @@
   "name":"org.apache.seata.rm.datasource.sql.struct.TableRecords"
 },
 {
-  "condition":{"typeReachable":"org.apache.seata.rm.datasource.exec.AbstractDMLBaseExecutor$$Lambda/0x00007fea13d17d98"},
+  "condition":{"typeReachable":"org.apache.seata.rm.datasource.exec.AbstractDMLBaseExecutor$$Lambda/0x00007fda3bde4000"},
   "name":"org.apache.seata.rm.datasource.sql.struct.TableRecords"
 },
 {
@@ -508,7 +512,7 @@
   "name":"org.apache.seata.rm.datasource.undo.BranchUndoLog"
 },
 {
-  "condition":{"typeReachable":"org.apache.seata.rm.datasource.ConnectionProxy$$Lambda/0x00007fea13db8000"},
+  "condition":{"typeReachable":"org.apache.seata.rm.datasource.ConnectionProxy$$Lambda/0x00007fda3bdf6300"},
   "name":"org.apache.seata.rm.datasource.undo.BranchUndoLog"
 },
 {
@@ -533,7 +537,7 @@
   "name":"org.apache.seata.rm.datasource.undo.BranchUndoLog"
 },
 {
-  "condition":{"typeReachable":"org.apache.seata.rm.datasource.exec.AbstractDMLBaseExecutor$$Lambda/0x00007fea13d17d98"},
+  "condition":{"typeReachable":"org.apache.seata.rm.datasource.exec.AbstractDMLBaseExecutor$$Lambda/0x00007fda3bde4000"},
   "name":"org.apache.seata.rm.datasource.undo.BranchUndoLog"
 },
 {
@@ -565,7 +569,7 @@
   "name":"org.apache.seata.rm.datasource.undo.SQLUndoLog"
 },
 {
-  "condition":{"typeReachable":"org.apache.seata.rm.datasource.ConnectionProxy$$Lambda/0x00007fea13db8000"},
+  "condition":{"typeReachable":"org.apache.seata.rm.datasource.ConnectionProxy$$Lambda/0x00007fda3bdf6300"},
   "name":"org.apache.seata.rm.datasource.undo.SQLUndoLog"
 },
 {
@@ -590,7 +594,7 @@
   "name":"org.apache.seata.rm.datasource.undo.SQLUndoLog"
 },
 {
-  "condition":{"typeReachable":"org.apache.seata.rm.datasource.exec.AbstractDMLBaseExecutor$$Lambda/0x00007fea13d17d98"},
+  "condition":{"typeReachable":"org.apache.seata.rm.datasource.exec.AbstractDMLBaseExecutor$$Lambda/0x00007fda3bde4000"},
   "name":"org.apache.seata.rm.datasource.undo.SQLUndoLog"
 },
 {
@@ -718,17 +722,21 @@
   "methods":[{"name":"<init>","parameterTypes":[] }]
 },
 {
-  "condition":{"typeReachable":"org.apache.seata.core.serializer.SerializerServiceLoader"},
+  "condition":{"typeReachable":"org.apache.seata.common.loader.EnhancedServiceLoader$InnerEnhancedServiceLoader"},
   "name":"org.apache.seata.serializer.hessian.HessianSerializer"
 },
 {
-  "condition":{"typeReachable":"org.apache.seata.core.serializer.SerializerServiceLoader"},
+  "condition":{"typeReachable":"org.apache.seata.common.loader.EnhancedServiceLoader$InnerEnhancedServiceLoader"},
   "name":"org.apache.seata.serializer.kryo.KryoSerializer"
 },
 {
-  "condition":{"typeReachable":"org.apache.seata.core.serializer.SerializerServiceLoader"},
+  "condition":{"typeReachable":"org.apache.seata.common.util.ReflectionUtil"},
+  "name":"org.apache.seata.serializer.protobuf.ProtobufSerializer"
+},
+{
+  "condition":{"typeReachable":"org.apache.seata.common.loader.EnhancedServiceLoader$InnerEnhancedServiceLoader"},
   "name":"org.apache.seata.serializer.seata.SeataSerializer",
-  "methods":[{"name":"<init>","parameterTypes":[] }]
+  "methods":[{"name":"<init>","parameterTypes":["java.lang.Byte"] }]
 },
 {
   "condition":{"typeReachable":"org.apache.seata.rm.datasource.PreparedStatementProxy"},
@@ -824,7 +832,7 @@
   "methods":[{"name":"<init>","parameterTypes":[] }]
 },
 {
-  "condition":{"typeReachable":"org.apache.seata.common.loader.EnhancedServiceLoader$InnerEnhancedServiceLoader"},
+  "condition":{"typeReachable":"org.apache.seata.common.loader.EnhancedServiceLoader"},
   "name":"io.seata.config.file.FileConfig"
 }
 ]
diff --git a/...eata/seata-all/2.1.0/resource-config.json → ...eata/seata-all/2.2.0/resource-config.json b/...eata/seata-all/2.1.0/resource-config.json → ...eata/seata-all/2.2.0/resource-config.json
@@ -1,9 +1,6 @@
 {
   "resources":{
   "includes":[{
-    "condition":{"typeReachable":"org.apache.seata.sqlparser.druid.DruidDbTypeParserImpl"},
-    "pattern":"\\QMETA-INF/druid-driver.properties\\E"
-  }, {
     "condition":{"typeReachable":"org.apache.seata.config.ConfigurationFactory"},
     "pattern":"\\QMETA-INF/seata/io.seata.config.ConfigurationProvider\\E"
   }, {
@@ -16,7 +13,7 @@
     "condition":{"typeReachable":"org.apache.seata.rm.DefaultResourceManager"},
     "pattern":"\\QMETA-INF/seata/io.seata.core.model.ResourceManager\\E"
   }, {
-    "condition":{"typeReachable":"org.apache.seata.core.serializer.SerializerServiceLoader"},
+    "condition":{"typeReachable":"org.apache.seata.common.loader.EnhancedServiceLoader$InnerEnhancedServiceLoader"},
     "pattern":"\\QMETA-INF/seata/io.seata.core.serializer.Serializer\\E"
   }, {
     "condition":{"typeReachable":"org.apache.seata.discovery.registry.RegistryFactory"},
@@ -49,7 +46,7 @@
     "condition":{"typeReachable":"org.apache.seata.core.rpc.netty.AbstractNettyRemoting"},
     "pattern":"\\QMETA-INF/seata/org.apache.seata.core.rpc.hook.RpcHook\\E"
   }, {
-    "condition":{"typeReachable":"org.apache.seata.core.serializer.SerializerServiceLoader"},
+    "condition":{"typeReachable":"org.apache.seata.common.loader.EnhancedServiceLoader$InnerEnhancedServiceLoader"},
     "pattern":"\\QMETA-INF/seata/org.apache.seata.core.serializer.Serializer\\E"
   }, {
     "condition":{"typeReachable":"org.apache.seata.discovery.registry.RegistryFactory"},
@@ -100,7 +97,7 @@
     "condition":{"typeReachable":"org.apache.seata.rm.DefaultResourceManager"},
     "pattern":"\\QMETA-INF/services/io.seata.core.model.ResourceManager\\E"
   }, {
-    "condition":{"typeReachable":"org.apache.seata.core.serializer.SerializerServiceLoader"},
+    "condition":{"typeReachable":"org.apache.seata.common.loader.EnhancedServiceLoader$InnerEnhancedServiceLoader"},
     "pattern":"\\QMETA-INF/services/io.seata.core.serializer.Serializer\\E"
   }, {
     "condition":{"typeReachable":"org.apache.seata.discovery.registry.RegistryFactory"},
@@ -133,7 +130,7 @@
     "condition":{"typeReachable":"org.apache.seata.core.rpc.netty.AbstractNettyRemoting"},
     "pattern":"\\QMETA-INF/services/org.apache.seata.core.rpc.hook.RpcHook\\E"
   }, {
-    "condition":{"typeReachable":"org.apache.seata.core.serializer.SerializerServiceLoader"},
+    "condition":{"typeReachable":"org.apache.seata.common.loader.EnhancedServiceLoader$InnerEnhancedServiceLoader"},
     "pattern":"\\QMETA-INF/services/org.apache.seata.core.serializer.Serializer\\E"
   }, {
     "condition":{"typeReachable":"org.apache.seata.discovery.registry.RegistryFactory"},

diff --git a/...ative-image/org.apache.shardingsphere/generated-reachability-metadata/reflect-config.json b/...ative-image/org.apache.shardingsphere/generated-reachability-metadata/reflect-config.json
@@ -16,7 +16,7 @@
   "name":"[Lcom.github.dockerjava.api.model.VolumesFrom;"
 },
 {
-  "condition":{"typeReachable":"org.apache.shardingsphere.driver.jdbc.core.connection.DriverDatabaseConnectionManager$$Lambda/0x00007f1137caca88"},
+  "condition":{"typeReachable":"org.apache.shardingsphere.driver.jdbc.core.connection.DriverDatabaseConnectionManager$$Lambda/0x00007f191bcb0000"},
   "name":"[Lcom.zaxxer.hikari.util.ConcurrentBag$IConcurrentBagEntry;"
 },
 {
@@ -2080,7 +2080,7 @@
   "queryAllDeclaredMethods":true
 },
 {
-  "condition":{"typeReachable":"org.apache.shardingsphere.mode.manager.cluster.listener.DatabaseMetaDataChangedListener$$Lambda/0x00007f1137b2dc80"},
+  "condition":{"typeReachable":"org.apache.shardingsphere.mode.manager.cluster.listener.DatabaseMetaDataChangedListener$$Lambda/0x00007f191bb2bb50"},
   "name":"org.apache.shardingsphere.mode.manager.cluster.event.subscriber.dispatch.MetaDataChangedSubscriber"
 },
 {
@@ -2278,7 +2278,7 @@
   "name":"org.apache.shardingsphere.proxy.backend.config.yaml.YamlProxyServerConfiguration",
   "allDeclaredFields":true,
   "queryAllPublicMethods":true,
-  "methods":[{"name":"<init>","parameterTypes":[] }, {"name":"setAuthority","parameterTypes":["org.apache.shardingsphere.authority.yaml.config.YamlAuthorityRuleConfiguration"] }, {"name":"setMode","parameterTypes":["org.apache.shardingsphere.infra.yaml.config.pojo.mode.YamlModeConfiguration"] }, {"name":"setProps","parameterTypes":["java.util.Properties"] }]
+  "methods":[{"name":"<init>","parameterTypes":[] }, {"name":"setAuthority","parameterTypes":["org.apache.shardingsphere.authority.yaml.config.YamlAuthorityRuleConfiguration"] }, {"name":"setProps","parameterTypes":["java.util.Properties"] }]
 },
 {
   "condition":{"typeReachable":"org.apache.shardingsphere.infra.util.yaml.YamlEngine"},
@@ -3649,5 +3649,10 @@
 {
   "condition":{"typeReachable":"org.apache.shardingsphere.proxy.initializer.BootstrapInitializer"},
   "name":"org.apache.shardingsphere.transaction.yaml.config.YamlTransactionRuleConfigurationCustomizer"
+},
+{
+  "condition":{"typeReachable":"org.apache.shardingsphere.infra.executor.kernel.ExecutorEngine"},
+  "name":"sun.security.provider.SecureRandom",
+  "methods":[{"name":"<init>","parameterTypes":[] }, {"name":"<init>","parameterTypes":["java.security.SecureRandomParameters"] }]
 }
 ]
diff --git a/...tive-image/org.apache.shardingsphere/generated-reachability-metadata/resource-config.json b/...tive-image/org.apache.shardingsphere/generated-reachability-metadata/resource-config.json
@@ -79,7 +79,7 @@
     "condition":{"typeReachable":"org.apache.shardingsphere.driver.jdbc.core.connection.DriverDatabaseConnectionManager"},
     "pattern":"\\QMETA-INF/services/com.clickhouse.client.ClickHouseClient\\E"
   }, {
-    "condition":{"typeReachable":"org.apache.shardingsphere.driver.jdbc.core.connection.DriverDatabaseConnectionManager$$Lambda/0x00007f1137b39f20"},
+    "condition":{"typeReachable":"org.apache.shardingsphere.driver.jdbc.core.connection.DriverDatabaseConnectionManager$$Lambda/0x00007f191bb3ad18"},
     "pattern":"\\QMETA-INF/services/com.clickhouse.client.ClickHouseClient\\E"
   }, {
     "condition":{"typeReachable":"org.apache.shardingsphere.driver.jdbc.core.datasource.ShardingSphereDataSource"},
@@ -244,7 +244,7 @@
     "condition":{"typeReachable":"org.apache.shardingsphere.proxy.backend.handler.ProxyBackendHandlerFactory"},
     "pattern":"\\QMETA-INF/services/org.apache.shardingsphere.infra.executor.checker.SQLExecutionChecker\\E"
   }, {
-    "condition":{"typeReachable":"org.apache.shardingsphere.proxy.frontend.mysql.command.query.text.query.MySQLComQueryPacketExecutor"},
+    "condition":{"typeReachable":"org.apache.shardingsphere.infra.executor.kernel.ExecutorEngine"},
     "pattern":"\\QMETA-INF/services/org.apache.shardingsphere.infra.executor.sql.hook.SQLExecutionHook\\E"
   }, {
     "condition":{"typeReachable":"org.apache.shardingsphere.infra.executor.sql.prepare.AbstractExecutionPrepareEngine"},

diff --git a/...est/java/org/apache/shardingsphere/transaction/base/seata/at/fixture/MockSeataServer.java b/...est/java/org/apache/shardingsphere/transaction/base/seata/at/fixture/MockSeataServer.java
@@ -26,11 +26,11 @@
 import io.netty.channel.nio.NioEventLoopGroup;
 import io.netty.channel.socket.SocketChannel;
 import io.netty.channel.socket.nio.NioServerSocketChannel;
-import org.apache.seata.core.rpc.netty.v1.ProtocolV1Decoder;
-import org.apache.seata.core.rpc.netty.v1.ProtocolV1Encoder;
 import lombok.Getter;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.seata.core.rpc.netty.v1.ProtocolDecoderV1;
+import org.apache.seata.core.rpc.netty.v1.ProtocolEncoderV1;
 
 import java.util.concurrent.atomic.AtomicBoolean;
 
@@ -77,8 +77,8 @@ public void start() {
                     @Override
                     public void initChannel(final SocketChannel socketChannel) {
                         socketChannel.pipeline()
-                                .addLast(new ProtocolV1Decoder())
-                                .addLast(new ProtocolV1Encoder())
+                                .addLast(new ProtocolDecoderV1())
+                                .addLast(new ProtocolEncoderV1())
                                 .addLast(messageHandler);
                     }
                 });

diff --git a/kernel/transaction/type/base/seata-at/src/test/resources/file.conf b/kernel/transaction/type/base/seata-at/src/test/resources/file.conf
@@ -15,44 +15,7 @@
 # limitations under the License.
 #
 
-transport {
-  # tcp udt unix-domain-socket
-  type = "TCP"
-  #NIO NATIVE
-  server = "NIO"
-  #enable heartbeat
-  heartbeat = true
-  #thread factory for netty
-  thread-factory {
-    boss-thread-prefix = "NettyBoss"
-    worker-thread-prefix = "NettyServerNIOWorker"
-    server-executor-thread-prefix = "NettyServerBizHandler"
-    share-boss-worker = false
-    client-selector-thread-prefix = "NettyClientSelector"
-    client-selector-thread-size = 1
-    client-worker-thread-prefix = "NettyClientWorkerThread"
-    # netty boss thread size,will not be used for UDT
-    boss-thread-size = 1
-    #auto default pin or 8
-    worker-thread-size = 8
-  }
-}
 service {
-  #vgroup->rgroup
   vgroupMapping.default_tx_group = "default"
-  #only support single node
   default.grouplist = "127.0.0.1:8891"
-  #disable
-  disable = false
-}
-
-client {
-  async.commit.buffer.limit = 10000
-  lock {
-    retry.internal = 10
-    retry.times = 30
-  }
-  tm {
-    degradeCheck = false
-  }
 }
diff --git a/kernel/transaction/type/base/seata-at/src/test/resources/logback-test.xml b/kernel/transaction/type/base/seata-at/src/test/resources/logback-test.xml
@@ -26,7 +26,6 @@
     <logger name="org.apache.shardingsphere" level="warn" additivity="false">
         <appender-ref ref="console" />
     </logger>
-
     <root>
         <level value="error" />
         <appender-ref ref="console" />

diff --git a/kernel/transaction/type/base/seata-at/src/test/resources/registry.conf b/kernel/transaction/type/base/seata-at/src/test/resources/registry.conf
@@ -16,38 +16,13 @@
 #
 
 registry {
-  # file 、eureka、redis、zk
   type = "file"
-
-  eureka {
-    serviceUrl = "http://localhost:1001/eureka"
-    application = "default"
-    weight = "1"
-  }
-  redis {
-    serverAddr = "localhost:6379"
-    db = "0"
-  }
-  zk {
-    cluster = "default"
-    serverAddr = "127.0.0.1:2181"
-    session.timeout = 6000
-    connect.timeout = 2000
-  }
   file {
     name = "file.conf"
   }
 }
-
 config {
-  # file、zk
   type = "file"
-
-  zk {
-    serverAddr = "127.0.0.1:2181"
-    session.timeout = 6000
-    connect.timeout = 2000
-  }
   file {
     name = "file.conf"
   }