This is an automated email from the ASF dual-hosted git repository.
duanzhengqiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
The following commit(s) were added to refs/heads/master by this push:
new 3e0b0a6e11a Add xa transaction support for example generator (#23480)
3e0b0a6e11a is described below
commit 3e0b0a6e11ad812b9fcf672a0215e55040030f56
Author: Guocheng Tang <[email protected]>
AuthorDate: Tue Jan 10 21:15:08 2023 +0800
Add xa transaction support for example generator (#23480)
* add transaction xa-atomikos
* test zk
* support transaction
* remove base seata
* remove not support
* remove not support
* revert comment
---
.github/workflows/nightly-build-example.yml | 14 +++++++++++++-
.../src/main/resources/config.yaml | 2 +-
.../template/jdbc/java/repository/jdbc/OrderRepository.ftl | 2 +-
3 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/nightly-build-example.yml
b/.github/workflows/nightly-build-example.yml
index 645244d4615..ee7811dee53 100644
--- a/.github/workflows/nightly-build-example.yml
+++ b/.github/workflows/nightly-build-example.yml
@@ -59,13 +59,25 @@ jobs:
feature: [ sharding, readwrite-splitting, encrypt, shadow, mask ]
framework: [ jdbc, spring-boot-starter-jdbc, spring-boot-starter-jpa,
spring-boot-starter-mybatis, spring-namespace-jdbc, spring-namespace-jpa,
spring-namespace-mybatis ]
mode: [ standalone, cluster-zookeeper ]
- transaction: [ local ]
+ transaction: [ local, xa-atomikos, xa-narayana ]
product: [ jdbc ]
exclude:
- feature: shadow
framework: spring-boot-starter-jpa
- feature: shadow
framework: spring-namespace-jpa
+ - transaction: xa-atomikos
+ mode: cluster-zookeeper
+ - transaction: xa-narayana
+ mode: cluster-zookeeper
+ - feature: sharding
+ framework: spring-boot-starter-mybatis
+ mode: standalone
+ transaction: xa-atomikos
+ - feature: sharding
+ framework: spring-boot-starter-mybatis
+ mode: standalone
+ transaction: xa-narayana
services:
mysql:
image: mysql:8.0.22
diff --git
a/examples/shardingsphere-example-generator/src/main/resources/config.yaml
b/examples/shardingsphere-example-generator/src/main/resources/config.yaml
index ba0a6c001b2..ffc9f485f02 100644
--- a/examples/shardingsphere-example-generator/src/main/resources/config.yaml
+++ b/examples/shardingsphere-example-generator/src/main/resources/config.yaml
@@ -34,7 +34,7 @@ transactions:
- xa-bitronix
- base-seata
-# supported: sharding,readwrite-splitting,encrypt,shadow,db-discovery
+# supported: sharding,readwrite-splitting,encrypt,shadow,db-discovery,mask
features:
- sharding
- readwrite-splitting
diff --git
a/examples/shardingsphere-example-generator/src/main/resources/template/jdbc/java/repository/jdbc/OrderRepository.ftl
b/examples/shardingsphere-example-generator/src/main/resources/template/jdbc/java/repository/jdbc/OrderRepository.ftl
index 0af180270c4..b82a00831b7 100644
---
a/examples/shardingsphere-example-generator/src/main/resources/template/jdbc/java/repository/jdbc/OrderRepository.ftl
+++
b/examples/shardingsphere-example-generator/src/main/resources/template/jdbc/java/repository/jdbc/OrderRepository.ftl
@@ -19,7 +19,7 @@
package org.apache.shardingsphere.example.${package}.${framework?replace('-',
'.')}.repository;
import org.apache.shardingsphere.example.${package}.${framework?replace('-',
'.')}.entity.Order;
-<#if transaction?contains("xa")>
+<#if transaction!="local">
import org.apache.shardingsphere.transaction.api.TransactionType;
import org.apache.shardingsphere.transaction.core.TransactionTypeHolder;
</#if>
