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 be6da0caab9 Refactor name and javadoc of ReadQueryLoadBalanceAlgorithm
implementation class (#19160)
be6da0caab9 is described below
commit be6da0caab946c8f7b768f5e17284fb4b78082f0
Author: Zhengqiang Duan <[email protected]>
AuthorDate: Thu Jul 14 20:23:49 2022 +0800
Refactor name and javadoc of ReadQueryLoadBalanceAlgorithm implementation
class (#19160)
---
...a => ReadQueryLoadBalanceAlgorithmFactory.java} | 22 +++++++--------
.../spi/ReadQueryLoadBalanceAlgorithm.java | 6 ++--
.../ReplicaLoadBalanceAlgorithmFactoryTest.java | 6 ++--
...FixedPrimaryReadQueryLoadBalanceAlgorithm.java} | 4 +--
...eplicaRandomReadQueryLoadBalanceAlgorithm.java} | 4 +--
...caRoundRobinReadQueryLoadBalanceAlgorithm.java} | 4 +--
...eplicaWeightReadQueryLoadBalanceAlgorithm.java} | 4 +--
...va => RandomReadQueryLoadBalanceAlgorithm.java} | 4 +--
...> RoundRobinReadQueryLoadBalanceAlgorithm.java} | 4 +--
...actionRandomReadQueryLoadBalanceAlgorithm.java} | 4 +--
...onRoundRobinReadQueryLoadBalanceAlgorithm.java} | 4 +--
...actionWeightReadQueryLoadBalanceAlgorithm.java} | 4 +--
...va => WeightReadQueryLoadBalanceAlgorithm.java} | 4 +--
.../rule/ReadwriteSplittingRule.java | 8 +++---
...ritesplitting.spi.ReadQueryLoadBalanceAlgorithm | 20 +++++++-------
...dPrimaryReadQueryLoadBalanceAlgorithmTest.java} | 6 ++--
...caRandomReadQueryLoadBalanceAlgorithmTest.java} | 14 +++++-----
...undRobinReadQueryLoadBalanceAlgorithmTest.java} | 16 +++++------
...caWeightReadQueryLoadBalanceAlgorithmTest.java} | 32 +++++++++++-----------
...> RandomReadQueryLoadBalanceAlgorithmTest.java} | 12 ++++----
...undRobinReadQueryLoadBalanceAlgorithmTest.java} | 14 +++++-----
...onRandomReadQueryLoadBalanceAlgorithmTest.java} | 10 +++----
...undRobinReadQueryLoadBalanceAlgorithmTest.java} | 18 ++++++------
...onWeightReadQueryLoadBalanceAlgorithmTest.java} | 26 +++++++++---------
...> WeightReadQueryLoadBalanceAlgorithmTest.java} | 24 ++++++++--------
.../rule/ReadwriteSplittingDataSourceRuleTest.java | 12 ++++----
...orithmProviderConfigurationYamlSwapperTest.java | 4 +--
...lterReadwriteSplittingRuleStatementUpdater.java | 4 +--
...eateReadwriteSplittingRuleStatementUpdater.java | 4 +--
...ReadwriteSplittingRuleStatementUpdaterTest.java | 6 ++--
.../ReadwriteSplittingSpringBootStarterTest.java | 4 +--
.../ReplicaLoadBalanceAlgorithmFactoryBean.java | 4 +--
.../ReadwriteSplittingSpringNamespaceTest.java | 4 +--
.../spring/boot/SpringBootStarterTest.java | 4 +--
...iteSplittingRuleConfigurationImportChecker.java | 4 +--
35 files changed, 162 insertions(+), 162 deletions(-)
diff --git
a/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-api/src/main/java/org/apache/shardingsphere/readwritesplitting/factory/ReplicaLoadBalanceAlgorithmFactory.java
b/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-api/src/main/java/org/apache/shardingsphere/readwritesplitting/factory/ReadQueryLoadBalanceAlgorithmFactory.java
similarity index 72%
rename from
shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-api/src/main/java/org/apache/shardingsphere/readwritesplitting/factory/ReplicaLoadBalanceAlgorithmFactory.java
rename to
shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-api/src/main/java/org/apache/shardingsphere/readwritesplitting/factory/ReadQueryLoadBalanceAlgorithmFactory.java
index e2e2011de07..037b1c8774b 100644
---
a/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-api/src/main/java/org/apache/shardingsphere/readwritesplitting/factory/ReplicaLoadBalanceAlgorithmFactory.java
+++
b/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-api/src/main/java/org/apache/shardingsphere/readwritesplitting/factory/ReadQueryLoadBalanceAlgorithmFactory.java
@@ -30,14 +30,14 @@ import
org.apache.shardingsphere.spi.type.typed.TypedSPIRegistry;
* Read query load-balance algorithm factory.
*/
@NoArgsConstructor(access = AccessLevel.PRIVATE)
-public final class ReplicaLoadBalanceAlgorithmFactory {
+public final class ReadQueryLoadBalanceAlgorithmFactory {
static {
ShardingSphereServiceLoader.register(ReadQueryLoadBalanceAlgorithm.class);
}
/**
- * Create new instance of replica load-balance algorithm.
+ * Create new instance of read query load-balance algorithm.
*
* @return created instance
*/
@@ -46,22 +46,22 @@ public final class ReplicaLoadBalanceAlgorithmFactory {
}
/**
- * Create new instance of replica load-balance algorithm.
+ * Create new instance of read query load-balance algorithm.
*
- * @param replicaLoadBalanceAlgorithmConfig replica load-balance algorithm
configuration
+ * @param readQueryLoadBalanceAlgorithmConfig read query load-balance
algorithm configuration
* @return created instance
*/
- public static ReadQueryLoadBalanceAlgorithm newInstance(final
ShardingSphereAlgorithmConfiguration replicaLoadBalanceAlgorithmConfig) {
- return
ShardingSphereAlgorithmFactory.createAlgorithm(replicaLoadBalanceAlgorithmConfig,
ReadQueryLoadBalanceAlgorithm.class);
+ public static ReadQueryLoadBalanceAlgorithm newInstance(final
ShardingSphereAlgorithmConfiguration readQueryLoadBalanceAlgorithmConfig) {
+ return
ShardingSphereAlgorithmFactory.createAlgorithm(readQueryLoadBalanceAlgorithmConfig,
ReadQueryLoadBalanceAlgorithm.class);
}
/**
- * Judge whether contains load-balance algorithm.
+ * Judge whether contains read query load-balance algorithm.
*
- * @param replicaLoadBalanceAlgorithmType replica load-balance algorithm
type
- * @return contains replica load-balance algorithm or not
+ * @param readQueryLoadBalanceAlgorithmType read query load-balance
algorithm type
+ * @return contains read query load-balance algorithm or not
*/
- public static boolean contains(final String
replicaLoadBalanceAlgorithmType) {
- return
TypedSPIRegistry.findRegisteredService(ReadQueryLoadBalanceAlgorithm.class,
replicaLoadBalanceAlgorithmType).isPresent();
+ public static boolean contains(final String
readQueryLoadBalanceAlgorithmType) {
+ return
TypedSPIRegistry.findRegisteredService(ReadQueryLoadBalanceAlgorithm.class,
readQueryLoadBalanceAlgorithmType).isPresent();
}
}
diff --git
a/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-api/src/main/java/org/apache/shardingsphere/readwritesplitting/spi/ReadQueryLoadBalanceAlgorithm.java
b/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-api/src/main/java/org/apache/shardingsphere/readwritesplitting/spi/ReadQueryLoadBalanceAlgorithm.java
index 8c3d5d1d7e9..8ba2a50ff28 100644
---
a/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-api/src/main/java/org/apache/shardingsphere/readwritesplitting/spi/ReadQueryLoadBalanceAlgorithm.java
+++
b/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-api/src/main/java/org/apache/shardingsphere/readwritesplitting/spi/ReadQueryLoadBalanceAlgorithm.java
@@ -23,15 +23,15 @@ import
org.apache.shardingsphere.spi.type.required.RequiredSPI;
import java.util.List;
/**
- * Replica load-balance algorithm.
+ * Read query load-balance algorithm.
*/
public interface ReadQueryLoadBalanceAlgorithm extends
ShardingSphereAlgorithm, RequiredSPI {
/**
* Get data source.
*
- * @param name replica query logic data source name
- * @param writeDataSourceName name of write data sources
+ * @param name read query logic data source name
+ * @param writeDataSourceName name of write data source
* @param readDataSourceNames names of read data sources
* @return name of selected data source
*/
diff --git
a/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-api/src/test/java/org/apache/shardingsphere/readwritesplitting/factory/ReplicaLoadBalanceAlgorithmFactoryTest.java
b/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-api/src/test/java/org/apache/shardingsphere/readwritesplitting/factory/ReplicaLoadBalanceAlgorithmFactoryTest.java
index 43fd555c465..dcd072ce966 100644
---
a/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-api/src/test/java/org/apache/shardingsphere/readwritesplitting/factory/ReplicaLoadBalanceAlgorithmFactoryTest.java
+++
b/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-api/src/test/java/org/apache/shardingsphere/readwritesplitting/factory/ReplicaLoadBalanceAlgorithmFactoryTest.java
@@ -31,17 +31,17 @@ public final class ReplicaLoadBalanceAlgorithmFactoryTest {
@Test
public void assertNewInstance() {
- assertThat(ReplicaLoadBalanceAlgorithmFactory.newInstance(),
instanceOf(ReadQueryLoadBalanceAlgorithmFixture.class));
+ assertThat(ReadQueryLoadBalanceAlgorithmFactory.newInstance(),
instanceOf(ReadQueryLoadBalanceAlgorithmFixture.class));
}
@Test
public void assertNewInstanceWithShardingSphereAlgorithmConfiguration() {
ShardingSphereAlgorithmConfiguration configuration = new
ShardingSphereAlgorithmConfiguration("FIXTURE", new Properties());
-
assertThat(ReplicaLoadBalanceAlgorithmFactory.newInstance(configuration),
instanceOf(ReadQueryLoadBalanceAlgorithmFixture.class));
+
assertThat(ReadQueryLoadBalanceAlgorithmFactory.newInstance(configuration),
instanceOf(ReadQueryLoadBalanceAlgorithmFixture.class));
}
@Test
public void assertContains() {
- assertTrue(ReplicaLoadBalanceAlgorithmFactory.contains("FIXTURE"));
+ assertTrue(ReadQueryLoadBalanceAlgorithmFactory.contains("FIXTURE"));
}
}
diff --git
a/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/main/java/org/apache/shardingsphere/readwritesplitting/algorithm/loadbalance/FixedPrimaryLoadBalanceAlgorithm.java
b/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/main/java/org/apache/shardingsphere/readwritesplitting/algorithm/loadbalance/FixedPrimaryReadQueryLoadBalanceAlgorithm.java
similarity index 90%
rename from
shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/main/java/org/apache/shardingsphere/readwritesplitting/algorithm/loadbalance/FixedPrimaryLoadBalanceAlgorithm.java
rename to
shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/main/java/org/apache/shardingsphere/readwritesplitting/algorithm/loadbalance/FixedPrimaryReadQueryLoadBalanceAlgorithm.java
index d8460d87e14..f11f1be9d76 100644
---
a/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/main/java/org/apache/shardingsphere/readwritesplitting/algorithm/loadbalance/FixedPrimaryLoadBalanceAlgorithm.java
+++
b/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/main/java/org/apache/shardingsphere/readwritesplitting/algorithm/loadbalance/FixedPrimaryReadQueryLoadBalanceAlgorithm.java
@@ -24,9 +24,9 @@ import java.util.List;
import java.util.Properties;
/**
- * Fixed primary load-balance algorithm.
+ * Fixed primary read query load-balance algorithm.
*/
-public final class FixedPrimaryLoadBalanceAlgorithm implements
ReadQueryLoadBalanceAlgorithm {
+public final class FixedPrimaryReadQueryLoadBalanceAlgorithm implements
ReadQueryLoadBalanceAlgorithm {
@Getter
private Properties props;
diff --git
a/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/main/java/org/apache/shardingsphere/readwritesplitting/algorithm/loadbalance/FixedReplicaRandomLoadBalanceAlgorithm.java
b/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/main/java/org/apache/shardingsphere/readwritesplitting/algorithm/loadbalance/FixedReplicaRandomReadQueryLoadBalanceAlgorithm.java
similarity index 92%
rename from
shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/main/java/org/apache/shardingsphere/readwritesplitting/algorithm/loadbalance/FixedReplicaRandomLoadBalanceAlgorithm.java
rename to
shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/main/java/org/apache/shardingsphere/readwritesplitting/algorithm/loadbalance/FixedReplicaRandomReadQueryLoadBalanceAlgorithm.java
index b34b3d7a283..621b304bb28 100644
---
a/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/main/java/org/apache/shardingsphere/readwritesplitting/algorithm/loadbalance/FixedReplicaRandomLoadBalanceAlgorithm.java
+++
b/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/main/java/org/apache/shardingsphere/readwritesplitting/algorithm/loadbalance/FixedReplicaRandomReadQueryLoadBalanceAlgorithm.java
@@ -26,10 +26,10 @@ import java.util.Properties;
import java.util.concurrent.ThreadLocalRandom;
/**
- * Fixed replica random load-balance algorithm.
+ * Fixed replica random read query load-balance algorithm.
*/
@Getter
-public final class FixedReplicaRandomLoadBalanceAlgorithm implements
ReadQueryLoadBalanceAlgorithm {
+public final class FixedReplicaRandomReadQueryLoadBalanceAlgorithm implements
ReadQueryLoadBalanceAlgorithm {
private Properties props = new Properties();
diff --git
a/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/main/java/org/apache/shardingsphere/readwritesplitting/algorithm/loadbalance/FixedReplicaRoundRobinLoadBalanceAlgorithm.java
b/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/main/java/org/apache/shardingsphere/readwritesplitting/algorithm/loadbalance/FixedReplicaRoundRobinReadQueryLoadBalanceAlgorithm.java
similarity index 92%
rename from
shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/main/java/org/apache/shardingsphere/readwritesplitting/algorithm/loadbalance/FixedReplicaRoundRobinLoadBalanceAlgorithm.java
rename to
shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/main/java/org/apache/shardingsphere/readwritesplitting/algorithm/loadbalance/FixedReplicaRoundRobinReadQueryLoadBalanceAlgorithm.java
index 31ed19c4ee3..c6561127d9e 100644
---
a/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/main/java/org/apache/shardingsphere/readwritesplitting/algorithm/loadbalance/FixedReplicaRoundRobinLoadBalanceAlgorithm.java
+++
b/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/main/java/org/apache/shardingsphere/readwritesplitting/algorithm/loadbalance/FixedReplicaRoundRobinReadQueryLoadBalanceAlgorithm.java
@@ -26,9 +26,9 @@ import java.util.Properties;
import java.util.concurrent.atomic.AtomicInteger;
/**
- * Fixed replica round-robin load-balance algorithm.
+ * Fixed replica round-robin read query load-balance algorithm.
*/
-public final class FixedReplicaRoundRobinLoadBalanceAlgorithm implements
ReadQueryLoadBalanceAlgorithm {
+public final class FixedReplicaRoundRobinReadQueryLoadBalanceAlgorithm
implements ReadQueryLoadBalanceAlgorithm {
private final AtomicInteger count = new AtomicInteger(0);
diff --git
a/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/main/java/org/apache/shardingsphere/readwritesplitting/algorithm/loadbalance/FixedReplicaWeightLoadBalanceAlgorithm.java
b/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/main/java/org/apache/shardingsphere/readwritesplitting/algorithm/loadbalance/FixedReplicaWeightReadQueryLoadBalanceAlgorithm.java
similarity index 96%
rename from
shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/main/java/org/apache/shardingsphere/readwritesplitting/algorithm/loadbalance/FixedReplicaWeightLoadBalanceAlgorithm.java
rename to
shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/main/java/org/apache/shardingsphere/readwritesplitting/algorithm/loadbalance/FixedReplicaWeightReadQueryLoadBalanceAlgorithm.java
index a76ce399cba..e7e21a27376 100644
---
a/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/main/java/org/apache/shardingsphere/readwritesplitting/algorithm/loadbalance/FixedReplicaWeightLoadBalanceAlgorithm.java
+++
b/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/main/java/org/apache/shardingsphere/readwritesplitting/algorithm/loadbalance/FixedReplicaWeightReadQueryLoadBalanceAlgorithm.java
@@ -28,10 +28,10 @@ import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ThreadLocalRandom;
/**
- * Fixed replica weight load-balance algorithm.
+ * Fixed replica weight read query load-balance algorithm.
*/
@Getter
-public final class FixedReplicaWeightLoadBalanceAlgorithm implements
ReadQueryLoadBalanceAlgorithm {
+public final class FixedReplicaWeightReadQueryLoadBalanceAlgorithm implements
ReadQueryLoadBalanceAlgorithm {
private static final double ACCURACY_THRESHOLD = 0.0001;
diff --git
a/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/main/java/org/apache/shardingsphere/readwritesplitting/algorithm/loadbalance/RandomReplicaLoadBalanceAlgorithm.java
b/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/main/java/org/apache/shardingsphere/readwritesplitting/algorithm/loadbalance/RandomReadQueryLoadBalanceAlgorithm.java
similarity index 92%
rename from
shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/main/java/org/apache/shardingsphere/readwritesplitting/algorithm/loadbalance/RandomReplicaLoadBalanceAlgorithm.java
rename to
shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/main/java/org/apache/shardingsphere/readwritesplitting/algorithm/loadbalance/RandomReadQueryLoadBalanceAlgorithm.java
index 4542892c3f1..fc89c07e585 100644
---
a/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/main/java/org/apache/shardingsphere/readwritesplitting/algorithm/loadbalance/RandomReplicaLoadBalanceAlgorithm.java
+++
b/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/main/java/org/apache/shardingsphere/readwritesplitting/algorithm/loadbalance/RandomReadQueryLoadBalanceAlgorithm.java
@@ -26,10 +26,10 @@ import java.util.Properties;
import java.util.concurrent.ThreadLocalRandom;
/**
- * Random replica load-balance algorithm.
+ * Random read query load-balance algorithm.
*/
@Getter
-public final class RandomReplicaLoadBalanceAlgorithm implements
ReadQueryLoadBalanceAlgorithm {
+public final class RandomReadQueryLoadBalanceAlgorithm implements
ReadQueryLoadBalanceAlgorithm {
private Properties props = new Properties();
diff --git
a/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/main/java/org/apache/shardingsphere/readwritesplitting/algorithm/loadbalance/RoundRobinReplicaLoadBalanceAlgorithm.java
b/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/main/java/org/apache/shardingsphere/readwritesplitting/algorithm/loadbalance/RoundRobinReadQueryLoadBalanceAlgorithm.java
similarity index 92%
rename from
shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/main/java/org/apache/shardingsphere/readwritesplitting/algorithm/loadbalance/RoundRobinReplicaLoadBalanceAlgorithm.java
rename to
shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/main/java/org/apache/shardingsphere/readwritesplitting/algorithm/loadbalance/RoundRobinReadQueryLoadBalanceAlgorithm.java
index e67517ca4e2..00f93b198c3 100644
---
a/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/main/java/org/apache/shardingsphere/readwritesplitting/algorithm/loadbalance/RoundRobinReplicaLoadBalanceAlgorithm.java
+++
b/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/main/java/org/apache/shardingsphere/readwritesplitting/algorithm/loadbalance/RoundRobinReadQueryLoadBalanceAlgorithm.java
@@ -26,9 +26,9 @@ import java.util.Properties;
import java.util.concurrent.atomic.AtomicInteger;
/**
- * Round-robin replica load-balance algorithm.
+ * Round-robin read query load-balance algorithm.
*/
-public final class RoundRobinReplicaLoadBalanceAlgorithm implements
ReadQueryLoadBalanceAlgorithm {
+public final class RoundRobinReadQueryLoadBalanceAlgorithm implements
ReadQueryLoadBalanceAlgorithm {
private final AtomicInteger count = new AtomicInteger(0);
diff --git
a/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/main/java/org/apache/shardingsphere/readwritesplitting/algorithm/loadbalance/TransactionRandomReplicaLoadBalanceAlgorithm.java
b/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/main/java/org/apache/shardingsphere/readwritesplitting/algorithm/loadbalance/TransactionRandomReadQueryLoadBalanceAlgorithm.java
similarity index 90%
rename from
shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/main/java/org/apache/shardingsphere/readwritesplitting/algorithm/loadbalance/TransactionRandomReplicaLoadBalanceAlgorithm.java
rename to
shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/main/java/org/apache/shardingsphere/readwritesplitting/algorithm/loadbalance/TransactionRandomReadQueryLoadBalanceAlgorithm.java
index a11b17e5a80..11098637cb5 100644
---
a/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/main/java/org/apache/shardingsphere/readwritesplitting/algorithm/loadbalance/TransactionRandomReplicaLoadBalanceAlgorithm.java
+++
b/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/main/java/org/apache/shardingsphere/readwritesplitting/algorithm/loadbalance/TransactionRandomReadQueryLoadBalanceAlgorithm.java
@@ -25,10 +25,10 @@ import java.util.Properties;
import java.util.concurrent.ThreadLocalRandom;
/**
- * Transaction random replica load-balance algorithm.
+ * Transaction random read query load-balance algorithm.
*/
@Getter
-public final class TransactionRandomReplicaLoadBalanceAlgorithm implements
ReadQueryLoadBalanceAlgorithm {
+public final class TransactionRandomReadQueryLoadBalanceAlgorithm implements
ReadQueryLoadBalanceAlgorithm {
private Properties props = new Properties();
diff --git
a/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/main/java/org/apache/shardingsphere/readwritesplitting/algorithm/loadbalance/TransactionRoundRobinReplicaLoadBalanceAlgorithm.java
b/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/main/java/org/apache/shardingsphere/readwritesplitting/algorithm/loadbalance/TransactionRoundRobinReadQueryLoadBalanceAlgorithm.java
similarity index 90%
rename from
shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/main/java/org/apache/shardingsphere/readwritesplitting/algorithm/loadbalance/TransactionRoundRobinReplicaLoadBalanceAlgorithm.java
rename to
shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/main/java/org/apache/shardingsphere/readwritesplitting/algorithm/loadbalance/TransactionRoundRobinReadQueryLoadBalanceAlgorithm.java
index 54849c67f29..e018cbb5656 100644
---
a/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/main/java/org/apache/shardingsphere/readwritesplitting/algorithm/loadbalance/TransactionRoundRobinReplicaLoadBalanceAlgorithm.java
+++
b/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/main/java/org/apache/shardingsphere/readwritesplitting/algorithm/loadbalance/TransactionRoundRobinReadQueryLoadBalanceAlgorithm.java
@@ -25,9 +25,9 @@ import java.util.Properties;
import java.util.concurrent.atomic.AtomicInteger;
/**
- * Transaction round-robin replica load-balance algorithm.
+ * Transaction round-robin read query load-balance algorithm.
*/
-public final class TransactionRoundRobinReplicaLoadBalanceAlgorithm implements
ReadQueryLoadBalanceAlgorithm {
+public final class TransactionRoundRobinReadQueryLoadBalanceAlgorithm
implements ReadQueryLoadBalanceAlgorithm {
private final AtomicInteger count = new AtomicInteger(0);
diff --git
a/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/main/java/org/apache/shardingsphere/readwritesplitting/algorithm/loadbalance/TransactionWeightReplicaLoadBalanceAlgorithm.java
b/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/main/java/org/apache/shardingsphere/readwritesplitting/algorithm/loadbalance/TransactionWeightReadQueryLoadBalanceAlgorithm.java
similarity index 96%
rename from
shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/main/java/org/apache/shardingsphere/readwritesplitting/algorithm/loadbalance/TransactionWeightReplicaLoadBalanceAlgorithm.java
rename to
shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/main/java/org/apache/shardingsphere/readwritesplitting/algorithm/loadbalance/TransactionWeightReadQueryLoadBalanceAlgorithm.java
index e0756962019..c9d593f7d8b 100644
---
a/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/main/java/org/apache/shardingsphere/readwritesplitting/algorithm/loadbalance/TransactionWeightReplicaLoadBalanceAlgorithm.java
+++
b/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/main/java/org/apache/shardingsphere/readwritesplitting/algorithm/loadbalance/TransactionWeightReadQueryLoadBalanceAlgorithm.java
@@ -27,10 +27,10 @@ import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ThreadLocalRandom;
/**
- * Transaction weight replica load-balance algorithm.
+ * Transaction weight read query load-balance algorithm.
*/
@Getter
-public final class TransactionWeightReplicaLoadBalanceAlgorithm implements
ReadQueryLoadBalanceAlgorithm {
+public final class TransactionWeightReadQueryLoadBalanceAlgorithm implements
ReadQueryLoadBalanceAlgorithm {
private static final double ACCURACY_THRESHOLD = 0.0001;
diff --git
a/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/main/java/org/apache/shardingsphere/readwritesplitting/algorithm/loadbalance/WeightReplicaLoadBalanceAlgorithm.java
b/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/main/java/org/apache/shardingsphere/readwritesplitting/algorithm/loadbalance/WeightReadQueryLoadBalanceAlgorithm.java
similarity index 97%
rename from
shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/main/java/org/apache/shardingsphere/readwritesplitting/algorithm/loadbalance/WeightReplicaLoadBalanceAlgorithm.java
rename to
shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/main/java/org/apache/shardingsphere/readwritesplitting/algorithm/loadbalance/WeightReadQueryLoadBalanceAlgorithm.java
index c04a7201950..8685412cdae 100644
---
a/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/main/java/org/apache/shardingsphere/readwritesplitting/algorithm/loadbalance/WeightReplicaLoadBalanceAlgorithm.java
+++
b/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/main/java/org/apache/shardingsphere/readwritesplitting/algorithm/loadbalance/WeightReadQueryLoadBalanceAlgorithm.java
@@ -28,10 +28,10 @@ import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ThreadLocalRandom;
/**
- * Weight replica load-balance algorithm.
+ * Weight read query load-balance algorithm.
*/
@Getter
-public final class WeightReplicaLoadBalanceAlgorithm implements
ReadQueryLoadBalanceAlgorithm {
+public final class WeightReadQueryLoadBalanceAlgorithm implements
ReadQueryLoadBalanceAlgorithm {
private static final double ACCURACY_THRESHOLD = 0.0001;
diff --git
a/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/main/java/org/apache/shardingsphere/readwritesplitting/rule/ReadwriteSplittingRule.java
b/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/main/java/org/apache/shardingsphere/readwritesplitting/rule/ReadwriteSplittingRule.java
index 082388cb362..3eaae151762 100644
---
a/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/main/java/org/apache/shardingsphere/readwritesplitting/rule/ReadwriteSplittingRule.java
+++
b/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/main/java/org/apache/shardingsphere/readwritesplitting/rule/ReadwriteSplittingRule.java
@@ -36,7 +36,7 @@ import
org.apache.shardingsphere.mode.metadata.storage.event.StorageNodeDataSour
import
org.apache.shardingsphere.readwritesplitting.algorithm.config.AlgorithmProvidedReadwriteSplittingRuleConfiguration;
import
org.apache.shardingsphere.readwritesplitting.api.ReadwriteSplittingRuleConfiguration;
import
org.apache.shardingsphere.readwritesplitting.api.rule.ReadwriteSplittingDataSourceRuleConfiguration;
-import
org.apache.shardingsphere.readwritesplitting.factory.ReplicaLoadBalanceAlgorithmFactory;
+import
org.apache.shardingsphere.readwritesplitting.factory.ReadQueryLoadBalanceAlgorithmFactory;
import
org.apache.shardingsphere.readwritesplitting.spi.ReadQueryLoadBalanceAlgorithm;
import
org.apache.shardingsphere.readwritesplitting.strategy.type.DynamicReadwriteSplittingStrategy;
import
org.apache.shardingsphere.readwritesplitting.strategy.type.StaticReadwriteSplittingStrategy;
@@ -63,12 +63,12 @@ public final class ReadwriteSplittingRule implements
DatabaseRule, DataSourceCon
public ReadwriteSplittingRule(final ReadwriteSplittingRuleConfiguration
ruleConfig, final Collection<ShardingSphereRule> builtRules) {
configuration = ruleConfig;
Preconditions.checkArgument(!ruleConfig.getDataSources().isEmpty(),
"Replica query data source rules can not be empty.");
- ruleConfig.getLoadBalancers().forEach((key, value) ->
loadBalancers.put(key, ReplicaLoadBalanceAlgorithmFactory.newInstance(value)));
+ ruleConfig.getLoadBalancers().forEach((key, value) ->
loadBalancers.put(key,
ReadQueryLoadBalanceAlgorithmFactory.newInstance(value)));
dataSourceRules = new HashMap<>(ruleConfig.getDataSources().size(), 1);
for (ReadwriteSplittingDataSourceRuleConfiguration each :
ruleConfig.getDataSources()) {
// TODO check if can not find load balancer should throw exception.
ReadQueryLoadBalanceAlgorithm loadBalanceAlgorithm =
Strings.isNullOrEmpty(each.getLoadBalancerName()) ||
!loadBalancers.containsKey(each.getLoadBalancerName())
- ? ReplicaLoadBalanceAlgorithmFactory.newInstance()
+ ? ReadQueryLoadBalanceAlgorithmFactory.newInstance()
: loadBalancers.get(each.getLoadBalancerName());
dataSourceRules.put(each.getName(), new
ReadwriteSplittingDataSourceRule(each, loadBalanceAlgorithm, builtRules));
}
@@ -82,7 +82,7 @@ public final class ReadwriteSplittingRule implements
DatabaseRule, DataSourceCon
for (ReadwriteSplittingDataSourceRuleConfiguration each :
ruleConfig.getDataSources()) {
// TODO check if can not find load balancer should throw exception.
ReadQueryLoadBalanceAlgorithm loadBalanceAlgorithm =
Strings.isNullOrEmpty(each.getLoadBalancerName()) ||
!loadBalancers.containsKey(each.getLoadBalancerName())
- ? ReplicaLoadBalanceAlgorithmFactory.newInstance()
+ ? ReadQueryLoadBalanceAlgorithmFactory.newInstance()
: loadBalancers.get(each.getLoadBalancerName());
dataSourceRules.put(each.getName(), new
ReadwriteSplittingDataSourceRule(each, loadBalanceAlgorithm, builtRules));
}
diff --git
a/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/main/resources/META-INF/services/org.apache.shardingsphere.readwritesplitting.spi.ReadQueryLoadBalanceAlgorithm
b/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/main/resources/META-INF/services/org.apache.shardingsphere.readwritesplitting.spi.ReadQueryLoadBalanceAlgorithm
index ebcc94ee806..79791cd3643 100644
---
a/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/main/resources/META-INF/services/org.apache.shardingsphere.readwritesplitting.spi.ReadQueryLoadBalanceAlgorithm
+++
b/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/main/resources/META-INF/services/org.apache.shardingsphere.readwritesplitting.spi.ReadQueryLoadBalanceAlgorithm
@@ -15,13 +15,13 @@
# limitations under the License.
#
-org.apache.shardingsphere.readwritesplitting.algorithm.loadbalance.RoundRobinReplicaLoadBalanceAlgorithm
-org.apache.shardingsphere.readwritesplitting.algorithm.loadbalance.RandomReplicaLoadBalanceAlgorithm
-org.apache.shardingsphere.readwritesplitting.algorithm.loadbalance.WeightReplicaLoadBalanceAlgorithm
-org.apache.shardingsphere.readwritesplitting.algorithm.loadbalance.FixedPrimaryLoadBalanceAlgorithm
-org.apache.shardingsphere.readwritesplitting.algorithm.loadbalance.FixedReplicaRandomLoadBalanceAlgorithm
-org.apache.shardingsphere.readwritesplitting.algorithm.loadbalance.FixedReplicaRoundRobinLoadBalanceAlgorithm
-org.apache.shardingsphere.readwritesplitting.algorithm.loadbalance.FixedReplicaWeightLoadBalanceAlgorithm
-org.apache.shardingsphere.readwritesplitting.algorithm.loadbalance.TransactionRandomReplicaLoadBalanceAlgorithm
-org.apache.shardingsphere.readwritesplitting.algorithm.loadbalance.TransactionRoundRobinReplicaLoadBalanceAlgorithm
-org.apache.shardingsphere.readwritesplitting.algorithm.loadbalance.TransactionWeightReplicaLoadBalanceAlgorithm
+org.apache.shardingsphere.readwritesplitting.algorithm.loadbalance.RoundRobinReadQueryLoadBalanceAlgorithm
+org.apache.shardingsphere.readwritesplitting.algorithm.loadbalance.RandomReadQueryLoadBalanceAlgorithm
+org.apache.shardingsphere.readwritesplitting.algorithm.loadbalance.WeightReadQueryLoadBalanceAlgorithm
+org.apache.shardingsphere.readwritesplitting.algorithm.loadbalance.FixedPrimaryReadQueryLoadBalanceAlgorithm
+org.apache.shardingsphere.readwritesplitting.algorithm.loadbalance.FixedReplicaRandomReadQueryLoadBalanceAlgorithm
+org.apache.shardingsphere.readwritesplitting.algorithm.loadbalance.FixedReplicaRoundRobinReadQueryLoadBalanceAlgorithm
+org.apache.shardingsphere.readwritesplitting.algorithm.loadbalance.FixedReplicaWeightReadQueryLoadBalanceAlgorithm
+org.apache.shardingsphere.readwritesplitting.algorithm.loadbalance.TransactionRandomReadQueryLoadBalanceAlgorithm
+org.apache.shardingsphere.readwritesplitting.algorithm.loadbalance.TransactionRoundRobinReadQueryLoadBalanceAlgorithm
+org.apache.shardingsphere.readwritesplitting.algorithm.loadbalance.TransactionWeightReadQueryLoadBalanceAlgorithm
diff --git
a/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/test/java/org/apache/shardingsphere/readwritesplitting/algorithm/loadbalance/FixedPrimaryLoadBalanceAlgorithmTest.java
b/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/test/java/org/apache/shardingsphere/readwritesplitting/algorithm/loadbalance/FixedPrimaryReadQueryLoadBalanceAlgorithmTest.java
similarity index 80%
rename from
shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/test/java/org/apache/shardingsphere/readwritesplitting/algorithm/loadbalance/FixedPrimaryLoadBalanceAlgorithmTest.java
rename to
shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/test/java/org/apache/shardingsphere/readwritesplitting/algorithm/loadbalance/FixedPrimaryReadQueryLoadBalanceAlgorithmTest.java
index 529cc0ca3a0..20b1bc55bb2 100644
---
a/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/test/java/org/apache/shardingsphere/readwritesplitting/algorithm/loadbalance/FixedPrimaryLoadBalanceAlgorithmTest.java
+++
b/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/test/java/org/apache/shardingsphere/readwritesplitting/algorithm/loadbalance/FixedPrimaryReadQueryLoadBalanceAlgorithmTest.java
@@ -25,9 +25,9 @@ import java.util.List;
import static org.junit.Assert.assertThat;
import static org.hamcrest.CoreMatchers.is;
-public final class FixedPrimaryLoadBalanceAlgorithmTest {
+public final class FixedPrimaryReadQueryLoadBalanceAlgorithmTest {
- private final FixedPrimaryLoadBalanceAlgorithm
fixedPrimaryLoadBalanceAlgorithm = new FixedPrimaryLoadBalanceAlgorithm();
+ private final FixedPrimaryReadQueryLoadBalanceAlgorithm
loadBalanceAlgorithm = new FixedPrimaryReadQueryLoadBalanceAlgorithm();
@Test
public void assertGetDataSource() {
@@ -35,6 +35,6 @@ public final class FixedPrimaryLoadBalanceAlgorithmTest {
String readDataSourceName1 = "test_replica_ds_1";
String readDataSourceName2 = "test_replica_ds_2";
List<String> readDataSourceNames = Arrays.asList(readDataSourceName1,
readDataSourceName2);
- assertThat(fixedPrimaryLoadBalanceAlgorithm.getDataSource("ds",
writeDataSourceName, readDataSourceNames), is(writeDataSourceName));
+ assertThat(loadBalanceAlgorithm.getDataSource("ds",
writeDataSourceName, readDataSourceNames), is(writeDataSourceName));
}
}
diff --git
a/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/test/java/org/apache/shardingsphere/readwritesplitting/algorithm/loadbalance/FixedReplicaRandomLoadBalanceAlgorithmTest.java
b/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/test/java/org/apache/shardingsphere/readwritesplitting/algorithm/loadbalance/FixedReplicaRandomReadQueryLoadBalanceAlgorithmTest.java
similarity index 71%
rename from
shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/test/java/org/apache/shardingsphere/readwritesplitting/algorithm/loadbalance/FixedReplicaRandomLoadBalanceAlgorithmTest.java
rename to
shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/test/java/org/apache/shardingsphere/readwritesplitting/algorithm/loadbalance/FixedReplicaRandomReadQueryLoadBalanceAlgorithmTest.java
index 0a13a5a1d0d..74a35bc8456 100644
---
a/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/test/java/org/apache/shardingsphere/readwritesplitting/algorithm/loadbalance/FixedReplicaRandomLoadBalanceAlgorithmTest.java
+++
b/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/test/java/org/apache/shardingsphere/readwritesplitting/algorithm/loadbalance/FixedReplicaRandomReadQueryLoadBalanceAlgorithmTest.java
@@ -28,9 +28,9 @@ import static org.junit.Assert.assertTrue;
import static org.junit.Assert.assertThat;
import static org.hamcrest.CoreMatchers.is;
-public final class FixedReplicaRandomLoadBalanceAlgorithmTest {
+public final class FixedReplicaRandomReadQueryLoadBalanceAlgorithmTest {
- private final FixedReplicaRandomLoadBalanceAlgorithm
fixedReplicaRandomLoadBalanceAlgorithm = new
FixedReplicaRandomLoadBalanceAlgorithm();
+ private final FixedReplicaRandomReadQueryLoadBalanceAlgorithm
loadBalanceAlgorithm = new FixedReplicaRandomReadQueryLoadBalanceAlgorithm();
@Test
public void assertGetDataSourceInTransaction() {
@@ -39,10 +39,10 @@ public final class
FixedReplicaRandomLoadBalanceAlgorithmTest {
String readDataSourceName2 = "test_replica_ds_2";
List<String> readDataSourceNames = Arrays.asList(readDataSourceName1,
readDataSourceName2);
TransactionHolder.setInTransaction();
- String routeDataSource =
fixedReplicaRandomLoadBalanceAlgorithm.getDataSource("ds", writeDataSourceName,
readDataSourceNames);
-
assertTrue(readDataSourceNames.contains(fixedReplicaRandomLoadBalanceAlgorithm.getDataSource("ds",
writeDataSourceName, readDataSourceNames)));
- assertThat(fixedReplicaRandomLoadBalanceAlgorithm.getDataSource("ds",
writeDataSourceName, readDataSourceNames), is(routeDataSource));
- assertThat(fixedReplicaRandomLoadBalanceAlgorithm.getDataSource("ds",
writeDataSourceName, readDataSourceNames), is(routeDataSource));
+ String routeDataSource = loadBalanceAlgorithm.getDataSource("ds",
writeDataSourceName, readDataSourceNames);
+
assertTrue(readDataSourceNames.contains(loadBalanceAlgorithm.getDataSource("ds",
writeDataSourceName, readDataSourceNames)));
+ assertThat(loadBalanceAlgorithm.getDataSource("ds",
writeDataSourceName, readDataSourceNames), is(routeDataSource));
+ assertThat(loadBalanceAlgorithm.getDataSource("ds",
writeDataSourceName, readDataSourceNames), is(routeDataSource));
TransactionHolder.clear();
}
@@ -54,7 +54,7 @@ public final class FixedReplicaRandomLoadBalanceAlgorithmTest
{
List<String> readDataSourceNames = Arrays.asList(readDataSourceName1,
readDataSourceName2);
List<String> noTransactionReadDataSourceNames = new LinkedList<>();
for (int i = 0; i < 5; i++) {
- String routeDataSource =
fixedReplicaRandomLoadBalanceAlgorithm.getDataSource("ds", writeDataSourceName,
readDataSourceNames);
+ String routeDataSource = loadBalanceAlgorithm.getDataSource("ds",
writeDataSourceName, readDataSourceNames);
noTransactionReadDataSourceNames.add(routeDataSource);
}
assertTrue(noTransactionReadDataSourceNames.size() > 1);
diff --git
a/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/test/java/org/apache/shardingsphere/readwritesplitting/algorithm/loadbalance/FixedReplicaRoundRobinLoadBalanceAlgorithmTest.java
b/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/test/java/org/apache/shardingsphere/readwritesplitting/algorithm/loadbalance/FixedReplicaRoundRobinReadQueryLoadBalanceAlgorithmTest.java
similarity index 66%
rename from
shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/test/java/org/apache/shardingsphere/readwritesplitting/algorithm/loadbalance/FixedReplicaRoundRobinLoadBalanceAlgorithmTest.java
rename to
shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/test/java/org/apache/shardingsphere/readwritesplitting/algorithm/loadbalance/FixedReplicaRoundRobinReadQueryLoadBalanceAlgorithmTest.java
index 9e349da3429..3ed90dd4338 100644
---
a/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/test/java/org/apache/shardingsphere/readwritesplitting/algorithm/loadbalance/FixedReplicaRoundRobinLoadBalanceAlgorithmTest.java
+++
b/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/test/java/org/apache/shardingsphere/readwritesplitting/algorithm/loadbalance/FixedReplicaRoundRobinReadQueryLoadBalanceAlgorithmTest.java
@@ -28,9 +28,9 @@ import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
import static org.junit.Assert.assertTrue;
-public final class FixedReplicaRoundRobinLoadBalanceAlgorithmTest {
+public final class FixedReplicaRoundRobinReadQueryLoadBalanceAlgorithmTest {
- private final FixedReplicaRoundRobinLoadBalanceAlgorithm
fixedReplicaRoundRobinLoadBalanceAlgorithm = new
FixedReplicaRoundRobinLoadBalanceAlgorithm();
+ private final FixedReplicaRoundRobinReadQueryLoadBalanceAlgorithm
loadBalanceAlgorithm = new
FixedReplicaRoundRobinReadQueryLoadBalanceAlgorithm();
@Test
public void assertGetDataSourceInTransaction() {
@@ -39,11 +39,11 @@ public final class
FixedReplicaRoundRobinLoadBalanceAlgorithmTest {
String readDataSourceName2 = "test_replica_ds_2";
List<String> readDataSourceNames = Arrays.asList(readDataSourceName1,
readDataSourceName2);
TransactionHolder.setInTransaction();
- String routeDataSource =
fixedReplicaRoundRobinLoadBalanceAlgorithm.getDataSource("ds",
writeDataSourceName, readDataSourceNames);
-
assertTrue(readDataSourceNames.contains(fixedReplicaRoundRobinLoadBalanceAlgorithm.getDataSource("ds",
writeDataSourceName, readDataSourceNames)));
-
assertThat(fixedReplicaRoundRobinLoadBalanceAlgorithm.getDataSource("ds",
writeDataSourceName, readDataSourceNames), is(routeDataSource));
-
assertThat(fixedReplicaRoundRobinLoadBalanceAlgorithm.getDataSource("ds",
writeDataSourceName, readDataSourceNames), is(routeDataSource));
-
assertThat(fixedReplicaRoundRobinLoadBalanceAlgorithm.getDataSource("ds",
writeDataSourceName, readDataSourceNames), is(routeDataSource));
+ String routeDataSource = loadBalanceAlgorithm.getDataSource("ds",
writeDataSourceName, readDataSourceNames);
+
assertTrue(readDataSourceNames.contains(loadBalanceAlgorithm.getDataSource("ds",
writeDataSourceName, readDataSourceNames)));
+ assertThat(loadBalanceAlgorithm.getDataSource("ds",
writeDataSourceName, readDataSourceNames), is(routeDataSource));
+ assertThat(loadBalanceAlgorithm.getDataSource("ds",
writeDataSourceName, readDataSourceNames), is(routeDataSource));
+ assertThat(loadBalanceAlgorithm.getDataSource("ds",
writeDataSourceName, readDataSourceNames), is(routeDataSource));
TransactionHolder.clear();
}
@@ -55,7 +55,7 @@ public final class
FixedReplicaRoundRobinLoadBalanceAlgorithmTest {
List<String> readDataSourceNames = Arrays.asList(readDataSourceName1,
readDataSourceName2);
List<String> noTransactionReadDataSourceNames = new LinkedList<>();
for (int i = 0; i < 5; i++) {
- String routeDataSource =
fixedReplicaRoundRobinLoadBalanceAlgorithm.getDataSource("ds",
writeDataSourceName, readDataSourceNames);
+ String routeDataSource = loadBalanceAlgorithm.getDataSource("ds",
writeDataSourceName, readDataSourceNames);
noTransactionReadDataSourceNames.add(routeDataSource);
}
assertTrue(noTransactionReadDataSourceNames.size() > 1);
diff --git
a/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/test/java/org/apache/shardingsphere/readwritesplitting/algorithm/loadbalance/FixedReplicaWeightLoadBalanceAlgorithmTest.java
b/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/test/java/org/apache/shardingsphere/readwritesplitting/algorithm/loadbalance/FixedReplicaWeightReadQueryLoadBalanceAlgorithmTest.java
similarity index 60%
rename from
shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/test/java/org/apache/shardingsphere/readwritesplitting/algorithm/loadbalance/FixedReplicaWeightLoadBalanceAlgorithmTest.java
rename to
shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/test/java/org/apache/shardingsphere/readwritesplitting/algorithm/loadbalance/FixedReplicaWeightReadQueryLoadBalanceAlgorithmTest.java
index 92334e14e1b..2891ca0bad0 100644
---
a/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/test/java/org/apache/shardingsphere/readwritesplitting/algorithm/loadbalance/FixedReplicaWeightLoadBalanceAlgorithmTest.java
+++
b/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/test/java/org/apache/shardingsphere/readwritesplitting/algorithm/loadbalance/FixedReplicaWeightReadQueryLoadBalanceAlgorithmTest.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.readwritesplitting.algorithm.loadbalance;
import
org.apache.shardingsphere.infra.config.algorithm.ShardingSphereAlgorithmConfiguration;
-import
org.apache.shardingsphere.readwritesplitting.factory.ReplicaLoadBalanceAlgorithmFactory;
+import
org.apache.shardingsphere.readwritesplitting.factory.ReadQueryLoadBalanceAlgorithmFactory;
import org.apache.shardingsphere.transaction.TransactionHolder;
import org.junit.After;
import org.junit.Before;
@@ -36,24 +36,24 @@ import static org.junit.Assert.assertThat;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertTrue;
-public final class FixedReplicaWeightLoadBalanceAlgorithmTest {
+public final class FixedReplicaWeightReadQueryLoadBalanceAlgorithmTest {
@SuppressWarnings("rawtypes")
@Before
@After
public void reset() throws NoSuchFieldException, IllegalAccessException {
- Field accuracyThresholdField =
FixedReplicaWeightLoadBalanceAlgorithm.class.getDeclaredField("WEIGHT_MAP");
+ Field accuracyThresholdField =
FixedReplicaWeightReadQueryLoadBalanceAlgorithm.class.getDeclaredField("WEIGHT_MAP");
accuracyThresholdField.setAccessible(true);
- ((Map)
accuracyThresholdField.get(FixedReplicaWeightLoadBalanceAlgorithm.class)).clear();
+ ((Map)
accuracyThresholdField.get(FixedReplicaWeightReadQueryLoadBalanceAlgorithm.class)).clear();
}
@Test
public void assertGetSingleReadDataSourceInTransaction() {
- FixedReplicaWeightLoadBalanceAlgorithm
fixedReplicaWeightLoadBalanceAlgorithm =
createReplicaLoadBalanceAlgorithm(createSingleDataSourceProperties());
+ FixedReplicaWeightReadQueryLoadBalanceAlgorithm loadBalanceAlgorithm =
createReadQueryLoadBalanceAlgorithm(createSingleDataSourceProperties());
TransactionHolder.isTransaction();
- String routeDataSource =
fixedReplicaWeightLoadBalanceAlgorithm.getDataSource("ds", "test_write_ds",
Collections.singletonList("test_read_ds_1"));
+ String routeDataSource = loadBalanceAlgorithm.getDataSource("ds",
"test_write_ds", Collections.singletonList("test_read_ds_1"));
assertThat(routeDataSource, is("test_read_ds_1"));
- assertThat(fixedReplicaWeightLoadBalanceAlgorithm.getDataSource("ds",
"test_write_ds", Collections.singletonList("test_read_ds_1")),
is(routeDataSource));
+ assertThat(loadBalanceAlgorithm.getDataSource("ds", "test_write_ds",
Collections.singletonList("test_read_ds_1")), is(routeDataSource));
TransactionHolder.clear();
}
@@ -65,14 +65,14 @@ public final class
FixedReplicaWeightLoadBalanceAlgorithmTest {
@Test
public void assertGetMultipleReadDataSourcesWithoutTransaction() {
- FixedReplicaWeightLoadBalanceAlgorithm
fixedReplicaWeightLoadBalanceAlgorithm =
createReplicaLoadBalanceAlgorithm(createMultipleDataSourcesProperties());
+ FixedReplicaWeightReadQueryLoadBalanceAlgorithm loadBalanceAlgorithm =
createReadQueryLoadBalanceAlgorithm(createMultipleDataSourcesProperties());
String writeDataSourceName = "test_write_ds";
String readDataSourceName1 = "test_read_ds_1";
String readDataSourceName2 = "test_read_ds_2";
List<String> readDataSourceNames = Arrays.asList(readDataSourceName1,
readDataSourceName2);
List<String> noTransactionReadDataSourceNames = new LinkedList<>();
for (int i = 0; i < 5; i++) {
- String routeDataSource =
fixedReplicaWeightLoadBalanceAlgorithm.getDataSource("ds", writeDataSourceName,
readDataSourceNames);
+ String routeDataSource = loadBalanceAlgorithm.getDataSource("ds",
writeDataSourceName, readDataSourceNames);
noTransactionReadDataSourceNames.add(routeDataSource);
}
assertTrue(noTransactionReadDataSourceNames.size() > 1);
@@ -80,16 +80,16 @@ public final class
FixedReplicaWeightLoadBalanceAlgorithmTest {
@Test
public void assertGetMultipleReadDataSourcesInTransaction() {
- FixedReplicaWeightLoadBalanceAlgorithm
fixedReplicaWeightLoadBalanceAlgorithm =
createReplicaLoadBalanceAlgorithm(createMultipleDataSourcesProperties());
+ FixedReplicaWeightReadQueryLoadBalanceAlgorithm loadBalanceAlgorithm =
createReadQueryLoadBalanceAlgorithm(createMultipleDataSourcesProperties());
String writeDataSourceName = "test_write_ds";
String readDataSourceName1 = "test_read_ds_1";
String readDataSourceName2 = "test_read_ds_2";
List<String> readDataSourceNames = Arrays.asList(readDataSourceName1,
readDataSourceName2);
TransactionHolder.setInTransaction();
- String routeDataSource =
fixedReplicaWeightLoadBalanceAlgorithm.getDataSource("ds", "test_write_ds",
readDataSourceNames);
- assertThat(fixedReplicaWeightLoadBalanceAlgorithm.getDataSource("ds",
writeDataSourceName, readDataSourceNames), is(routeDataSource));
- assertThat(fixedReplicaWeightLoadBalanceAlgorithm.getDataSource("ds",
writeDataSourceName, readDataSourceNames), is(routeDataSource));
- assertThat(fixedReplicaWeightLoadBalanceAlgorithm.getDataSource("ds",
writeDataSourceName, readDataSourceNames), is(routeDataSource));
+ String routeDataSource = loadBalanceAlgorithm.getDataSource("ds",
"test_write_ds", readDataSourceNames);
+ assertThat(loadBalanceAlgorithm.getDataSource("ds",
writeDataSourceName, readDataSourceNames), is(routeDataSource));
+ assertThat(loadBalanceAlgorithm.getDataSource("ds",
writeDataSourceName, readDataSourceNames), is(routeDataSource));
+ assertThat(loadBalanceAlgorithm.getDataSource("ds",
writeDataSourceName, readDataSourceNames), is(routeDataSource));
TransactionHolder.clear();
}
@@ -100,7 +100,7 @@ public final class
FixedReplicaWeightLoadBalanceAlgorithmTest {
return result;
}
- private FixedReplicaWeightLoadBalanceAlgorithm
createReplicaLoadBalanceAlgorithm(final Properties props) {
- return (FixedReplicaWeightLoadBalanceAlgorithm)
ReplicaLoadBalanceAlgorithmFactory.newInstance(new
ShardingSphereAlgorithmConfiguration("FIXED_REPLICA_WEIGHT", props));
+ private FixedReplicaWeightReadQueryLoadBalanceAlgorithm
createReadQueryLoadBalanceAlgorithm(final Properties props) {
+ return (FixedReplicaWeightReadQueryLoadBalanceAlgorithm)
ReadQueryLoadBalanceAlgorithmFactory.newInstance(new
ShardingSphereAlgorithmConfiguration("FIXED_REPLICA_WEIGHT", props));
}
}
diff --git
a/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/test/java/org/apache/shardingsphere/readwritesplitting/algorithm/loadbalance/RandomReplicaLoadBalanceAlgorithmTest.java
b/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/test/java/org/apache/shardingsphere/readwritesplitting/algorithm/loadbalance/RandomReadQueryLoadBalanceAlgorithmTest.java
similarity index 70%
rename from
shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/test/java/org/apache/shardingsphere/readwritesplitting/algorithm/loadbalance/RandomReplicaLoadBalanceAlgorithmTest.java
rename to
shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/test/java/org/apache/shardingsphere/readwritesplitting/algorithm/loadbalance/RandomReadQueryLoadBalanceAlgorithmTest.java
index 60d6be76e7a..675ed75f082 100644
---
a/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/test/java/org/apache/shardingsphere/readwritesplitting/algorithm/loadbalance/RandomReplicaLoadBalanceAlgorithmTest.java
+++
b/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/test/java/org/apache/shardingsphere/readwritesplitting/algorithm/loadbalance/RandomReadQueryLoadBalanceAlgorithmTest.java
@@ -25,9 +25,9 @@ import java.util.List;
import static org.junit.Assert.assertTrue;
-public final class RandomReplicaLoadBalanceAlgorithmTest {
+public final class RandomReadQueryLoadBalanceAlgorithmTest {
- private final RandomReplicaLoadBalanceAlgorithm
randomReplicaLoadBalanceAlgorithm = new RandomReplicaLoadBalanceAlgorithm();
+ private final RandomReadQueryLoadBalanceAlgorithm loadBalanceAlgorithm =
new RandomReadQueryLoadBalanceAlgorithm();
@Test
public void assertGetDataSourceInTransaction() {
@@ -36,7 +36,7 @@ public final class RandomReplicaLoadBalanceAlgorithmTest {
String readDataSourceName2 = "test_replica_ds_2";
List<String> readDataSourceNames = Arrays.asList(readDataSourceName1,
readDataSourceName2);
TransactionHolder.setInTransaction();
-
assertTrue(writeDataSourceName.contains(randomReplicaLoadBalanceAlgorithm.getDataSource("ds",
writeDataSourceName, readDataSourceNames)));
+
assertTrue(writeDataSourceName.contains(loadBalanceAlgorithm.getDataSource("ds",
writeDataSourceName, readDataSourceNames)));
TransactionHolder.clear();
}
@@ -46,8 +46,8 @@ public final class RandomReplicaLoadBalanceAlgorithmTest {
String readDataSourceName1 = "test_replica_ds_1";
String readDataSourceName2 = "test_replica_ds_2";
List<String> readDataSourceNames = Arrays.asList(readDataSourceName1,
readDataSourceName2);
-
assertTrue(readDataSourceNames.contains(randomReplicaLoadBalanceAlgorithm.getDataSource("ds",
writeDataSourceName, readDataSourceNames)));
-
assertTrue(readDataSourceNames.contains(randomReplicaLoadBalanceAlgorithm.getDataSource("ds",
writeDataSourceName, readDataSourceNames)));
-
assertTrue(readDataSourceNames.contains(randomReplicaLoadBalanceAlgorithm.getDataSource("ds",
writeDataSourceName, readDataSourceNames)));
+
assertTrue(readDataSourceNames.contains(loadBalanceAlgorithm.getDataSource("ds",
writeDataSourceName, readDataSourceNames)));
+
assertTrue(readDataSourceNames.contains(loadBalanceAlgorithm.getDataSource("ds",
writeDataSourceName, readDataSourceNames)));
+
assertTrue(readDataSourceNames.contains(loadBalanceAlgorithm.getDataSource("ds",
writeDataSourceName, readDataSourceNames)));
}
}
diff --git
a/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/test/java/org/apache/shardingsphere/readwritesplitting/algorithm/loadbalance/RoundRobinReplicaLoadBalanceAlgorithmTest.java
b/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/test/java/org/apache/shardingsphere/readwritesplitting/algorithm/loadbalance/RoundRobinReadQueryLoadBalanceAlgorithmTest.java
similarity index 67%
rename from
shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/test/java/org/apache/shardingsphere/readwritesplitting/algorithm/loadbalance/RoundRobinReplicaLoadBalanceAlgorithmTest.java
rename to
shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/test/java/org/apache/shardingsphere/readwritesplitting/algorithm/loadbalance/RoundRobinReadQueryLoadBalanceAlgorithmTest.java
index 63445693b90..37b6d80a84d 100644
---
a/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/test/java/org/apache/shardingsphere/readwritesplitting/algorithm/loadbalance/RoundRobinReplicaLoadBalanceAlgorithmTest.java
+++
b/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/test/java/org/apache/shardingsphere/readwritesplitting/algorithm/loadbalance/RoundRobinReadQueryLoadBalanceAlgorithmTest.java
@@ -26,18 +26,18 @@ import java.util.List;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
-public final class RoundRobinReplicaLoadBalanceAlgorithmTest {
+public final class RoundRobinReadQueryLoadBalanceAlgorithmTest {
@Test
public void assertGetDataSource() {
String writeDataSourceName = "test_write_ds";
String readDataSourceName1 = "test_read_ds_1";
String readDataSourceName2 = "test_read_ds_2";
- RoundRobinReplicaLoadBalanceAlgorithm
roundRobinReplicaLoadBalanceAlgorithm = new
RoundRobinReplicaLoadBalanceAlgorithm();
+ RoundRobinReadQueryLoadBalanceAlgorithm loadBalanceAlgorithm = new
RoundRobinReadQueryLoadBalanceAlgorithm();
List<String> readDataSourceNames = Arrays.asList(readDataSourceName1,
readDataSourceName2);
- assertThat(roundRobinReplicaLoadBalanceAlgorithm.getDataSource("ds",
writeDataSourceName, readDataSourceNames), is(readDataSourceName1));
- assertThat(roundRobinReplicaLoadBalanceAlgorithm.getDataSource("ds",
writeDataSourceName, readDataSourceNames), is(readDataSourceName2));
- assertThat(roundRobinReplicaLoadBalanceAlgorithm.getDataSource("ds",
writeDataSourceName, readDataSourceNames), is(readDataSourceName1));
+ assertThat(loadBalanceAlgorithm.getDataSource("ds",
writeDataSourceName, readDataSourceNames), is(readDataSourceName1));
+ assertThat(loadBalanceAlgorithm.getDataSource("ds",
writeDataSourceName, readDataSourceNames), is(readDataSourceName2));
+ assertThat(loadBalanceAlgorithm.getDataSource("ds",
writeDataSourceName, readDataSourceNames), is(readDataSourceName1));
}
@Test
@@ -45,10 +45,10 @@ public final class
RoundRobinReplicaLoadBalanceAlgorithmTest {
String writeDataSourceName = "test_write_ds";
String readDataSourceName1 = "test_read_ds_1";
String readDataSourceName2 = "test_read_ds_2";
- RoundRobinReplicaLoadBalanceAlgorithm
roundRobinReplicaLoadBalanceAlgorithm = new
RoundRobinReplicaLoadBalanceAlgorithm();
+ RoundRobinReadQueryLoadBalanceAlgorithm loadBalanceAlgorithm = new
RoundRobinReadQueryLoadBalanceAlgorithm();
List<String> readDataSourceNames = Arrays.asList(readDataSourceName1,
readDataSourceName2);
TransactionHolder.setInTransaction();
- assertThat(roundRobinReplicaLoadBalanceAlgorithm.getDataSource("ds",
writeDataSourceName, readDataSourceNames), is(writeDataSourceName));
+ assertThat(loadBalanceAlgorithm.getDataSource("ds",
writeDataSourceName, readDataSourceNames), is(writeDataSourceName));
TransactionHolder.clear();
}
}
diff --git
a/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/test/java/org/apache/shardingsphere/readwritesplitting/algorithm/loadbalance/TransactionRandomReplicaLoadBalanceAlgorithmTest.java
b/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/test/java/org/apache/shardingsphere/readwritesplitting/algorithm/loadbalance/TransactionRandomReadQueryLoadBalanceAlgorithmTest.java
similarity index 67%
rename from
shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/test/java/org/apache/shardingsphere/readwritesplitting/algorithm/loadbalance/TransactionRandomReplicaLoadBalanceAlgorithmTest.java
rename to
shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/test/java/org/apache/shardingsphere/readwritesplitting/algorithm/loadbalance/TransactionRandomReadQueryLoadBalanceAlgorithmTest.java
index 2e398c4b620..c85740dd7a1 100644
---
a/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/test/java/org/apache/shardingsphere/readwritesplitting/algorithm/loadbalance/TransactionRandomReplicaLoadBalanceAlgorithmTest.java
+++
b/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/test/java/org/apache/shardingsphere/readwritesplitting/algorithm/loadbalance/TransactionRandomReadQueryLoadBalanceAlgorithmTest.java
@@ -25,9 +25,9 @@ import java.util.List;
import static org.junit.Assert.assertTrue;
-public final class TransactionRandomReplicaLoadBalanceAlgorithmTest {
+public final class TransactionRandomReadQueryLoadBalanceAlgorithmTest {
- private final TransactionRandomReplicaLoadBalanceAlgorithm
transactionRandomReplicaLoadBalanceAlgorithm = new
TransactionRandomReplicaLoadBalanceAlgorithm();
+ private final TransactionRandomReadQueryLoadBalanceAlgorithm
loadBalanceAlgorithm = new TransactionRandomReadQueryLoadBalanceAlgorithm();
@Test
public void assertGetDataSourceInTransaction() {
@@ -36,9 +36,9 @@ public final class
TransactionRandomReplicaLoadBalanceAlgorithmTest {
String readDataSourceName2 = "test_replica_ds_2";
List<String> readDataSourceNames = Arrays.asList(readDataSourceName1,
readDataSourceName2);
TransactionHolder.setInTransaction();
-
assertTrue(readDataSourceNames.contains(transactionRandomReplicaLoadBalanceAlgorithm.getDataSource("ds",
writeDataSourceName, readDataSourceNames)));
-
assertTrue(readDataSourceNames.contains(transactionRandomReplicaLoadBalanceAlgorithm.getDataSource("ds",
writeDataSourceName, readDataSourceNames)));
-
assertTrue(readDataSourceNames.contains(transactionRandomReplicaLoadBalanceAlgorithm.getDataSource("ds",
writeDataSourceName, readDataSourceNames)));
+
assertTrue(readDataSourceNames.contains(loadBalanceAlgorithm.getDataSource("ds",
writeDataSourceName, readDataSourceNames)));
+
assertTrue(readDataSourceNames.contains(loadBalanceAlgorithm.getDataSource("ds",
writeDataSourceName, readDataSourceNames)));
+
assertTrue(readDataSourceNames.contains(loadBalanceAlgorithm.getDataSource("ds",
writeDataSourceName, readDataSourceNames)));
TransactionHolder.clear();
}
}
diff --git
a/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/test/java/org/apache/shardingsphere/readwritesplitting/algorithm/loadbalance/TransactionRoundRobinReplicaLoadBalanceAlgorithmTest.java
b/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/test/java/org/apache/shardingsphere/readwritesplitting/algorithm/loadbalance/TransactionRoundRobinReadQueryLoadBalanceAlgorithmTest.java
similarity index 57%
rename from
shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/test/java/org/apache/shardingsphere/readwritesplitting/algorithm/loadbalance/TransactionRoundRobinReplicaLoadBalanceAlgorithmTest.java
rename to
shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/test/java/org/apache/shardingsphere/readwritesplitting/algorithm/loadbalance/TransactionRoundRobinReadQueryLoadBalanceAlgorithmTest.java
index 8f0ed0299b8..5c80607b301 100644
---
a/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/test/java/org/apache/shardingsphere/readwritesplitting/algorithm/loadbalance/TransactionRoundRobinReplicaLoadBalanceAlgorithmTest.java
+++
b/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/test/java/org/apache/shardingsphere/readwritesplitting/algorithm/loadbalance/TransactionRoundRobinReadQueryLoadBalanceAlgorithmTest.java
@@ -26,18 +26,18 @@ import java.util.List;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
-public final class TransactionRoundRobinReplicaLoadBalanceAlgorithmTest {
+public final class TransactionRoundRobinReadQueryLoadBalanceAlgorithmTest {
@Test
public void assertGetDataSource() {
String writeDataSourceName = "test_write_ds";
String readDataSourceName1 = "test_read_ds_1";
String readDataSourceName2 = "test_read_ds_2";
- TransactionRoundRobinReplicaLoadBalanceAlgorithm
transactionRoundRobinReplicaLoadBalanceAlgorithm = new
TransactionRoundRobinReplicaLoadBalanceAlgorithm();
+ TransactionRoundRobinReadQueryLoadBalanceAlgorithm
loadBalanceAlgorithm = new TransactionRoundRobinReadQueryLoadBalanceAlgorithm();
List<String> readDataSourceNames = Arrays.asList(readDataSourceName1,
readDataSourceName2);
-
assertThat(transactionRoundRobinReplicaLoadBalanceAlgorithm.getDataSource("ds",
writeDataSourceName, readDataSourceNames), is(readDataSourceName1));
-
assertThat(transactionRoundRobinReplicaLoadBalanceAlgorithm.getDataSource("ds",
writeDataSourceName, readDataSourceNames), is(readDataSourceName2));
-
assertThat(transactionRoundRobinReplicaLoadBalanceAlgorithm.getDataSource("ds",
writeDataSourceName, readDataSourceNames), is(readDataSourceName1));
+ assertThat(loadBalanceAlgorithm.getDataSource("ds",
writeDataSourceName, readDataSourceNames), is(readDataSourceName1));
+ assertThat(loadBalanceAlgorithm.getDataSource("ds",
writeDataSourceName, readDataSourceNames), is(readDataSourceName2));
+ assertThat(loadBalanceAlgorithm.getDataSource("ds",
writeDataSourceName, readDataSourceNames), is(readDataSourceName1));
}
@Test
@@ -45,12 +45,12 @@ public final class
TransactionRoundRobinReplicaLoadBalanceAlgorithmTest {
String writeDataSourceName = "test_write_ds";
String readDataSourceName1 = "test_read_ds_1";
String readDataSourceName2 = "test_read_ds_2";
- TransactionRoundRobinReplicaLoadBalanceAlgorithm
transactionRoundRobinReplicaLoadBalanceAlgorithm = new
TransactionRoundRobinReplicaLoadBalanceAlgorithm();
+ TransactionRoundRobinReadQueryLoadBalanceAlgorithm
loadBalanceAlgorithm = new TransactionRoundRobinReadQueryLoadBalanceAlgorithm();
List<String> readDataSourceNames = Arrays.asList(readDataSourceName1,
readDataSourceName2);
TransactionHolder.setInTransaction();
-
assertThat(transactionRoundRobinReplicaLoadBalanceAlgorithm.getDataSource("ds",
writeDataSourceName, readDataSourceNames), is(readDataSourceName1));
-
assertThat(transactionRoundRobinReplicaLoadBalanceAlgorithm.getDataSource("ds",
writeDataSourceName, readDataSourceNames), is(readDataSourceName2));
-
assertThat(transactionRoundRobinReplicaLoadBalanceAlgorithm.getDataSource("ds",
writeDataSourceName, readDataSourceNames), is(readDataSourceName1));
+ assertThat(loadBalanceAlgorithm.getDataSource("ds",
writeDataSourceName, readDataSourceNames), is(readDataSourceName1));
+ assertThat(loadBalanceAlgorithm.getDataSource("ds",
writeDataSourceName, readDataSourceNames), is(readDataSourceName2));
+ assertThat(loadBalanceAlgorithm.getDataSource("ds",
writeDataSourceName, readDataSourceNames), is(readDataSourceName1));
TransactionHolder.clear();
}
}
diff --git
a/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/test/java/org/apache/shardingsphere/readwritesplitting/algorithm/loadbalance/TransactionWeightReplicaLoadBalanceAlgorithmTest.java
b/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/test/java/org/apache/shardingsphere/readwritesplitting/algorithm/loadbalance/TransactionWeightReadQueryLoadBalanceAlgorithmTest.java
similarity index 59%
rename from
shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/test/java/org/apache/shardingsphere/readwritesplitting/algorithm/loadbalance/TransactionWeightReplicaLoadBalanceAlgorithmTest.java
rename to
shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/test/java/org/apache/shardingsphere/readwritesplitting/algorithm/loadbalance/TransactionWeightReadQueryLoadBalanceAlgorithmTest.java
index ddad750e81a..3efa253c1da 100644
---
a/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/test/java/org/apache/shardingsphere/readwritesplitting/algorithm/loadbalance/TransactionWeightReplicaLoadBalanceAlgorithmTest.java
+++
b/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/test/java/org/apache/shardingsphere/readwritesplitting/algorithm/loadbalance/TransactionWeightReadQueryLoadBalanceAlgorithmTest.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.readwritesplitting.algorithm.loadbalance;
import
org.apache.shardingsphere.infra.config.algorithm.ShardingSphereAlgorithmConfiguration;
-import
org.apache.shardingsphere.readwritesplitting.factory.ReplicaLoadBalanceAlgorithmFactory;
+import
org.apache.shardingsphere.readwritesplitting.factory.ReadQueryLoadBalanceAlgorithmFactory;
import org.apache.shardingsphere.transaction.TransactionHolder;
import org.junit.After;
import org.junit.Before;
@@ -36,22 +36,22 @@ import static org.hamcrest.CoreMatchers.notNullValue;
import static org.junit.Assert.assertThat;
import static org.junit.Assert.assertTrue;
-public final class TransactionWeightReplicaLoadBalanceAlgorithmTest {
+public final class TransactionWeightReadQueryLoadBalanceAlgorithmTest {
@SuppressWarnings("rawtypes")
@Before
@After
public void reset() throws NoSuchFieldException, IllegalAccessException {
- Field accuracyThresholdField =
TransactionWeightReplicaLoadBalanceAlgorithm.class.getDeclaredField("WEIGHT_MAP");
+ Field accuracyThresholdField =
TransactionWeightReadQueryLoadBalanceAlgorithm.class.getDeclaredField("WEIGHT_MAP");
accuracyThresholdField.setAccessible(true);
- ((Map)
accuracyThresholdField.get(TransactionWeightReplicaLoadBalanceAlgorithm.class)).clear();
+ ((Map)
accuracyThresholdField.get(TransactionWeightReadQueryLoadBalanceAlgorithm.class)).clear();
}
@Test
public void assertGetSingleReadDataSource() {
- TransactionWeightReplicaLoadBalanceAlgorithm
transactionWeightReplicaLoadBalanceAlgorithm =
createReplicaLoadBalanceAlgorithm(createSingleDataSourceProperties());
+ TransactionWeightReadQueryLoadBalanceAlgorithm loadBalanceAlgorithm =
createReadQueryLoadBalanceAlgorithm(createSingleDataSourceProperties());
TransactionHolder.setInTransaction();
-
assertThat(transactionWeightReplicaLoadBalanceAlgorithm.getDataSource("ds",
"test_write_ds", Collections.singletonList("test_read_ds_1")),
is("test_read_ds_1"));
+ assertThat(loadBalanceAlgorithm.getDataSource("ds", "test_write_ds",
Collections.singletonList("test_read_ds_1")), is("test_read_ds_1"));
TransactionHolder.clear();
}
@@ -63,16 +63,16 @@ public final class
TransactionWeightReplicaLoadBalanceAlgorithmTest {
@Test
public void assertGetMultipleReadDataSources() {
- TransactionWeightReplicaLoadBalanceAlgorithm
transactionWeightReplicaLoadBalanceAlgorithm =
createReplicaLoadBalanceAlgorithm(createMultipleDataSourcesProperties());
+ TransactionWeightReadQueryLoadBalanceAlgorithm loadBalanceAlgorithm =
createReadQueryLoadBalanceAlgorithm(createMultipleDataSourcesProperties());
String writeDataSourceName = "test_write_ds";
String readDataSourceName1 = "test_read_ds_1";
String readDataSourceName2 = "test_read_ds_2";
List<String> readDataSourceNames = Arrays.asList(readDataSourceName1,
readDataSourceName2);
TransactionHolder.setInTransaction();
-
assertTrue(readDataSourceNames.contains(transactionWeightReplicaLoadBalanceAlgorithm.getDataSource("ds",
writeDataSourceName, readDataSourceNames)));
-
assertThat(transactionWeightReplicaLoadBalanceAlgorithm.getDataSource("ds",
writeDataSourceName, readDataSourceNames), notNullValue());
-
assertThat(transactionWeightReplicaLoadBalanceAlgorithm.getDataSource("ds",
writeDataSourceName, readDataSourceNames), notNullValue());
-
assertThat(transactionWeightReplicaLoadBalanceAlgorithm.getDataSource("ds",
writeDataSourceName, readDataSourceNames), notNullValue());
+
assertTrue(readDataSourceNames.contains(loadBalanceAlgorithm.getDataSource("ds",
writeDataSourceName, readDataSourceNames)));
+ assertThat(loadBalanceAlgorithm.getDataSource("ds",
writeDataSourceName, readDataSourceNames), notNullValue());
+ assertThat(loadBalanceAlgorithm.getDataSource("ds",
writeDataSourceName, readDataSourceNames), notNullValue());
+ assertThat(loadBalanceAlgorithm.getDataSource("ds",
writeDataSourceName, readDataSourceNames), notNullValue());
TransactionHolder.clear();
}
@@ -83,7 +83,7 @@ public final class
TransactionWeightReplicaLoadBalanceAlgorithmTest {
return result;
}
- private TransactionWeightReplicaLoadBalanceAlgorithm
createReplicaLoadBalanceAlgorithm(final Properties props) {
- return (TransactionWeightReplicaLoadBalanceAlgorithm)
ReplicaLoadBalanceAlgorithmFactory.newInstance(new
ShardingSphereAlgorithmConfiguration("TRANSACTION_WEIGHT", props));
+ private TransactionWeightReadQueryLoadBalanceAlgorithm
createReadQueryLoadBalanceAlgorithm(final Properties props) {
+ return (TransactionWeightReadQueryLoadBalanceAlgorithm)
ReadQueryLoadBalanceAlgorithmFactory.newInstance(new
ShardingSphereAlgorithmConfiguration("TRANSACTION_WEIGHT", props));
}
}
diff --git
a/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/test/java/org/apache/shardingsphere/readwritesplitting/algorithm/loadbalance/WeightReplicaLoadBalanceAlgorithmTest.java
b/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/test/java/org/apache/shardingsphere/readwritesplitting/algorithm/loadbalance/WeightReadQueryLoadBalanceAlgorithmTest.java
similarity index 62%
rename from
shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/test/java/org/apache/shardingsphere/readwritesplitting/algorithm/loadbalance/WeightReplicaLoadBalanceAlgorithmTest.java
rename to
shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/test/java/org/apache/shardingsphere/readwritesplitting/algorithm/loadbalance/WeightReadQueryLoadBalanceAlgorithmTest.java
index 43511e098b0..5cc4252d074 100644
---
a/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/test/java/org/apache/shardingsphere/readwritesplitting/algorithm/loadbalance/WeightReplicaLoadBalanceAlgorithmTest.java
+++
b/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/test/java/org/apache/shardingsphere/readwritesplitting/algorithm/loadbalance/WeightReadQueryLoadBalanceAlgorithmTest.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.readwritesplitting.algorithm.loadbalance;
import
org.apache.shardingsphere.infra.config.algorithm.ShardingSphereAlgorithmConfiguration;
-import
org.apache.shardingsphere.readwritesplitting.factory.ReplicaLoadBalanceAlgorithmFactory;
+import
org.apache.shardingsphere.readwritesplitting.factory.ReadQueryLoadBalanceAlgorithmFactory;
import org.apache.shardingsphere.transaction.TransactionHolder;
import org.junit.Test;
@@ -31,12 +31,12 @@ import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.notNullValue;
import static org.junit.Assert.assertThat;
-public final class WeightReplicaLoadBalanceAlgorithmTest {
+public final class WeightReadQueryLoadBalanceAlgorithmTest {
@Test
public void assertGetSingleReadDataSource() {
- WeightReplicaLoadBalanceAlgorithm weightReplicaLoadBalanceAlgorithm =
createReplicaLoadBalanceAlgorithm(createSingleDataSourceProperties());
- assertThat(weightReplicaLoadBalanceAlgorithm.getDataSource("ds",
"test_write_ds", Collections.singletonList("test_read_ds_1")),
is("test_read_ds_1"));
+ WeightReadQueryLoadBalanceAlgorithm loadBalanceAlgorithm =
createReadQueryLoadBalanceAlgorithm(createSingleDataSourceProperties());
+ assertThat(loadBalanceAlgorithm.getDataSource("ds", "test_write_ds",
Collections.singletonList("test_read_ds_1")), is("test_read_ds_1"));
}
private Properties createSingleDataSourceProperties() {
@@ -47,14 +47,14 @@ public final class WeightReplicaLoadBalanceAlgorithmTest {
@Test
public void assertGetMultipleReadDataSources() {
- WeightReplicaLoadBalanceAlgorithm weightReplicaLoadBalanceAlgorithm =
createReplicaLoadBalanceAlgorithm(createMultipleDataSourcesProperties());
+ WeightReadQueryLoadBalanceAlgorithm loadBalanceAlgorithm =
createReadQueryLoadBalanceAlgorithm(createMultipleDataSourcesProperties());
String writeDataSourceName = "test_write_ds";
String readDataSourceName1 = "test_read_ds_1";
String readDataSourceName2 = "test_read_ds_2";
List<String> readDataSourceNames = Arrays.asList(readDataSourceName1,
readDataSourceName2);
- assertThat(weightReplicaLoadBalanceAlgorithm.getDataSource("ds",
writeDataSourceName, readDataSourceNames), notNullValue());
- assertThat(weightReplicaLoadBalanceAlgorithm.getDataSource("ds",
writeDataSourceName, readDataSourceNames), notNullValue());
- assertThat(weightReplicaLoadBalanceAlgorithm.getDataSource("ds",
writeDataSourceName, readDataSourceNames), notNullValue());
+ assertThat(loadBalanceAlgorithm.getDataSource("ds",
writeDataSourceName, readDataSourceNames), notNullValue());
+ assertThat(loadBalanceAlgorithm.getDataSource("ds",
writeDataSourceName, readDataSourceNames), notNullValue());
+ assertThat(loadBalanceAlgorithm.getDataSource("ds",
writeDataSourceName, readDataSourceNames), notNullValue());
}
private Properties createMultipleDataSourcesProperties() {
@@ -64,19 +64,19 @@ public final class WeightReplicaLoadBalanceAlgorithmTest {
return result;
}
- private WeightReplicaLoadBalanceAlgorithm
createReplicaLoadBalanceAlgorithm(final Properties props) {
- return (WeightReplicaLoadBalanceAlgorithm)
ReplicaLoadBalanceAlgorithmFactory.newInstance(new
ShardingSphereAlgorithmConfiguration("WEIGHT", props));
+ private WeightReadQueryLoadBalanceAlgorithm
createReadQueryLoadBalanceAlgorithm(final Properties props) {
+ return (WeightReadQueryLoadBalanceAlgorithm)
ReadQueryLoadBalanceAlgorithmFactory.newInstance(new
ShardingSphereAlgorithmConfiguration("WEIGHT", props));
}
@Test
public void assertGetReadDataSourceInTransaction() {
- WeightReplicaLoadBalanceAlgorithm weightReplicaLoadBalanceAlgorithm =
createReplicaLoadBalanceAlgorithm(createMultipleDataSourcesProperties());
+ WeightReadQueryLoadBalanceAlgorithm loadBalanceAlgorithm =
createReadQueryLoadBalanceAlgorithm(createMultipleDataSourcesProperties());
String writeDataSourceName = "test_write_ds";
String readDataSourceName1 = "test_read_ds_1";
String readDataSourceName2 = "test_read_ds_2";
List<String> readDataSourceNames = Arrays.asList(readDataSourceName1,
readDataSourceName2);
TransactionHolder.setInTransaction();
- assertThat(weightReplicaLoadBalanceAlgorithm.getDataSource("ds",
writeDataSourceName, readDataSourceNames), is(writeDataSourceName));
+ assertThat(loadBalanceAlgorithm.getDataSource("ds",
writeDataSourceName, readDataSourceNames), is(writeDataSourceName));
TransactionHolder.clear();
}
}
diff --git
a/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/test/java/org/apache/shardingsphere/readwritesplitting/rule/ReadwriteSplittingDataSourceRuleTest.java
b/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/test/java/org/apache/shardingsphere/readwritesplitting/rule/ReadwriteSplittingDataSourceRuleTest.java
index dcb731144f6..4e516c28ca1 100644
---
a/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/test/java/org/apache/shardingsphere/readwritesplitting/rule/ReadwriteSplittingDataSourceRuleTest.java
+++
b/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/test/java/org/apache/shardingsphere/readwritesplitting/rule/ReadwriteSplittingDataSourceRuleTest.java
@@ -17,8 +17,8 @@
package org.apache.shardingsphere.readwritesplitting.rule;
-import
org.apache.shardingsphere.readwritesplitting.algorithm.loadbalance.RandomReplicaLoadBalanceAlgorithm;
-import
org.apache.shardingsphere.readwritesplitting.algorithm.loadbalance.RoundRobinReplicaLoadBalanceAlgorithm;
+import
org.apache.shardingsphere.readwritesplitting.algorithm.loadbalance.RandomReadQueryLoadBalanceAlgorithm;
+import
org.apache.shardingsphere.readwritesplitting.algorithm.loadbalance.RoundRobinReadQueryLoadBalanceAlgorithm;
import
org.apache.shardingsphere.readwritesplitting.api.rule.ReadwriteSplittingDataSourceRuleConfiguration;
import
org.apache.shardingsphere.readwritesplitting.api.strategy.StaticReadwriteSplittingStrategyConfiguration;
import org.junit.Before;
@@ -39,28 +39,28 @@ 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),
- new RandomReplicaLoadBalanceAlgorithm(),
Collections.emptyList());
+ new RandomReadQueryLoadBalanceAlgorithm(),
Collections.emptyList());
}
@Test(expected = IllegalArgumentException.class)
public void assertNewReadwriteSplittingDataSourceRuleWithoutName() {
new ReadwriteSplittingDataSourceRule(new
ReadwriteSplittingDataSourceRuleConfiguration("",
new StaticReadwriteSplittingStrategyConfiguration("write_ds",
Arrays.asList("read_ds")),
- null, null), new RoundRobinReplicaLoadBalanceAlgorithm(),
Collections.emptyList());
+ null, null), new RoundRobinReadQueryLoadBalanceAlgorithm(),
Collections.emptyList());
}
@Test(expected = IllegalArgumentException.class)
public void
assertNewReadwriteSplittingDataSourceRuleWithoutWriteDataSourceName() {
new ReadwriteSplittingDataSourceRule(new
ReadwriteSplittingDataSourceRuleConfiguration("ds",
new StaticReadwriteSplittingStrategyConfiguration("",
Arrays.asList("read_ds")),
- null, null), new RoundRobinReplicaLoadBalanceAlgorithm(),
Collections.emptyList());
+ null, null), new RoundRobinReadQueryLoadBalanceAlgorithm(),
Collections.emptyList());
}
@Test(expected = IllegalArgumentException.class)
public void
assertNewReadwriteSplittingDataSourceRuleWithEmptyReadDataSourceName() {
new ReadwriteSplittingDataSourceRule(new
ReadwriteSplittingDataSourceRuleConfiguration("ds",
new StaticReadwriteSplittingStrategyConfiguration("write_ds",
Collections.emptyList()),
- null, null), new RoundRobinReplicaLoadBalanceAlgorithm(),
Collections.emptyList());
+ null, null), new RoundRobinReadQueryLoadBalanceAlgorithm(),
Collections.emptyList());
}
@Test
diff --git
a/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/test/java/org/apache/shardingsphere/readwritesplitting/swapper/ReadwriteSplittingRuleAlgorithmProviderConfigurationYamlSwapperTest.java
b/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/test/java/org/apache/shardingsphere/readwritesplitting/swapper/ReadwriteSplittingRuleAlgorithmProviderConfigurationYamlSwapperTest.java
index bc12db9260d..aa2e424b2cc 100644
---
a/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/test/java/org/apache/shardingsphere/readwritesplitting/swapper/ReadwriteSplittingRuleAlgorithmProviderConfigurationYamlSwapperTest.java
+++
b/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-core/src/test/java/org/apache/shardingsphere/readwritesplitting/swapper/ReadwriteSplittingRuleAlgorithmProviderConfigurationYamlSwapperTest.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.readwritesplitting.swapper;
import
org.apache.shardingsphere.readwritesplitting.algorithm.config.AlgorithmProvidedReadwriteSplittingRuleConfiguration;
-import
org.apache.shardingsphere.readwritesplitting.algorithm.loadbalance.RandomReplicaLoadBalanceAlgorithm;
+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.yaml.config.YamlReadwriteSplittingRuleConfiguration;
@@ -66,6 +66,6 @@ public final class
ReadwriteSplittingRuleAlgorithmProviderConfigurationYamlSwapp
ReadwriteSplittingDataSourceRuleConfiguration ruleConfig = new
ReadwriteSplittingDataSourceRuleConfiguration("name",
new
StaticReadwriteSplittingStrategyConfiguration("writeDataSourceName",
Arrays.asList("readDataSourceName")), null, "loadBalancerName");
return swapper.swapToYamlConfiguration(
- new
AlgorithmProvidedReadwriteSplittingRuleConfiguration(Collections.singletonList(ruleConfig),
Collections.singletonMap("name", new RandomReplicaLoadBalanceAlgorithm())));
+ new
AlgorithmProvidedReadwriteSplittingRuleConfiguration(Collections.singletonList(ruleConfig),
Collections.singletonMap("name", new RandomReadQueryLoadBalanceAlgorithm())));
}
}
diff --git
a/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-distsql/shardingsphere-readwrite-splitting-distsql-handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/update/AlterReadwriteSplittingRuleStatementUpdater.java
b/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-distsql/shardingsphere-readwrite-splitting-distsql-handler/src/main/java/org/apache/shardingsphere/r
[...]
index b9f3276eb63..cc16761fb0d 100644
---
a/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-distsql/shardingsphere-readwrite-splitting-distsql-handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/update/AlterReadwriteSplittingRuleStatementUpdater.java
+++
b/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-distsql/shardingsphere-readwrite-splitting-distsql-handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/update/AlterReadwriteSplittingRuleStatementUpdater.java
@@ -34,7 +34,7 @@ import
org.apache.shardingsphere.readwritesplitting.api.rule.ReadwriteSplittingD
import
org.apache.shardingsphere.readwritesplitting.distsql.handler.converter.ReadwriteSplittingRuleStatementConverter;
import
org.apache.shardingsphere.readwritesplitting.distsql.parser.segment.ReadwriteSplittingRuleSegment;
import
org.apache.shardingsphere.readwritesplitting.distsql.parser.statement.AlterReadwriteSplittingRuleStatement;
-import
org.apache.shardingsphere.readwritesplitting.factory.ReplicaLoadBalanceAlgorithmFactory;
+import
org.apache.shardingsphere.readwritesplitting.factory.ReadQueryLoadBalanceAlgorithmFactory;
import java.util.Collection;
import java.util.Collections;
@@ -81,7 +81,7 @@ public final class
AlterReadwriteSplittingRuleStatementUpdater implements RuleDe
private void checkToBeAlteredLoadBalancer(final
AlterReadwriteSplittingRuleStatement sqlStatement) throws
InvalidAlgorithmConfigurationException {
Collection<String> invalidLoadBalancers =
sqlStatement.getRules().stream().map(ReadwriteSplittingRuleSegment::getLoadBalancer).filter(Objects::nonNull).distinct()
- .filter(each ->
!ReplicaLoadBalanceAlgorithmFactory.contains(each)).collect(Collectors.toList());
+ .filter(each ->
!ReadQueryLoadBalanceAlgorithmFactory.contains(each)).collect(Collectors.toList());
if (!invalidLoadBalancers.isEmpty()) {
throw new InvalidAlgorithmConfigurationException("Load balancers",
invalidLoadBalancers);
}
diff --git
a/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-distsql/shardingsphere-readwrite-splitting-distsql-handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/update/CreateReadwriteSplittingRuleStatementUpdater.java
b/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-distsql/shardingsphere-readwrite-splitting-distsql-handler/src/main/java/org/apache/shardingsphere/
[...]
index c086654576b..85fde6d9292 100644
---
a/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-distsql/shardingsphere-readwrite-splitting-distsql-handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/update/CreateReadwriteSplittingRuleStatementUpdater.java
+++
b/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-distsql/shardingsphere-readwrite-splitting-distsql-handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/update/CreateReadwriteSplittingRuleStatementUpdater.java
@@ -34,7 +34,7 @@ import
org.apache.shardingsphere.readwritesplitting.api.rule.ReadwriteSplittingD
import
org.apache.shardingsphere.readwritesplitting.distsql.handler.converter.ReadwriteSplittingRuleStatementConverter;
import
org.apache.shardingsphere.readwritesplitting.distsql.parser.segment.ReadwriteSplittingRuleSegment;
import
org.apache.shardingsphere.readwritesplitting.distsql.parser.statement.CreateReadwriteSplittingRuleStatement;
-import
org.apache.shardingsphere.readwritesplitting.factory.ReplicaLoadBalanceAlgorithmFactory;
+import
org.apache.shardingsphere.readwritesplitting.factory.ReadQueryLoadBalanceAlgorithmFactory;
import java.util.Collection;
import java.util.Collections;
@@ -111,7 +111,7 @@ public final class
CreateReadwriteSplittingRuleStatementUpdater implements RuleD
private void checkToBeCreatedLoadBalancers(final
CreateReadwriteSplittingRuleStatement sqlStatement) throws
InvalidAlgorithmConfigurationException {
Collection<String> notExistedLoadBalancers =
sqlStatement.getRules().stream().map(ReadwriteSplittingRuleSegment::getLoadBalancer).filter(Objects::nonNull).distinct()
- .filter(each ->
!ReplicaLoadBalanceAlgorithmFactory.contains(each)).collect(Collectors.toList());
+ .filter(each ->
!ReadQueryLoadBalanceAlgorithmFactory.contains(each)).collect(Collectors.toList());
if (!notExistedLoadBalancers.isEmpty()) {
throw new InvalidAlgorithmConfigurationException("Load balancers",
notExistedLoadBalancers);
}
diff --git
a/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-distsql/shardingsphere-readwrite-splitting-distsql-handler/src/test/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/update/CreateReadwriteSplittingRuleStatementUpdaterTest.java
b/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-distsql/shardingsphere-readwrite-splitting-distsql-handler/src/test/java/org/apache/shardingsph
[...]
index 9810c698914..8397041a86c 100644
---
a/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-distsql/shardingsphere-readwrite-splitting-distsql-handler/src/test/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/update/CreateReadwriteSplittingRuleStatementUpdaterTest.java
+++
b/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-distsql/shardingsphere-readwrite-splitting-distsql-handler/src/test/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/update/CreateReadwriteSplittingRuleStatementUpdaterTest.java
@@ -31,7 +31,7 @@ import
org.apache.shardingsphere.readwritesplitting.api.rule.ReadwriteSplittingD
import
org.apache.shardingsphere.readwritesplitting.api.strategy.StaticReadwriteSplittingStrategyConfiguration;
import
org.apache.shardingsphere.readwritesplitting.distsql.parser.segment.ReadwriteSplittingRuleSegment;
import
org.apache.shardingsphere.readwritesplitting.distsql.parser.statement.CreateReadwriteSplittingRuleStatement;
-import
org.apache.shardingsphere.readwritesplitting.factory.ReplicaLoadBalanceAlgorithmFactory;
+import
org.apache.shardingsphere.readwritesplitting.factory.ReadQueryLoadBalanceAlgorithmFactory;
import
org.apache.shardingsphere.readwritesplitting.spi.ReadQueryLoadBalanceAlgorithm;
import org.apache.shardingsphere.spi.ShardingSphereServiceLoader;
import org.junit.Before;
@@ -114,8 +114,8 @@ public final class
CreateReadwriteSplittingRuleStatementUpdaterTest {
ExportableRule exportableRule = mock(ExportableRule.class);
when(exportableRule.getExportData()).thenReturn(Collections.singletonMap(ExportableConstants.EXPORT_DB_DISCOVERY_PRIMARY_DATA_SOURCES,
Collections.singletonMap("ms_group", "ds_0")));
when(database.getRuleMetaData().findRules(ExportableRule.class)).thenReturn(Collections.singleton(exportableRule));
- try (MockedStatic<ReplicaLoadBalanceAlgorithmFactory> mockedFactory =
mockStatic(ReplicaLoadBalanceAlgorithmFactory.class)) {
- mockedFactory.when(() ->
ReplicaLoadBalanceAlgorithmFactory.contains("TEST")).thenReturn(true);
+ try (MockedStatic<ReadQueryLoadBalanceAlgorithmFactory> mockedFactory
= mockStatic(ReadQueryLoadBalanceAlgorithmFactory.class)) {
+ mockedFactory.when(() ->
ReadQueryLoadBalanceAlgorithmFactory.contains("TEST")).thenReturn(true);
ReadwriteSplittingRuleSegment dynamicSegment = new
ReadwriteSplittingRuleSegment("dynamic_rule", "ms_group", "false", "TEST", new
Properties());
ReadwriteSplittingRuleSegment staticSegment = new
ReadwriteSplittingRuleSegment("static_rule", "write_ds_0",
Arrays.asList("read_ds_0", "read_ds_1"), "TEST", new Properties());
ShardingSphereServiceLoader.register(ReadQueryLoadBalanceAlgorithm.class);
diff --git
a/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-spring/shardingsphere-readwrite-splitting-spring-boot-starter/src/test/java/org/apache/shardingsphere/readwritesplitting/spring/boot/ReadwriteSplittingSpringBootStarterTest.java
b/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-spring/shardingsphere-readwrite-splitting-spring-boot-starter/src/test/java/org/apache/shardingsphere/readwrites
[...]
index 937865cc6d4..966a25c7307 100644
---
a/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-spring/shardingsphere-readwrite-splitting-spring-boot-starter/src/test/java/org/apache/shardingsphere/readwritesplitting/spring/boot/ReadwriteSplittingSpringBootStarterTest.java
+++
b/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-spring/shardingsphere-readwrite-splitting-spring-boot-starter/src/test/java/org/apache/shardingsphere/readwritesplitting/spring/boot/ReadwriteSplittingSpringBootStarterTest.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.readwritesplitting.spring.boot;
import
org.apache.shardingsphere.readwritesplitting.algorithm.config.AlgorithmProvidedReadwriteSplittingRuleConfiguration;
-import
org.apache.shardingsphere.readwritesplitting.algorithm.loadbalance.RandomReplicaLoadBalanceAlgorithm;
+import
org.apache.shardingsphere.readwritesplitting.algorithm.loadbalance.RandomReadQueryLoadBalanceAlgorithm;
import
org.apache.shardingsphere.readwritesplitting.api.rule.ReadwriteSplittingDataSourceRuleConfiguration;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -43,7 +43,7 @@ import static org.junit.Assert.assertNotNull;
public class ReadwriteSplittingSpringBootStarterTest {
@Resource
- private RandomReplicaLoadBalanceAlgorithm random;
+ private RandomReadQueryLoadBalanceAlgorithm random;
@Resource
private AlgorithmProvidedReadwriteSplittingRuleConfiguration config;
diff --git
a/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-spring/shardingsphere-readwrite-splitting-spring-namespace/src/main/java/org/apache/shardingsphere/readwritesplitting/spring/namespace/factorybean/ReplicaLoadBalanceAlgorithmFactoryBean.java
b/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-spring/shardingsphere-readwrite-splitting-spring-namespace/src/main/java/org/apache/shardingsphere/
[...]
index 9578570c158..c789fcade81 100644
---
a/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-spring/shardingsphere-readwrite-splitting-spring-namespace/src/main/java/org/apache/shardingsphere/readwritesplitting/spring/namespace/factorybean/ReplicaLoadBalanceAlgorithmFactoryBean.java
+++
b/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-spring/shardingsphere-readwrite-splitting-spring-namespace/src/main/java/org/apache/shardingsphere/readwritesplitting/spring/namespace/factorybean/ReplicaLoadBalanceAlgorithmFactoryBean.java
@@ -18,7 +18,7 @@
package
org.apache.shardingsphere.readwritesplitting.spring.namespace.factorybean;
import
org.apache.shardingsphere.infra.config.algorithm.ShardingSphereAlgorithmConfiguration;
-import
org.apache.shardingsphere.readwritesplitting.factory.ReplicaLoadBalanceAlgorithmFactory;
+import
org.apache.shardingsphere.readwritesplitting.factory.ReadQueryLoadBalanceAlgorithmFactory;
import
org.apache.shardingsphere.readwritesplitting.spi.ReadQueryLoadBalanceAlgorithm;
import
org.apache.shardingsphere.spring.namespace.factorybean.ShardingSphereAlgorithmFactoryBean;
@@ -35,6 +35,6 @@ public final class ReplicaLoadBalanceAlgorithmFactoryBean
extends ShardingSphere
@Override
public ReadQueryLoadBalanceAlgorithm getObject() {
- return ReplicaLoadBalanceAlgorithmFactory.newInstance(new
ShardingSphereAlgorithmConfiguration(getType(), getProps()));
+ return ReadQueryLoadBalanceAlgorithmFactory.newInstance(new
ShardingSphereAlgorithmConfiguration(getType(), getProps()));
}
}
diff --git
a/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-spring/shardingsphere-readwrite-splitting-spring-namespace/src/test/java/org/apache/shardingsphere/readwritesplitting/spring/namespace/ReadwriteSplittingSpringNamespaceTest.java
b/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-spring/shardingsphere-readwrite-splitting-spring-namespace/src/test/java/org/apache/shardingsphere/readwritespli
[...]
index 10c6275ae64..625be70384e 100644
---
a/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-spring/shardingsphere-readwrite-splitting-spring-namespace/src/test/java/org/apache/shardingsphere/readwritesplitting/spring/namespace/ReadwriteSplittingSpringNamespaceTest.java
+++
b/shardingsphere-features/shardingsphere-readwrite-splitting/shardingsphere-readwrite-splitting-spring/shardingsphere-readwrite-splitting-spring-namespace/src/test/java/org/apache/shardingsphere/readwritesplitting/spring/namespace/ReadwriteSplittingSpringNamespaceTest.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.readwritesplitting.spring.namespace;
import
org.apache.shardingsphere.readwritesplitting.algorithm.config.AlgorithmProvidedReadwriteSplittingRuleConfiguration;
-import
org.apache.shardingsphere.readwritesplitting.algorithm.loadbalance.RandomReplicaLoadBalanceAlgorithm;
+import
org.apache.shardingsphere.readwritesplitting.algorithm.loadbalance.RandomReadQueryLoadBalanceAlgorithm;
import
org.apache.shardingsphere.readwritesplitting.api.rule.ReadwriteSplittingDataSourceRuleConfiguration;
import
org.apache.shardingsphere.readwritesplitting.spi.ReadQueryLoadBalanceAlgorithm;
import org.junit.Test;
@@ -60,7 +60,7 @@ public final class ReadwriteSplittingSpringNamespaceTest
extends AbstractJUnit4S
private void assertLoadBalancers(final Map<String,
ReadQueryLoadBalanceAlgorithm> loadBalances) {
assertThat(loadBalances.size(), is(1));
- assertThat(loadBalances.get("randomLoadbalancer"),
instanceOf(RandomReplicaLoadBalanceAlgorithm.class));
+ assertThat(loadBalances.get("randomLoadbalancer"),
instanceOf(RandomReadQueryLoadBalanceAlgorithm.class));
}
private void assertDefaultDataSourceRule(final
ReadwriteSplittingDataSourceRuleConfiguration dataSourceRuleConfig) {
diff --git
a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-boot-starter/src/test/java/org/apache/shardingsphere/spring/boot/SpringBootStarterTest.java
b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-boot-starter/src/test/java/org/apache/shardingsphere/spring/boot/SpringBootStarterTest.java
index baab6dfe48a..d2d49be6d5c 100644
---
a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-boot-starter/src/test/java/org/apache/shardingsphere/spring/boot/SpringBootStarterTest.java
+++
b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-boot-starter/src/test/java/org/apache/shardingsphere/spring/boot/SpringBootStarterTest.java
@@ -27,7 +27,7 @@ import org.apache.shardingsphere.infra.datanode.DataNodeUtil;
import org.apache.shardingsphere.infra.rule.ShardingSphereRule;
import org.apache.shardingsphere.mode.manager.ContextManager;
import org.apache.shardingsphere.parser.rule.SQLParserRule;
-import
org.apache.shardingsphere.readwritesplitting.algorithm.loadbalance.RandomReplicaLoadBalanceAlgorithm;
+import
org.apache.shardingsphere.readwritesplitting.algorithm.loadbalance.RandomReadQueryLoadBalanceAlgorithm;
import
org.apache.shardingsphere.readwritesplitting.rule.ReadwriteSplittingDataSourceRule;
import
org.apache.shardingsphere.readwritesplitting.rule.ReadwriteSplittingRule;
import
org.apache.shardingsphere.readwritesplitting.strategy.type.StaticReadwriteSplittingStrategy;
@@ -144,7 +144,7 @@ public class SpringBootStarterTest {
StaticReadwriteSplittingStrategy staticReadwriteSplittingType =
(StaticReadwriteSplittingStrategy)
dataSourceRule.getReadwriteSplittingStrategy();
assertThat(staticReadwriteSplittingType.getWriteDataSource(),
is("write_ds"));
assertThat(staticReadwriteSplittingType.getReadDataSources(),
is(Arrays.asList("read_ds_0", "read_ds_1")));
- assertThat(dataSourceRule.getLoadBalancer(),
instanceOf(RandomReplicaLoadBalanceAlgorithm.class));
+ assertThat(dataSourceRule.getLoadBalancer(),
instanceOf(RandomReadQueryLoadBalanceAlgorithm.class));
}
private void assertEncryptRule(final EncryptRule actual) {
diff --git
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/common/checker/ReadwriteSplittingRuleConfigurationImportChecker.java
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/common/checker/ReadwriteSplittingRuleConfigurationImportChecker.java
index dffc8bc2036..0496e6ef761 100644
---
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/common/checker/ReadwriteSplittingRuleConfigurationImportChecker.java
+++
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/common/checker/ReadwriteSplittingRuleConfigurationImportChecker.java
@@ -24,7 +24,7 @@ import
org.apache.shardingsphere.infra.distsql.exception.rule.InvalidAlgorithmCo
import
org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
import
org.apache.shardingsphere.infra.rule.identifier.type.DataSourceContainedRule;
import
org.apache.shardingsphere.readwritesplitting.api.ReadwriteSplittingRuleConfiguration;
-import
org.apache.shardingsphere.readwritesplitting.factory.ReplicaLoadBalanceAlgorithmFactory;
+import
org.apache.shardingsphere.readwritesplitting.factory.ReadQueryLoadBalanceAlgorithmFactory;
import java.util.Collection;
import java.util.LinkedHashSet;
@@ -81,7 +81,7 @@ public final class
ReadwriteSplittingRuleConfigurationImportChecker {
private void checkLoadBalancers(final ReadwriteSplittingRuleConfiguration
currentRuleConfig) throws DistSQLException {
Collection<String> notExistedLoadBalancers =
currentRuleConfig.getLoadBalancers().values().stream().map(ShardingSphereAlgorithmConfiguration::getType)
- .filter(each ->
!ReplicaLoadBalanceAlgorithmFactory.contains(each)).collect(Collectors.toList());
+ .filter(each ->
!ReadQueryLoadBalanceAlgorithmFactory.contains(each)).collect(Collectors.toList());
DistSQLException.predictionThrow(notExistedLoadBalancers.isEmpty(), ()
-> new InvalidAlgorithmConfigurationException("Load balancers",
notExistedLoadBalancers));
}
}
