This is an automated email from the ASF dual-hosted git repository.
totalo 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 419e0f2f9ee Rename TransactionalReadQueryStrategy (#24803)
419e0f2f9ee is described below
commit 419e0f2f9ee70508c8bbd5d74c9d465294fef372
Author: Liang Zhang <[email protected]>
AuthorDate: Fri Mar 24 16:56:16 2023 +0800
Rename TransactionalReadQueryStrategy (#24803)
---
.../ReadwriteSplittingDataSourceRuleConfiguration.java | 6 +++---
...ryStrategy.java => TransactionalReadQueryStrategy.java} | 4 ++--
.../route/impl/ReadwriteSplittingDataSourceRouter.java | 2 +-
.../rule/ReadwriteSplittingDataSourceRule.java | 8 ++++----
.../readwritesplitting/rule/ReadwriteSplittingRule.java | 4 ++--
.../YamlReadwriteSplittingDataSourceRuleConfiguration.java | 2 +-
.../YamlReadwriteSplittingRuleConfigurationSwapper.java | 14 +++++++-------
.../rule/ReadwriteSplittingDataSourceRuleTest.java | 4 ++--
8 files changed, 22 insertions(+), 22 deletions(-)
diff --git
a/features/readwrite-splitting/api/src/main/java/org/apache/shardingsphere/readwritesplitting/api/rule/ReadwriteSplittingDataSourceRuleConfiguration.java
b/features/readwrite-splitting/api/src/main/java/org/apache/shardingsphere/readwritesplitting/api/rule/ReadwriteSplittingDataSourceRuleConfiguration.java
index 5328951cfae..802b42839fd 100644
---
a/features/readwrite-splitting/api/src/main/java/org/apache/shardingsphere/readwritesplitting/api/rule/ReadwriteSplittingDataSourceRuleConfiguration.java
+++
b/features/readwrite-splitting/api/src/main/java/org/apache/shardingsphere/readwritesplitting/api/rule/ReadwriteSplittingDataSourceRuleConfiguration.java
@@ -21,7 +21,7 @@ import lombok.Getter;
import lombok.RequiredArgsConstructor;
import
org.apache.shardingsphere.readwritesplitting.api.strategy.DynamicReadwriteSplittingStrategyConfiguration;
import
org.apache.shardingsphere.readwritesplitting.api.strategy.StaticReadwriteSplittingStrategyConfiguration;
-import
org.apache.shardingsphere.readwritesplitting.api.transaction.TransactionReadQueryStrategy;
+import
org.apache.shardingsphere.readwritesplitting.api.transaction.TransactionalReadQueryStrategy;
/**
* Readwrite-splitting data source rule configuration.
@@ -36,12 +36,12 @@ public final class
ReadwriteSplittingDataSourceRuleConfiguration {
private final DynamicReadwriteSplittingStrategyConfiguration
dynamicStrategy;
- private final TransactionReadQueryStrategy transactionReadQueryStrategy;
+ private final TransactionalReadQueryStrategy
transactionalReadQueryStrategy;
private final String loadBalancerName;
public ReadwriteSplittingDataSourceRuleConfiguration(final String name,
final StaticReadwriteSplittingStrategyConfiguration staticStrategy,
final
DynamicReadwriteSplittingStrategyConfiguration dynamicStrategy, final String
loadBalancerName) {
- this(name, staticStrategy, dynamicStrategy,
TransactionReadQueryStrategy.DYNAMIC_REPLICA, loadBalancerName);
+ this(name, staticStrategy, dynamicStrategy,
TransactionalReadQueryStrategy.DYNAMIC_REPLICA, loadBalancerName);
}
}
diff --git
a/features/readwrite-splitting/api/src/main/java/org/apache/shardingsphere/readwritesplitting/api/transaction/TransactionReadQueryStrategy.java
b/features/readwrite-splitting/api/src/main/java/org/apache/shardingsphere/readwritesplitting/api/transaction/TransactionalReadQueryStrategy.java
similarity index 91%
rename from
features/readwrite-splitting/api/src/main/java/org/apache/shardingsphere/readwritesplitting/api/transaction/TransactionReadQueryStrategy.java
rename to
features/readwrite-splitting/api/src/main/java/org/apache/shardingsphere/readwritesplitting/api/transaction/TransactionalReadQueryStrategy.java
index ceb6c6cb88a..9c8f8a22af9 100644
---
a/features/readwrite-splitting/api/src/main/java/org/apache/shardingsphere/readwritesplitting/api/transaction/TransactionReadQueryStrategy.java
+++
b/features/readwrite-splitting/api/src/main/java/org/apache/shardingsphere/readwritesplitting/api/transaction/TransactionalReadQueryStrategy.java
@@ -18,9 +18,9 @@
package org.apache.shardingsphere.readwritesplitting.api.transaction;
/**
- * Transaction read query strategy.
+ * Transactional read query strategy.
*/
-public enum TransactionReadQueryStrategy {
+public enum TransactionalReadQueryStrategy {
FIXED_PRIMARY, FIXED_REPLICA, DYNAMIC_REPLICA
}
diff --git
a/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/route/impl/ReadwriteSplittingDataSourceRouter.java
b/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/route/impl/ReadwriteSplittingDataSourceRouter.java
index 55294a0aabe..0ae1bf1d843 100644
---
a/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/route/impl/ReadwriteSplittingDataSourceRouter.java
+++
b/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/route/impl/ReadwriteSplittingDataSourceRouter.java
@@ -76,7 +76,7 @@ public final class ReadwriteSplittingDataSourceRouter {
}
private String routeInTransaction() {
- switch (rule.getTransactionReadQueryStrategy()) {
+ switch (rule.getTransactionalReadQueryStrategy()) {
case FIXED_REPLICA:
if (null ==
connectionContext.getTransactionContext().getReadWriteSplitReplicaRoute()) {
connectionContext.getTransactionContext().setReadWriteSplitReplicaRoute(routeWithLoadBalancer());
diff --git
a/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/rule/ReadwriteSplittingDataSourceRule.java
b/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/rule/ReadwriteSplittingDataSourceRule.java
index aeb85d46815..b0ca950be8e 100644
---
a/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/rule/ReadwriteSplittingDataSourceRule.java
+++
b/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/rule/ReadwriteSplittingDataSourceRule.java
@@ -21,7 +21,7 @@ import lombok.AccessLevel;
import lombok.Getter;
import org.apache.shardingsphere.infra.rule.ShardingSphereRule;
import
org.apache.shardingsphere.readwritesplitting.api.rule.ReadwriteSplittingDataSourceRuleConfiguration;
-import
org.apache.shardingsphere.readwritesplitting.api.transaction.TransactionReadQueryStrategy;
+import
org.apache.shardingsphere.readwritesplitting.api.transaction.TransactionalReadQueryStrategy;
import
org.apache.shardingsphere.readwritesplitting.spi.ReadQueryLoadBalanceAlgorithm;
import
org.apache.shardingsphere.readwritesplitting.strategy.ReadwriteSplittingStrategy;
import
org.apache.shardingsphere.readwritesplitting.strategy.ReadwriteSplittingStrategyFactory;
@@ -40,7 +40,7 @@ public final class ReadwriteSplittingDataSourceRule {
private final String name;
- private final TransactionReadQueryStrategy transactionReadQueryStrategy;
+ private final TransactionalReadQueryStrategy
transactionalReadQueryStrategy;
private final ReadQueryLoadBalanceAlgorithm loadBalancer;
@@ -49,10 +49,10 @@ public final class ReadwriteSplittingDataSourceRule {
@Getter(AccessLevel.NONE)
private final Collection<String> disabledDataSourceNames = new HashSet<>();
- public ReadwriteSplittingDataSourceRule(final
ReadwriteSplittingDataSourceRuleConfiguration config, final
TransactionReadQueryStrategy transactionReadQueryStrategy,
+ public ReadwriteSplittingDataSourceRule(final
ReadwriteSplittingDataSourceRuleConfiguration config, final
TransactionalReadQueryStrategy transactionalReadQueryStrategy,
final
ReadQueryLoadBalanceAlgorithm loadBalancer, final
Collection<ShardingSphereRule> builtRules) {
name = config.getName();
- this.transactionReadQueryStrategy = transactionReadQueryStrategy;
+ this.transactionalReadQueryStrategy = transactionalReadQueryStrategy;
this.loadBalancer = loadBalancer;
readwriteSplittingStrategy =
ReadwriteSplittingStrategyFactory.newInstance(config, builtRules);
}
diff --git
a/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/rule/ReadwriteSplittingRule.java
b/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/rule/ReadwriteSplittingRule.java
index f77aad310d6..1e29e149e72 100644
---
a/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/rule/ReadwriteSplittingRule.java
+++
b/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/rule/ReadwriteSplittingRule.java
@@ -115,7 +115,7 @@ public final class ReadwriteSplittingRule implements
DatabaseRule, DataSourceCon
for (int i = 0; i < inlineReadwriteDataSourceNames.size(); i++) {
ReadwriteSplittingDataSourceRuleConfiguration staticConfig =
createStaticDataSourceRuleConfiguration(
config, i, inlineReadwriteDataSourceNames,
inlineWriteDatasourceNames, inlineReadDatasourceNames);
- result.put(inlineReadwriteDataSourceNames.get(i), new
ReadwriteSplittingDataSourceRule(staticConfig,
config.getTransactionReadQueryStrategy(), loadBalanceAlgorithm, builtRules));
+ result.put(inlineReadwriteDataSourceNames.get(i), new
ReadwriteSplittingDataSourceRule(staticConfig,
config.getTransactionalReadQueryStrategy(), loadBalanceAlgorithm, builtRules));
}
return result;
}
@@ -138,7 +138,7 @@ public final class ReadwriteSplittingRule implements
DatabaseRule, DataSourceCon
() -> new
InvalidInlineExpressionDataSourceNameException("Inline expression auto aware
data source names size error."));
for (int i = 0; i < inlineReadwriteDataSourceNames.size(); i++) {
ReadwriteSplittingDataSourceRuleConfiguration dynamicConfig =
createDynamicDataSourceRuleConfiguration(config, i,
inlineReadwriteDataSourceNames, inlineAutoAwareDataSourceNames);
- result.put(inlineReadwriteDataSourceNames.get(i), new
ReadwriteSplittingDataSourceRule(dynamicConfig,
config.getTransactionReadQueryStrategy(), loadBalanceAlgorithm, builtRules));
+ result.put(inlineReadwriteDataSourceNames.get(i), new
ReadwriteSplittingDataSourceRule(dynamicConfig,
config.getTransactionalReadQueryStrategy(), loadBalanceAlgorithm, builtRules));
}
return result;
}
diff --git
a/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/yaml/config/rule/YamlReadwriteSplittingDataSourceRuleConfiguration.java
b/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/yaml/config/rule/YamlReadwriteSplittingDataSourceRuleConfiguration.java
index 0897f40f223..1232ee39848 100644
---
a/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/yaml/config/rule/YamlReadwriteSplittingDataSourceRuleConfiguration.java
+++
b/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/yaml/config/rule/YamlReadwriteSplittingDataSourceRuleConfiguration.java
@@ -34,7 +34,7 @@ public final class
YamlReadwriteSplittingDataSourceRuleConfiguration implements
private YamlDynamicReadwriteSplittingStrategyConfiguration dynamicStrategy;
- private String transactionReadQueryStrategy;
+ private String transactionalReadQueryStrategy;
private String loadBalancerName;
}
diff --git
a/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/yaml/swapper/YamlReadwriteSplittingRuleConfigurationSwapper.java
b/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/yaml/swapper/YamlReadwriteSplittingRuleConfigurationSwapper.java
index deb23502b0b..dae41ef07d2 100644
---
a/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/yaml/swapper/YamlReadwriteSplittingRuleConfigurationSwapper.java
+++
b/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/yaml/swapper/YamlReadwriteSplittingRuleConfigurationSwapper.java
@@ -23,7 +23,7 @@ import
org.apache.shardingsphere.infra.yaml.config.swapper.algorithm.YamlAlgorit
import
org.apache.shardingsphere.infra.yaml.config.swapper.rule.YamlRuleConfigurationSwapper;
import
org.apache.shardingsphere.readwritesplitting.api.ReadwriteSplittingRuleConfiguration;
import
org.apache.shardingsphere.readwritesplitting.api.rule.ReadwriteSplittingDataSourceRuleConfiguration;
-import
org.apache.shardingsphere.readwritesplitting.api.transaction.TransactionReadQueryStrategy;
+import
org.apache.shardingsphere.readwritesplitting.api.transaction.TransactionalReadQueryStrategy;
import
org.apache.shardingsphere.readwritesplitting.constant.ReadwriteSplittingOrder;
import
org.apache.shardingsphere.readwritesplitting.yaml.config.YamlReadwriteSplittingRuleConfiguration;
import
org.apache.shardingsphere.readwritesplitting.yaml.config.rule.YamlReadwriteSplittingDataSourceRuleConfiguration;
@@ -69,7 +69,7 @@ public final class
YamlReadwriteSplittingRuleConfigurationSwapper
if (null != dataSourceRuleConfig.getDynamicStrategy()) {
result.setDynamicStrategy(dynamicConfigSwapper.swapToYamlConfiguration(dataSourceRuleConfig.getDynamicStrategy()));
}
-
result.setTransactionReadQueryStrategy(dataSourceRuleConfig.getTransactionReadQueryStrategy().name());
+
result.setTransactionalReadQueryStrategy(dataSourceRuleConfig.getTransactionalReadQueryStrategy().name());
result.setLoadBalancerName(dataSourceRuleConfig.getLoadBalancerName());
return result;
}
@@ -90,13 +90,13 @@ public final class
YamlReadwriteSplittingRuleConfigurationSwapper
private ReadwriteSplittingDataSourceRuleConfiguration swapToObject(final
String name, final YamlReadwriteSplittingDataSourceRuleConfiguration
yamlDataSourceRuleConfig) {
return new ReadwriteSplittingDataSourceRuleConfiguration(name,
staticConfigSwapper.swapToObject(yamlDataSourceRuleConfig.getStaticStrategy()),
dynamicConfigSwapper.swapToObject(yamlDataSourceRuleConfig.getDynamicStrategy()),
- getTransactionReadQueryStrategy(yamlDataSourceRuleConfig),
yamlDataSourceRuleConfig.getLoadBalancerName());
+ getTransactionalReadQueryStrategy(yamlDataSourceRuleConfig),
yamlDataSourceRuleConfig.getLoadBalancerName());
}
- private TransactionReadQueryStrategy getTransactionReadQueryStrategy(final
YamlReadwriteSplittingDataSourceRuleConfiguration yamlDataSourceRuleConfig) {
- return
Strings.isNullOrEmpty(yamlDataSourceRuleConfig.getTransactionReadQueryStrategy())
- ? TransactionReadQueryStrategy.DYNAMIC_REPLICA
- :
TransactionReadQueryStrategy.valueOf(yamlDataSourceRuleConfig.getTransactionReadQueryStrategy());
+ private TransactionalReadQueryStrategy
getTransactionalReadQueryStrategy(final
YamlReadwriteSplittingDataSourceRuleConfiguration yamlDataSourceRuleConfig) {
+ return
Strings.isNullOrEmpty(yamlDataSourceRuleConfig.getTransactionalReadQueryStrategy())
+ ? TransactionalReadQueryStrategy.DYNAMIC_REPLICA
+ :
TransactionalReadQueryStrategy.valueOf(yamlDataSourceRuleConfig.getTransactionalReadQueryStrategy());
}
@Override
diff --git
a/features/readwrite-splitting/core/src/test/java/org/apache/shardingsphere/readwritesplitting/rule/ReadwriteSplittingDataSourceRuleTest.java
b/features/readwrite-splitting/core/src/test/java/org/apache/shardingsphere/readwritesplitting/rule/ReadwriteSplittingDataSourceRuleTest.java
index 1b4a9ca6c7d..e571d945340 100644
---
a/features/readwrite-splitting/core/src/test/java/org/apache/shardingsphere/readwritesplitting/rule/ReadwriteSplittingDataSourceRuleTest.java
+++
b/features/readwrite-splitting/core/src/test/java/org/apache/shardingsphere/readwritesplitting/rule/ReadwriteSplittingDataSourceRuleTest.java
@@ -20,7 +20,7 @@ package org.apache.shardingsphere.readwritesplitting.rule;
import
org.apache.shardingsphere.readwritesplitting.algorithm.loadbalance.RandomReadQueryLoadBalanceAlgorithm;
import
org.apache.shardingsphere.readwritesplitting.api.rule.ReadwriteSplittingDataSourceRuleConfiguration;
import
org.apache.shardingsphere.readwritesplitting.api.strategy.StaticReadwriteSplittingStrategyConfiguration;
-import
org.apache.shardingsphere.readwritesplitting.api.transaction.TransactionReadQueryStrategy;
+import
org.apache.shardingsphere.readwritesplitting.api.transaction.TransactionalReadQueryStrategy;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -39,7 +39,7 @@ public final class ReadwriteSplittingDataSourceRuleTest {
readwriteSplittingDataSourceRule = new
ReadwriteSplittingDataSourceRule(
new ReadwriteSplittingDataSourceRuleConfiguration("test_pr",
new
StaticReadwriteSplittingStrategyConfiguration("write_ds",
Arrays.asList("read_ds_0", "read_ds_1")), null, null),
- TransactionReadQueryStrategy.DYNAMIC_REPLICA, new
RandomReadQueryLoadBalanceAlgorithm(), Collections.emptyList());
+ TransactionalReadQueryStrategy.DYNAMIC_REPLICA, new
RandomReadQueryLoadBalanceAlgorithm(), Collections.emptyList());
}
@Test
