You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by du...@apache.org on 2025/07/08 04:37:42 UTC
(shardingsphere) branch master updated: Rename isInTransaction method to isInDistributedTransaction (#35915)
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 00156da462a Rename isInTransaction method to isInDistributedTransaction (#35915)
00156da462a is described below
commit 00156da462a1fcd0a1ef07e5c255714708bb205e
Author: ZhangCheng <ch...@apache.org>
AuthorDate: Tue Jul 8 12:37:35 2025 +0800
Rename isInTransaction method to isInDistributedTransaction (#35915)
---
.../backend/connector/jdbc/datasource/JDBCBackendDataSource.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
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 f6cb71f1509..d1c16a3a8fd 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
@@ -97,7 +97,7 @@ 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);
ShardingSphereDistributedTransactionManager distributedTransactionManager = transactionRule.getResource().getTransactionManager(transactionType);
- Connection result = isInTransaction(distributedTransactionManager) ? distributedTransactionManager.getConnection(databaseName, dataSourceName) : dataSource.getConnection();
+ Connection result = isInDistributedTransaction(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 ShardingSphereDistributedTransactionManager distributedTransactionManager) {
+ private boolean isInDistributedTransaction(final ShardingSphereDistributedTransactionManager distributedTransactionManager) {
return null != distributedTransactionManager && distributedTransactionManager.isInTransaction();
}
}