This is an automated email from the ASF dual-hosted git repository.
zhangliang 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 ab74ef87d6f Rename ShardingSphereDistributionTransactionManager to
ShardingSphereDistributedTransactionManager (#33087)
ab74ef87d6f is described below
commit ab74ef87d6f3dea61e6ff2c74d3125a7505ad024
Author: Liang Zhang <[email protected]>
AuthorDate: Tue Oct 1 19:59:02 2024 +0800
Rename ShardingSphereDistributionTransactionManager to
ShardingSphereDistributedTransactionManager (#33087)
---
...ardingSphereDistributedTransactionManager.java} | 6 +++---
.../transaction/ConnectionTransaction.java | 20 +++++++++---------
.../ShardingSphereTransactionManagerEngine.java | 16 +++++++--------
.../transaction/ConnectionTransactionTest.java | 24 +++++++++++-----------
.../ShardingSphereTransactionManagerFixture.java | 4 ++--
...pi.ShardingSphereDistributedTransactionManager} | 0
.../update/AlterTransactionRuleExecutor.java | 16 +++++++--------
.../ShardingSphereTransactionManagerFixture.java | 4 ++--
.../update/AlterTransactionRuleExecutorTest.java | 4 ++--
...pi.ShardingSphereDistributedTransactionManager} | 0
.../SeataATShardingSphereTransactionManager.java | 4 ++--
...pi.ShardingSphereDistributedTransactionManager} | 0
.../xa/XAShardingSphereTransactionManager.java | 4 ++--
...pi.ShardingSphereDistributedTransactionManager} | 0
.../jdbc/datasource/JDBCBackendDataSource.java | 10 ++++-----
.../transaction/BackendTransactionManager.java | 18 ++++++++--------
.../transaction/BackendTransactionManagerTest.java | 16 +++++++--------
17 files changed, 73 insertions(+), 73 deletions(-)
diff --git
a/kernel/transaction/api/src/main/java/org/apache/shardingsphere/transaction/spi/ShardingSphereDistributionTransactionManager.java
b/kernel/transaction/api/src/main/java/org/apache/shardingsphere/transaction/spi/ShardingSphereDistributedTransactionManager.java
similarity index 93%
rename from
kernel/transaction/api/src/main/java/org/apache/shardingsphere/transaction/spi/ShardingSphereDistributionTransactionManager.java
rename to
kernel/transaction/api/src/main/java/org/apache/shardingsphere/transaction/spi/ShardingSphereDistributedTransactionManager.java
index aaf1a69e92c..8a61f60b898 100644
---
a/kernel/transaction/api/src/main/java/org/apache/shardingsphere/transaction/spi/ShardingSphereDistributionTransactionManager.java
+++
b/kernel/transaction/api/src/main/java/org/apache/shardingsphere/transaction/spi/ShardingSphereDistributedTransactionManager.java
@@ -27,12 +27,12 @@ import java.sql.SQLException;
import java.util.Map;
/**
- * ShardingSphere distribution transaction manager.
+ * ShardingSphere distributed transaction manager.
*/
-public interface ShardingSphereDistributionTransactionManager extends
TypedSPI, AutoCloseable {
+public interface ShardingSphereDistributedTransactionManager extends TypedSPI,
AutoCloseable {
/**
- * Initialize distribution transaction manager.
+ * Initialize distributed transaction manager.
*
* @param databaseTypes database types
* @param dataSources data sources
diff --git
a/kernel/transaction/core/src/main/java/org/apache/shardingsphere/transaction/ConnectionTransaction.java
b/kernel/transaction/core/src/main/java/org/apache/shardingsphere/transaction/ConnectionTransaction.java
index 05e6ab8a2cd..8a95ac3633e 100644
---
a/kernel/transaction/core/src/main/java/org/apache/shardingsphere/transaction/ConnectionTransaction.java
+++
b/kernel/transaction/core/src/main/java/org/apache/shardingsphere/transaction/ConnectionTransaction.java
@@ -21,7 +21,7 @@ import lombok.Getter;
import
org.apache.shardingsphere.infra.session.connection.transaction.TransactionConnectionContext;
import org.apache.shardingsphere.transaction.api.TransactionType;
import org.apache.shardingsphere.transaction.rule.TransactionRule;
-import
org.apache.shardingsphere.transaction.spi.ShardingSphereDistributionTransactionManager;
+import
org.apache.shardingsphere.transaction.spi.ShardingSphereDistributedTransactionManager;
import java.sql.Connection;
import java.sql.SQLException;
@@ -35,14 +35,14 @@ public final class ConnectionTransaction {
@Getter
private final TransactionType transactionType;
- private final ShardingSphereDistributionTransactionManager
distributionTransactionManager;
+ private final ShardingSphereDistributedTransactionManager
distributedTransactionManager;
private final TransactionConnectionContext transactionContext;
public ConnectionTransaction(final TransactionRule rule, final
TransactionConnectionContext transactionContext) {
transactionType = transactionContext.getTransactionType().isPresent()
? TransactionType.valueOf(transactionContext.getTransactionType().get()) :
rule.getDefaultType();
this.transactionContext = transactionContext;
- distributionTransactionManager = TransactionType.LOCAL ==
transactionType ? null :
rule.getResource().getTransactionManager(rule.getDefaultType());
+ distributedTransactionManager = TransactionType.LOCAL ==
transactionType ? null :
rule.getResource().getTransactionManager(rule.getDefaultType());
}
/**
@@ -61,7 +61,7 @@ public final class ConnectionTransaction {
* @return in distributed transaction or not
*/
public boolean isInDistributedTransaction() {
- return null != distributionTransactionManager &&
distributionTransactionManager.isInTransaction();
+ return null != distributedTransactionManager &&
distributedTransactionManager.isInTransaction();
}
/**
@@ -93,28 +93,28 @@ public final class ConnectionTransaction {
* @throws SQLException SQL exception
*/
public Optional<Connection> getConnection(final String databaseName, final
String dataSourceName, final TransactionConnectionContext
transactionConnectionContext) throws SQLException {
- return isInDistributedTransaction(transactionConnectionContext) ?
Optional.of(distributionTransactionManager.getConnection(databaseName,
dataSourceName)) : Optional.empty();
+ return isInDistributedTransaction(transactionConnectionContext) ?
Optional.of(distributedTransactionManager.getConnection(databaseName,
dataSourceName)) : Optional.empty();
}
/**
* Begin transaction.
*/
public void begin() {
- distributionTransactionManager.begin();
+ distributedTransactionManager.begin();
}
/**
* Commit transaction.
*/
public void commit() {
-
distributionTransactionManager.commit(transactionContext.isExceptionOccur());
+
distributedTransactionManager.commit(transactionContext.isExceptionOccur());
}
/**
* Rollback transaction.
*/
public void rollback() {
- distributionTransactionManager.rollback();
+ distributedTransactionManager.rollback();
}
/**
@@ -124,10 +124,10 @@ public final class ConnectionTransaction {
* @return distributed transaction operation type
*/
public DistributedTransactionOperationType
getDistributedTransactionOperationType(final boolean autoCommit) {
- if (!autoCommit && !distributionTransactionManager.isInTransaction()) {
+ if (!autoCommit && !distributedTransactionManager.isInTransaction()) {
return DistributedTransactionOperationType.BEGIN;
}
- if (autoCommit && distributionTransactionManager.isInTransaction()) {
+ if (autoCommit && distributedTransactionManager.isInTransaction()) {
return DistributedTransactionOperationType.COMMIT;
}
return DistributedTransactionOperationType.IGNORE;
diff --git
a/kernel/transaction/core/src/main/java/org/apache/shardingsphere/transaction/ShardingSphereTransactionManagerEngine.java
b/kernel/transaction/core/src/main/java/org/apache/shardingsphere/transaction/ShardingSphereTransactionManagerEngine.java
index 88455bc0f9a..e571558ee24 100644
---
a/kernel/transaction/core/src/main/java/org/apache/shardingsphere/transaction/ShardingSphereTransactionManagerEngine.java
+++
b/kernel/transaction/core/src/main/java/org/apache/shardingsphere/transaction/ShardingSphereTransactionManagerEngine.java
@@ -22,7 +22,7 @@ import
org.apache.shardingsphere.infra.exception.core.ShardingSpherePrecondition
import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
import org.apache.shardingsphere.transaction.api.TransactionType;
import
org.apache.shardingsphere.transaction.exception.TransactionManagerNotFoundException;
-import
org.apache.shardingsphere.transaction.spi.ShardingSphereDistributionTransactionManager;
+import
org.apache.shardingsphere.transaction.spi.ShardingSphereDistributedTransactionManager;
import javax.sql.DataSource;
import java.util.Map;
@@ -34,11 +34,11 @@ public final class ShardingSphereTransactionManagerEngine {
private final TransactionType transactionType;
- private final ShardingSphereDistributionTransactionManager
distributionTransactionManager;
+ private final ShardingSphereDistributedTransactionManager
distributedTransactionManager;
public ShardingSphereTransactionManagerEngine(final TransactionType
transactionType) {
this.transactionType = transactionType;
- distributionTransactionManager = TransactionType.LOCAL ==
transactionType ? null :
TypedSPILoader.getService(ShardingSphereDistributionTransactionManager.class,
transactionType.name());
+ distributedTransactionManager = TransactionType.LOCAL ==
transactionType ? null :
TypedSPILoader.getService(ShardingSphereDistributedTransactionManager.class,
transactionType.name());
}
/**
@@ -50,7 +50,7 @@ public final class ShardingSphereTransactionManagerEngine {
*/
public void init(final Map<String, DatabaseType> databaseTypes, final
Map<String, DataSource> dataSourceMap, final String providerType) {
if (TransactionType.LOCAL != transactionType) {
- distributionTransactionManager.init(databaseTypes, dataSourceMap,
providerType);
+ distributedTransactionManager.init(databaseTypes, dataSourceMap,
providerType);
}
}
@@ -60,11 +60,11 @@ public final class ShardingSphereTransactionManagerEngine {
* @param transactionType transaction type
* @return transaction manager
*/
- public ShardingSphereDistributionTransactionManager
getTransactionManager(final TransactionType transactionType) {
+ public ShardingSphereDistributedTransactionManager
getTransactionManager(final TransactionType transactionType) {
if (TransactionType.LOCAL != transactionType) {
-
ShardingSpherePreconditions.checkNotNull(distributionTransactionManager, () ->
new TransactionManagerNotFoundException(transactionType));
+
ShardingSpherePreconditions.checkNotNull(distributedTransactionManager, () ->
new TransactionManagerNotFoundException(transactionType));
}
- return distributionTransactionManager;
+ return distributedTransactionManager;
}
/**
@@ -72,7 +72,7 @@ public final class ShardingSphereTransactionManagerEngine {
*/
public void close() {
if (TransactionType.LOCAL != transactionType) {
- distributionTransactionManager.close();
+ distributedTransactionManager.close();
}
}
}
diff --git
a/kernel/transaction/core/src/test/java/org/apache/shardingsphere/transaction/ConnectionTransactionTest.java
b/kernel/transaction/core/src/test/java/org/apache/shardingsphere/transaction/ConnectionTransactionTest.java
index f920bba7e65..28efa6c3186 100644
---
a/kernel/transaction/core/src/test/java/org/apache/shardingsphere/transaction/ConnectionTransactionTest.java
+++
b/kernel/transaction/core/src/test/java/org/apache/shardingsphere/transaction/ConnectionTransactionTest.java
@@ -21,7 +21,7 @@ import
org.apache.shardingsphere.infra.session.connection.transaction.Transactio
import
org.apache.shardingsphere.transaction.ConnectionTransaction.DistributedTransactionOperationType;
import org.apache.shardingsphere.transaction.api.TransactionType;
import org.apache.shardingsphere.transaction.rule.TransactionRule;
-import
org.apache.shardingsphere.transaction.spi.ShardingSphereDistributionTransactionManager;
+import
org.apache.shardingsphere.transaction.spi.ShardingSphereDistributedTransactionManager;
import org.junit.jupiter.api.Test;
import java.sql.Connection;
@@ -45,14 +45,14 @@ class ConnectionTransactionTest {
}
@Test
- void assertIsNotInDistributedTransactionWhenIsNotDistributionTransaction()
{
+ void assertIsNotInDistributedTransactionWhenIsNotDistributedTransaction() {
TransactionConnectionContext context = new
TransactionConnectionContext();
context.beginTransaction("LOCAL");
assertFalse(new ConnectionTransaction(mock(TransactionRule.class),
context).isInDistributedTransaction(context));
}
@Test
- void
assertIsNotInDistributedTransactionWhenDistributionTransactionIsNotBegin() {
+ void
assertIsNotInDistributedTransactionWhenDistributedTransactionIsNotBegin() {
TransactionConnectionContext context = new
TransactionConnectionContext();
context.beginTransaction("XA");
assertFalse(new ConnectionTransaction(mock(TransactionRule.class,
RETURNS_DEEP_STUBS), context).isInDistributedTransaction(context));
@@ -100,29 +100,29 @@ class ConnectionTransactionTest {
@Test
void assertBegin() {
- ShardingSphereDistributionTransactionManager
distributionTransactionManager =
mock(ShardingSphereDistributionTransactionManager.class);
+ ShardingSphereDistributedTransactionManager
distributedTransactionManager =
mock(ShardingSphereDistributedTransactionManager.class);
TransactionRule rule = mock(TransactionRule.class, RETURNS_DEEP_STUBS);
-
when(rule.getResource().getTransactionManager(rule.getDefaultType())).thenReturn(distributionTransactionManager);
+
when(rule.getResource().getTransactionManager(rule.getDefaultType())).thenReturn(distributedTransactionManager);
new ConnectionTransaction(rule, new
TransactionConnectionContext()).begin();
- verify(distributionTransactionManager).begin();
+ verify(distributedTransactionManager).begin();
}
@Test
void assertCommit() {
- ShardingSphereDistributionTransactionManager
distributionTransactionManager =
mock(ShardingSphereDistributionTransactionManager.class);
+ ShardingSphereDistributedTransactionManager
distributedTransactionManager =
mock(ShardingSphereDistributedTransactionManager.class);
TransactionRule rule = mock(TransactionRule.class, RETURNS_DEEP_STUBS);
-
when(rule.getResource().getTransactionManager(rule.getDefaultType())).thenReturn(distributionTransactionManager);
+
when(rule.getResource().getTransactionManager(rule.getDefaultType())).thenReturn(distributedTransactionManager);
new ConnectionTransaction(rule, new
TransactionConnectionContext()).commit();
- verify(distributionTransactionManager).commit(false);
+ verify(distributedTransactionManager).commit(false);
}
@Test
void assertRollback() {
- ShardingSphereDistributionTransactionManager
distributionTransactionManager =
mock(ShardingSphereDistributionTransactionManager.class);
+ ShardingSphereDistributedTransactionManager
distributedTransactionManager =
mock(ShardingSphereDistributedTransactionManager.class);
TransactionRule rule = mock(TransactionRule.class, RETURNS_DEEP_STUBS);
-
when(rule.getResource().getTransactionManager(rule.getDefaultType())).thenReturn(distributionTransactionManager);
+
when(rule.getResource().getTransactionManager(rule.getDefaultType())).thenReturn(distributedTransactionManager);
new ConnectionTransaction(rule, new
TransactionConnectionContext()).rollback();
- verify(distributionTransactionManager).rollback();
+ verify(distributedTransactionManager).rollback();
}
@Test
diff --git
a/kernel/transaction/core/src/test/java/org/apache/shardingsphere/transaction/core/fixture/ShardingSphereTransactionManagerFixture.java
b/kernel/transaction/core/src/test/java/org/apache/shardingsphere/transaction/core/fixture/ShardingSphereTransactionManagerFixture.java
index 29ba9d3f20f..205c245853a 100644
---
a/kernel/transaction/core/src/test/java/org/apache/shardingsphere/transaction/core/fixture/ShardingSphereTransactionManagerFixture.java
+++
b/kernel/transaction/core/src/test/java/org/apache/shardingsphere/transaction/core/fixture/ShardingSphereTransactionManagerFixture.java
@@ -20,14 +20,14 @@ package org.apache.shardingsphere.transaction.core.fixture;
import lombok.Setter;
import org.apache.shardingsphere.infra.database.core.type.DatabaseType;
import org.apache.shardingsphere.transaction.api.TransactionType;
-import
org.apache.shardingsphere.transaction.spi.ShardingSphereDistributionTransactionManager;
+import
org.apache.shardingsphere.transaction.spi.ShardingSphereDistributedTransactionManager;
import javax.sql.DataSource;
import java.sql.Connection;
import java.util.Map;
@Setter
-public final class ShardingSphereTransactionManagerFixture implements
ShardingSphereDistributionTransactionManager {
+public final class ShardingSphereTransactionManagerFixture implements
ShardingSphereDistributedTransactionManager {
private Runnable caller;
diff --git
a/kernel/transaction/core/src/test/resources/META-INF/services/org.apache.shardingsphere.transaction.spi.ShardingSphereDistributionTransactionManager
b/kernel/transaction/core/src/test/resources/META-INF/services/org.apache.shardingsphere.transaction.spi.ShardingSphereDistributedTransactionManager
similarity index 100%
rename from
kernel/transaction/core/src/test/resources/META-INF/services/org.apache.shardingsphere.transaction.spi.ShardingSphereDistributionTransactionManager
rename to
kernel/transaction/core/src/test/resources/META-INF/services/org.apache.shardingsphere.transaction.spi.ShardingSphereDistributedTransactionManager
diff --git
a/kernel/transaction/distsql/handler/src/main/java/org/apache/shardingsphere/transaction/distsql/handler/update/AlterTransactionRuleExecutor.java
b/kernel/transaction/distsql/handler/src/main/java/org/apache/shardingsphere/transaction/distsql/handler/update/AlterTransactionRuleExecutor.java
index 4a4fe4be470..75b478b839a 100644
---
a/kernel/transaction/distsql/handler/src/main/java/org/apache/shardingsphere/transaction/distsql/handler/update/AlterTransactionRuleExecutor.java
+++
b/kernel/transaction/distsql/handler/src/main/java/org/apache/shardingsphere/transaction/distsql/handler/update/AlterTransactionRuleExecutor.java
@@ -25,7 +25,7 @@ import
org.apache.shardingsphere.transaction.api.TransactionType;
import
org.apache.shardingsphere.transaction.config.TransactionRuleConfiguration;
import
org.apache.shardingsphere.transaction.distsql.statement.updatable.AlterTransactionRuleStatement;
import org.apache.shardingsphere.transaction.rule.TransactionRule;
-import
org.apache.shardingsphere.transaction.spi.ShardingSphereDistributionTransactionManager;
+import
org.apache.shardingsphere.transaction.spi.ShardingSphereDistributedTransactionManager;
import java.util.Collection;
import java.util.Optional;
@@ -55,18 +55,18 @@ public final class AlterTransactionRuleExecutor implements
GlobalRuleDefinitionE
}
private void checkTransactionManager(final AlterTransactionRuleStatement
statement, final TransactionType transactionType) {
- Collection<ShardingSphereDistributionTransactionManager>
distributionTransactionManagers =
ShardingSphereServiceLoader.getServiceInstances(ShardingSphereDistributionTransactionManager.class);
- Optional<ShardingSphereDistributionTransactionManager>
distributionTransactionManager =
- distributionTransactionManagers.stream().filter(each ->
transactionType == each.getTransactionType()).findFirst();
-
ShardingSpherePreconditions.checkState(distributionTransactionManager.isPresent(),
+ Collection<ShardingSphereDistributedTransactionManager>
distributedTransactionManagers =
ShardingSphereServiceLoader.getServiceInstances(ShardingSphereDistributedTransactionManager.class);
+ Optional<ShardingSphereDistributedTransactionManager>
distributedTransactionManager =
+ distributedTransactionManagers.stream().filter(each ->
transactionType == each.getTransactionType()).findFirst();
+
ShardingSpherePreconditions.checkState(distributedTransactionManager.isPresent(),
() -> new InvalidRuleConfigurationException("Transaction",
String.format("No transaction manager with type `%s`",
statement.getDefaultType())));
if (TransactionType.XA == transactionType) {
-
checkTransactionManagerProviderType(distributionTransactionManager.get(),
statement.getProvider().getProviderType());
+
checkTransactionManagerProviderType(distributedTransactionManager.get(),
statement.getProvider().getProviderType());
}
}
- private void checkTransactionManagerProviderType(final
ShardingSphereDistributionTransactionManager distributionTransactionManager,
final String providerType) {
-
ShardingSpherePreconditions.checkState(distributionTransactionManager.containsProviderType(providerType),
+ private void checkTransactionManagerProviderType(final
ShardingSphereDistributedTransactionManager distributedTransactionManager,
final String providerType) {
+
ShardingSpherePreconditions.checkState(distributedTransactionManager.containsProviderType(providerType),
() -> new InvalidRuleConfigurationException("Transaction",
String.format("No transaction manager provider with type `%s`", providerType)));
}
diff --git
a/kernel/transaction/distsql/handler/src/test/java/org/apache/shardingsphere/transaction/distsql/handler/fixture/ShardingSphereTransactionManagerFixture.java
b/kernel/transaction/distsql/handler/src/test/java/org/apache/shardingsphere/transaction/distsql/handler/fixture/ShardingSphereTransactionManagerFixture.java
index 7a7fb42d48c..7b5cf94d2cd 100644
---
a/kernel/transaction/distsql/handler/src/test/java/org/apache/shardingsphere/transaction/distsql/handler/fixture/ShardingSphereTransactionManagerFixture.java
+++
b/kernel/transaction/distsql/handler/src/test/java/org/apache/shardingsphere/transaction/distsql/handler/fixture/ShardingSphereTransactionManagerFixture.java
@@ -20,14 +20,14 @@ package
org.apache.shardingsphere.transaction.distsql.handler.fixture;
import lombok.Setter;
import org.apache.shardingsphere.infra.database.core.type.DatabaseType;
import org.apache.shardingsphere.transaction.api.TransactionType;
-import
org.apache.shardingsphere.transaction.spi.ShardingSphereDistributionTransactionManager;
+import
org.apache.shardingsphere.transaction.spi.ShardingSphereDistributedTransactionManager;
import javax.sql.DataSource;
import java.sql.Connection;
import java.util.Map;
@Setter
-public class ShardingSphereTransactionManagerFixture implements
ShardingSphereDistributionTransactionManager {
+public class ShardingSphereTransactionManagerFixture implements
ShardingSphereDistributedTransactionManager {
private Runnable caller;
diff --git
a/kernel/transaction/distsql/handler/src/test/java/org/apache/shardingsphere/transaction/distsql/handler/update/AlterTransactionRuleExecutorTest.java
b/kernel/transaction/distsql/handler/src/test/java/org/apache/shardingsphere/transaction/distsql/handler/update/AlterTransactionRuleExecutorTest.java
index 3da5ede7df5..e5ae1b94b16 100644
---
a/kernel/transaction/distsql/handler/src/test/java/org/apache/shardingsphere/transaction/distsql/handler/update/AlterTransactionRuleExecutorTest.java
+++
b/kernel/transaction/distsql/handler/src/test/java/org/apache/shardingsphere/transaction/distsql/handler/update/AlterTransactionRuleExecutorTest.java
@@ -27,7 +27,7 @@ import
org.apache.shardingsphere.transaction.distsql.handler.fixture.ShardingSph
import
org.apache.shardingsphere.transaction.distsql.segment.TransactionProviderSegment;
import
org.apache.shardingsphere.transaction.distsql.statement.updatable.AlterTransactionRuleStatement;
import org.apache.shardingsphere.transaction.rule.TransactionRule;
-import
org.apache.shardingsphere.transaction.spi.ShardingSphereDistributionTransactionManager;
+import
org.apache.shardingsphere.transaction.spi.ShardingSphereDistributedTransactionManager;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
@@ -45,7 +45,7 @@ class AlterTransactionRuleExecutorTest {
@Test
void assertExecuteWithXA() {
-
when(ShardingSphereServiceLoader.getServiceInstances(ShardingSphereDistributionTransactionManager.class)).thenReturn(Collections.singleton(new
ShardingSphereTransactionManagerFixture()));
+
when(ShardingSphereServiceLoader.getServiceInstances(ShardingSphereDistributedTransactionManager.class)).thenReturn(Collections.singleton(new
ShardingSphereTransactionManagerFixture()));
AlterTransactionRuleExecutor executor = new
AlterTransactionRuleExecutor();
AlterTransactionRuleStatement sqlStatement = new
AlterTransactionRuleStatement(
"XA", new TransactionProviderSegment("Atomikos",
PropertiesBuilder.build(new Property("host", "127.0.0.1"), new
Property("databaseName", "jbossts"))));
diff --git
a/kernel/transaction/distsql/handler/src/test/resources/META-INF/services/org.apache.shardingsphere.transaction.spi.ShardingSphereDistributionTransactionManager
b/kernel/transaction/distsql/handler/src/test/resources/META-INF/services/org.apache.shardingsphere.transaction.spi.ShardingSphereDistributedTransactionManager
similarity index 100%
rename from
kernel/transaction/distsql/handler/src/test/resources/META-INF/services/org.apache.shardingsphere.transaction.spi.ShardingSphereDistributionTransactionManager
rename to
kernel/transaction/distsql/handler/src/test/resources/META-INF/services/org.apache.shardingsphere.transaction.spi.ShardingSphereDistributedTransactionManager
diff --git
a/kernel/transaction/type/base/seata-at/src/main/java/org/apache/shardingsphere/transaction/base/seata/at/SeataATShardingSphereTransactionManager.java
b/kernel/transaction/type/base/seata-at/src/main/java/org/apache/shardingsphere/transaction/base/seata/at/SeataATShardingSphereTransactionManager.java
index 0f4a4c45264..17727fba5f4 100644
---
a/kernel/transaction/type/base/seata-at/src/main/java/org/apache/shardingsphere/transaction/base/seata/at/SeataATShardingSphereTransactionManager.java
+++
b/kernel/transaction/type/base/seata-at/src/main/java/org/apache/shardingsphere/transaction/base/seata/at/SeataATShardingSphereTransactionManager.java
@@ -35,7 +35,7 @@ import
org.apache.shardingsphere.transaction.api.TransactionType;
import
org.apache.shardingsphere.transaction.base.seata.at.exception.SeataATApplicationIDNotFoundException;
import
org.apache.shardingsphere.transaction.base.seata.at.exception.SeataATDisabledException;
import
org.apache.shardingsphere.transaction.exception.TransactionTimeoutException;
-import
org.apache.shardingsphere.transaction.spi.ShardingSphereDistributionTransactionManager;
+import
org.apache.shardingsphere.transaction.spi.ShardingSphereDistributedTransactionManager;
import javax.sql.DataSource;
import java.sql.Connection;
@@ -46,7 +46,7 @@ import java.util.Map;
/**
* Seata AT transaction manager.
*/
-public final class SeataATShardingSphereTransactionManager implements
ShardingSphereDistributionTransactionManager {
+public final class SeataATShardingSphereTransactionManager implements
ShardingSphereDistributedTransactionManager {
private final Map<String, DataSource> dataSourceMap = new HashMap<>();
diff --git
a/kernel/transaction/type/base/seata-at/src/main/resources/META-INF/services/org.apache.shardingsphere.transaction.spi.ShardingSphereDistributionTransactionManager
b/kernel/transaction/type/base/seata-at/src/main/resources/META-INF/services/org.apache.shardingsphere.transaction.spi.ShardingSphereDistributedTransactionManager
similarity index 100%
rename from
kernel/transaction/type/base/seata-at/src/main/resources/META-INF/services/org.apache.shardingsphere.transaction.spi.ShardingSphereDistributionTransactionManager
rename to
kernel/transaction/type/base/seata-at/src/main/resources/META-INF/services/org.apache.shardingsphere.transaction.spi.ShardingSphereDistributedTransactionManager
diff --git
a/kernel/transaction/type/xa/core/src/main/java/org/apache/shardingsphere/transaction/xa/XAShardingSphereTransactionManager.java
b/kernel/transaction/type/xa/core/src/main/java/org/apache/shardingsphere/transaction/xa/XAShardingSphereTransactionManager.java
index 1daa59adeea..9ae6211bca3 100644
---
a/kernel/transaction/type/xa/core/src/main/java/org/apache/shardingsphere/transaction/xa/XAShardingSphereTransactionManager.java
+++
b/kernel/transaction/type/xa/core/src/main/java/org/apache/shardingsphere/transaction/xa/XAShardingSphereTransactionManager.java
@@ -29,7 +29,7 @@ import
org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
import org.apache.shardingsphere.transaction.api.TransactionType;
import org.apache.shardingsphere.transaction.core.ResourceDataSource;
import
org.apache.shardingsphere.transaction.exception.TransactionTimeoutException;
-import
org.apache.shardingsphere.transaction.spi.ShardingSphereDistributionTransactionManager;
+import
org.apache.shardingsphere.transaction.spi.ShardingSphereDistributedTransactionManager;
import
org.apache.shardingsphere.transaction.xa.jta.datasource.XATransactionDataSource;
import
org.apache.shardingsphere.transaction.xa.spi.XATransactionManagerProvider;
@@ -51,7 +51,7 @@ import java.util.Properties;
/**
* ShardingSphere Transaction manager for XA.
*/
-public final class XAShardingSphereTransactionManager implements
ShardingSphereDistributionTransactionManager {
+public final class XAShardingSphereTransactionManager implements
ShardingSphereDistributedTransactionManager {
private final Map<String, XATransactionDataSource> cachedDataSources = new
CaseInsensitiveMap<>();
diff --git
a/kernel/transaction/type/xa/core/src/main/resources/META-INF/services/org.apache.shardingsphere.transaction.spi.ShardingSphereDistributionTransactionManager
b/kernel/transaction/type/xa/core/src/main/resources/META-INF/services/org.apache.shardingsphere.transaction.spi.ShardingSphereDistributedTransactionManager
similarity index 100%
rename from
kernel/transaction/type/xa/core/src/main/resources/META-INF/services/org.apache.shardingsphere.transaction.spi.ShardingSphereDistributionTransactionManager
rename to
kernel/transaction/type/xa/core/src/main/resources/META-INF/services/org.apache.shardingsphere.transaction.spi.ShardingSphereDistributedTransactionManager
diff --git
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/connector/jdbc/datasource/JDBCBackendDataSource.java
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/connector/jdbc/datasource/JDBCBackendDataSource.java
index 0e4ef8ec5e6..f6cb71f1509 100644
---
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/connector/jdbc/datasource/JDBCBackendDataSource.java
+++
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/connector/jdbc/datasource/JDBCBackendDataSource.java
@@ -25,7 +25,7 @@ import
org.apache.shardingsphere.infra.executor.sql.prepare.driver.BackendDataSo
import org.apache.shardingsphere.proxy.backend.context.ProxyContext;
import org.apache.shardingsphere.transaction.api.TransactionType;
import org.apache.shardingsphere.transaction.rule.TransactionRule;
-import
org.apache.shardingsphere.transaction.spi.ShardingSphereDistributionTransactionManager;
+import
org.apache.shardingsphere.transaction.spi.ShardingSphereDistributedTransactionManager;
import javax.sql.DataSource;
import java.sql.Connection;
@@ -96,8 +96,8 @@ public final class JDBCBackendDataSource implements
BackendDataSource {
private Connection createConnection(final String databaseName, final
String dataSourceName, final DataSource dataSource, final TransactionType
transactionType) throws SQLException {
TransactionRule transactionRule =
ProxyContext.getInstance().getContextManager().getMetaDataContexts().getMetaData().getGlobalRuleMetaData().getSingleRule(TransactionRule.class);
- ShardingSphereDistributionTransactionManager
distributionTransactionManager =
transactionRule.getResource().getTransactionManager(transactionType);
- Connection result = isInTransaction(distributionTransactionManager) ?
distributionTransactionManager.getConnection(databaseName, dataSourceName) :
dataSource.getConnection();
+ ShardingSphereDistributedTransactionManager
distributedTransactionManager =
transactionRule.getResource().getTransactionManager(transactionType);
+ Connection result = isInTransaction(distributedTransactionManager) ?
distributedTransactionManager.getConnection(databaseName, dataSourceName) :
dataSource.getConnection();
if (dataSourceName.contains(".")) {
String catalog = dataSourceName.split("\\.")[1];
result.setCatalog(catalog);
@@ -105,7 +105,7 @@ public final class JDBCBackendDataSource implements
BackendDataSource {
return result;
}
- private boolean isInTransaction(final
ShardingSphereDistributionTransactionManager distributionTransactionManager) {
- return null != distributionTransactionManager &&
distributionTransactionManager.isInTransaction();
+ private boolean isInTransaction(final
ShardingSphereDistributedTransactionManager distributedTransactionManager) {
+ return null != distributedTransactionManager &&
distributedTransactionManager.isInTransaction();
}
}
diff --git
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/connector/jdbc/transaction/BackendTransactionManager.java
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/connector/jdbc/transaction/BackendTransactionManager.java
index 4cc7f78c3f6..56220e227a3 100644
---
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/connector/jdbc/transaction/BackendTransactionManager.java
+++
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/connector/jdbc/transaction/BackendTransactionManager.java
@@ -29,7 +29,7 @@ import
org.apache.shardingsphere.transaction.ConnectionSavepointManager;
import
org.apache.shardingsphere.transaction.ShardingSphereTransactionManagerEngine;
import org.apache.shardingsphere.transaction.api.TransactionType;
import org.apache.shardingsphere.transaction.rule.TransactionRule;
-import
org.apache.shardingsphere.transaction.spi.ShardingSphereDistributionTransactionManager;
+import
org.apache.shardingsphere.transaction.spi.ShardingSphereDistributedTransactionManager;
import org.apache.shardingsphere.transaction.spi.TransactionHook;
import java.sql.Connection;
@@ -52,7 +52,7 @@ public final class BackendTransactionManager implements
TransactionManager {
private final LocalTransactionManager localTransactionManager;
- private final ShardingSphereDistributionTransactionManager
distributionTransactionManager;
+ private final ShardingSphereDistributedTransactionManager
distributedTransactionManager;
private final Map<ShardingSphereRule, TransactionHook> transactionHooks;
@@ -62,7 +62,7 @@ public final class BackendTransactionManager implements
TransactionManager {
TransactionRule transactionRule =
ProxyContext.getInstance().getContextManager().getMetaDataContexts().getMetaData().getGlobalRuleMetaData().getSingleRule(TransactionRule.class);
transactionType = transactionRule.getDefaultType();
ShardingSphereTransactionManagerEngine engine =
transactionRule.getResource();
- distributionTransactionManager = null == engine ? null :
engine.getTransactionManager(transactionType);
+ distributedTransactionManager = null == engine ? null :
engine.getTransactionManager(transactionType);
transactionHooks = OrderedSPILoader.getServices(TransactionHook.class,
ProxyContext.getInstance().getContextManager().getMetaDataContexts().getMetaData().getGlobalRuleMetaData().getRules());
}
@@ -78,10 +78,10 @@ public final class BackendTransactionManager implements
TransactionManager {
for (Entry<ShardingSphereRule, TransactionHook> entry :
transactionHooks.entrySet()) {
entry.getValue().beforeBegin(entry.getKey(), databaseType,
getTransactionContext());
}
- if (TransactionType.LOCAL == transactionType || null ==
distributionTransactionManager) {
+ if (TransactionType.LOCAL == transactionType || null ==
distributedTransactionManager) {
localTransactionManager.begin();
} else {
- distributionTransactionManager.begin();
+ distributedTransactionManager.begin();
}
for (Entry<ShardingSphereRule, TransactionHook> entry :
transactionHooks.entrySet()) {
entry.getValue().afterBegin(entry.getKey(), databaseType,
getTransactionContext());
@@ -97,10 +97,10 @@ public final class BackendTransactionManager implements
TransactionManager {
}
if
(connection.getConnectionSession().getTransactionStatus().isInTransaction()) {
try {
- if (TransactionType.LOCAL ==
TransactionUtils.getTransactionType(getTransactionContext()) || null ==
distributionTransactionManager) {
+ if (TransactionType.LOCAL ==
TransactionUtils.getTransactionType(getTransactionContext()) || null ==
distributedTransactionManager) {
localTransactionManager.commit();
} else {
-
distributionTransactionManager.commit(getTransactionContext().isExceptionOccur());
+
distributedTransactionManager.commit(getTransactionContext().isExceptionOccur());
}
} finally {
for (Entry<ShardingSphereRule, TransactionHook> entry :
transactionHooks.entrySet()) {
@@ -124,10 +124,10 @@ public final class BackendTransactionManager implements
TransactionManager {
}
if
(connection.getConnectionSession().getTransactionStatus().isInTransaction()) {
try {
- if (TransactionType.LOCAL ==
TransactionUtils.getTransactionType(getTransactionContext()) || null ==
distributionTransactionManager) {
+ if (TransactionType.LOCAL ==
TransactionUtils.getTransactionType(getTransactionContext()) || null ==
distributedTransactionManager) {
localTransactionManager.rollback();
} else {
- distributionTransactionManager.rollback();
+ distributedTransactionManager.rollback();
}
} finally {
for (Entry<ShardingSphereRule, TransactionHook> entry :
transactionHooks.entrySet()) {
diff --git
a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/connector/jdbc/transaction/BackendTransactionManagerTest.java
b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/connector/jdbc/transaction/BackendTransactionManagerTest.java
index 9ff5f8de1b3..962bbc64ab5 100644
---
a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/connector/jdbc/transaction/BackendTransactionManagerTest.java
+++
b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/connector/jdbc/transaction/BackendTransactionManagerTest.java
@@ -33,7 +33,7 @@ import org.apache.shardingsphere.test.mock.StaticMockSettings;
import
org.apache.shardingsphere.transaction.ShardingSphereTransactionManagerEngine;
import org.apache.shardingsphere.transaction.api.TransactionType;
import org.apache.shardingsphere.transaction.rule.TransactionRule;
-import
org.apache.shardingsphere.transaction.spi.ShardingSphereDistributionTransactionManager;
+import
org.apache.shardingsphere.transaction.spi.ShardingSphereDistributedTransactionManager;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
@@ -70,7 +70,7 @@ class BackendTransactionManagerTest {
private LocalTransactionManager localTransactionManager;
@Mock
- private ShardingSphereDistributionTransactionManager
distributionTransactionManager;
+ private ShardingSphereDistributedTransactionManager
distributedTransactionManager;
@Mock
private Connection connection;
@@ -114,7 +114,7 @@ class BackendTransactionManagerTest {
backendTransactionManager.begin();
verify(transactionStatus, times(0)).setInTransaction(true);
verify(databaseConnectionManager, times(0)).closeConnections(false);
- verify(distributionTransactionManager).begin();
+ verify(distributedTransactionManager).begin();
}
@Test
@@ -134,7 +134,7 @@ class BackendTransactionManagerTest {
newBackendTransactionManager(TransactionType.XA, true);
backendTransactionManager.commit();
verify(transactionStatus).setInTransaction(false);
- verify(distributionTransactionManager).commit(false);
+ verify(distributedTransactionManager).commit(false);
}
@Test
@@ -145,7 +145,7 @@ class BackendTransactionManagerTest {
backendTransactionManager.commit();
verify(transactionStatus, times(0)).setInTransaction(false);
verify(localTransactionManager, times(0)).commit();
- verify(distributionTransactionManager, times(0)).commit(false);
+ verify(distributedTransactionManager, times(0)).commit(false);
}
@Test
@@ -165,7 +165,7 @@ class BackendTransactionManagerTest {
newBackendTransactionManager(TransactionType.XA, true);
backendTransactionManager.rollback();
verify(transactionStatus).setInTransaction(false);
- verify(distributionTransactionManager).rollback();
+ verify(distributedTransactionManager).rollback();
}
@Test
@@ -176,7 +176,7 @@ class BackendTransactionManagerTest {
backendTransactionManager.rollback();
verify(transactionStatus, times(0)).setInTransaction(false);
verify(localTransactionManager, times(0)).rollback();
- verify(distributionTransactionManager, times(0)).rollback();
+ verify(distributedTransactionManager, times(0)).rollback();
}
private void newBackendTransactionManager(final TransactionType
transactionType, final boolean inTransaction) {
@@ -207,7 +207,7 @@ class BackendTransactionManagerTest {
private RuleMetaData mockGlobalRuleMetaData(final TransactionType
transactionType) {
ShardingSphereTransactionManagerEngine transactionManagerEngine =
mock(ShardingSphereTransactionManagerEngine.class);
-
when(transactionManagerEngine.getTransactionManager(TransactionType.XA)).thenReturn(distributionTransactionManager);
+
when(transactionManagerEngine.getTransactionManager(TransactionType.XA)).thenReturn(distributedTransactionManager);
TransactionRule transactionRule = mock(TransactionRule.class);
when(transactionRule.getDefaultType()).thenReturn(transactionType);
when(transactionRule.getResource()).thenReturn(transactionManagerEngine);
