This is an automated email from the ASF dual-hosted git repository.
sunnianjun 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 d4956b33ae7 Refactor TrafficLoadBalanceAlgorithm (#28101)
d4956b33ae7 is described below
commit d4956b33ae7d4776c56edb5b32820f50afd6289c
Author: Liang Zhang <[email protected]>
AuthorDate: Tue Aug 15 21:29:02 2023 +0800
Refactor TrafficLoadBalanceAlgorithm (#28101)
---
.../shardingsphere/traffic/spi/TrafficLoadBalanceAlgorithm.java | 8 ++++----
.../algorithm/loadbalance/RandomTrafficLoadBalanceAlgorithm.java | 2 +-
.../loadbalance/RoundRobinTrafficLoadBalanceAlgorithm.java | 2 +-
.../org/apache/shardingsphere/traffic/engine/TrafficEngine.java | 2 +-
.../traffic/algorithm/engine/TrafficEngineTest.java | 2 +-
.../loadbalance/RandomTrafficLoadBalanceAlgorithmTest.java | 6 +++---
.../loadbalance/RoundRobinTrafficLoadBalanceAlgorithmTest.java | 6 +++---
.../fixture/DistSQLTrafficLoadBalanceAlgorithmFixture.java | 2 +-
8 files changed, 15 insertions(+), 15 deletions(-)
diff --git
a/kernel/traffic/api/src/main/java/org/apache/shardingsphere/traffic/spi/TrafficLoadBalanceAlgorithm.java
b/kernel/traffic/api/src/main/java/org/apache/shardingsphere/traffic/spi/TrafficLoadBalanceAlgorithm.java
index 824a8a66ac8..c84bf2c6b06 100644
---
a/kernel/traffic/api/src/main/java/org/apache/shardingsphere/traffic/spi/TrafficLoadBalanceAlgorithm.java
+++
b/kernel/traffic/api/src/main/java/org/apache/shardingsphere/traffic/spi/TrafficLoadBalanceAlgorithm.java
@@ -28,11 +28,11 @@ import java.util.List;
public interface TrafficLoadBalanceAlgorithm extends ShardingSphereAlgorithm {
/**
- * Get instance definition.
+ * Get instance meta data.
*
* @param name traffic strategy name
- * @param instances instance collection
- * @return instance definition
+ * @param instances instances
+ * @return got meta data
*/
- InstanceMetaData getInstanceId(String name, List<InstanceMetaData>
instances);
+ InstanceMetaData getInstanceMetaData(String name, List<InstanceMetaData>
instances);
}
diff --git
a/kernel/traffic/core/src/main/java/org/apache/shardingsphere/traffic/algorithm/loadbalance/RandomTrafficLoadBalanceAlgorithm.java
b/kernel/traffic/core/src/main/java/org/apache/shardingsphere/traffic/algorithm/loadbalance/RandomTrafficLoadBalanceAlgorithm.java
index 2e9b2d1e7e8..5918ec50bac 100644
---
a/kernel/traffic/core/src/main/java/org/apache/shardingsphere/traffic/algorithm/loadbalance/RandomTrafficLoadBalanceAlgorithm.java
+++
b/kernel/traffic/core/src/main/java/org/apache/shardingsphere/traffic/algorithm/loadbalance/RandomTrafficLoadBalanceAlgorithm.java
@@ -29,7 +29,7 @@ import java.util.concurrent.ThreadLocalRandom;
public final class RandomTrafficLoadBalanceAlgorithm implements
TrafficLoadBalanceAlgorithm {
@Override
- public InstanceMetaData getInstanceId(final String name, final
List<InstanceMetaData> instances) {
+ public InstanceMetaData getInstanceMetaData(final String name, final
List<InstanceMetaData> instances) {
return
instances.get(ThreadLocalRandom.current().nextInt(instances.size()));
}
diff --git
a/kernel/traffic/core/src/main/java/org/apache/shardingsphere/traffic/algorithm/loadbalance/RoundRobinTrafficLoadBalanceAlgorithm.java
b/kernel/traffic/core/src/main/java/org/apache/shardingsphere/traffic/algorithm/loadbalance/RoundRobinTrafficLoadBalanceAlgorithm.java
index f216aad5857..6ecb74cc274 100644
---
a/kernel/traffic/core/src/main/java/org/apache/shardingsphere/traffic/algorithm/loadbalance/RoundRobinTrafficLoadBalanceAlgorithm.java
+++
b/kernel/traffic/core/src/main/java/org/apache/shardingsphere/traffic/algorithm/loadbalance/RoundRobinTrafficLoadBalanceAlgorithm.java
@@ -31,7 +31,7 @@ public final class RoundRobinTrafficLoadBalanceAlgorithm
implements TrafficLoadB
private final AtomicInteger count = new AtomicInteger(0);
@Override
- public InstanceMetaData getInstanceId(final String name, final
List<InstanceMetaData> instances) {
+ public InstanceMetaData getInstanceMetaData(final String name, final
List<InstanceMetaData> instances) {
return instances.get(Math.abs(count.getAndIncrement()) %
instances.size());
}
diff --git
a/kernel/traffic/core/src/main/java/org/apache/shardingsphere/traffic/engine/TrafficEngine.java
b/kernel/traffic/core/src/main/java/org/apache/shardingsphere/traffic/engine/TrafficEngine.java
index 2190083a220..fae5374577a 100644
---
a/kernel/traffic/core/src/main/java/org/apache/shardingsphere/traffic/engine/TrafficEngine.java
+++
b/kernel/traffic/core/src/main/java/org/apache/shardingsphere/traffic/engine/TrafficEngine.java
@@ -54,7 +54,7 @@ public final class TrafficEngine {
List<InstanceMetaData> instances =
instanceContext.getAllClusterInstances(InstanceType.PROXY,
strategyRule.get().getLabels());
if (!instances.isEmpty()) {
TrafficLoadBalanceAlgorithm loadBalancer =
strategyRule.get().getLoadBalancer();
- InstanceMetaData instanceMetaData = 1 == instances.size() ?
instances.iterator().next() :
loadBalancer.getInstanceId(strategyRule.get().getName(), instances);
+ InstanceMetaData instanceMetaData = 1 == instances.size() ?
instances.iterator().next() :
loadBalancer.getInstanceMetaData(strategyRule.get().getName(), instances);
return Optional.of(instanceMetaData.getId());
}
return Optional.empty();
diff --git
a/kernel/traffic/core/src/test/java/org/apache/shardingsphere/traffic/algorithm/engine/TrafficEngineTest.java
b/kernel/traffic/core/src/test/java/org/apache/shardingsphere/traffic/algorithm/engine/TrafficEngineTest.java
index fa4644ce5a0..9f8878edb10 100644
---
a/kernel/traffic/core/src/test/java/org/apache/shardingsphere/traffic/algorithm/engine/TrafficEngineTest.java
+++
b/kernel/traffic/core/src/test/java/org/apache/shardingsphere/traffic/algorithm/engine/TrafficEngineTest.java
@@ -92,7 +92,7 @@ class TrafficEngineTest {
when(strategyRule.getLabels()).thenReturn(Arrays.asList("OLTP",
"OLAP"));
TrafficLoadBalanceAlgorithm loadBalancer =
mock(TrafficLoadBalanceAlgorithm.class);
List<InstanceMetaData> instanceIds = mockComputeNodeInstances();
- when(loadBalancer.getInstanceId("traffic",
instanceIds)).thenReturn(new ProxyInstanceMetaData("foo_id", 3307));
+ when(loadBalancer.getInstanceMetaData("traffic",
instanceIds)).thenReturn(new ProxyInstanceMetaData("foo_id", 3307));
when(strategyRule.getLoadBalancer()).thenReturn(loadBalancer);
when(strategyRule.getName()).thenReturn("traffic");
when(instanceContext.getAllClusterInstances(InstanceType.PROXY,
Arrays.asList("OLTP", "OLAP"))).thenReturn(instanceIds);
diff --git
a/kernel/traffic/core/src/test/java/org/apache/shardingsphere/traffic/algorithm/loadbalance/RandomTrafficLoadBalanceAlgorithmTest.java
b/kernel/traffic/core/src/test/java/org/apache/shardingsphere/traffic/algorithm/loadbalance/RandomTrafficLoadBalanceAlgorithmTest.java
index 4f63f3f442c..71ada02ede6 100644
---
a/kernel/traffic/core/src/test/java/org/apache/shardingsphere/traffic/algorithm/loadbalance/RandomTrafficLoadBalanceAlgorithmTest.java
+++
b/kernel/traffic/core/src/test/java/org/apache/shardingsphere/traffic/algorithm/loadbalance/RandomTrafficLoadBalanceAlgorithmTest.java
@@ -33,8 +33,8 @@ class RandomTrafficLoadBalanceAlgorithmTest {
RandomTrafficLoadBalanceAlgorithm randomAlgorithm = new
RandomTrafficLoadBalanceAlgorithm();
List<InstanceMetaData> instances = Arrays.asList(new
ProxyInstanceMetaData("foo_id", "127.0.0.1@3307", "foo_verison"),
new ProxyInstanceMetaData("bar_id", "127.0.0.1@3308",
"foo_verison"));
-
assertTrue(instances.contains(randomAlgorithm.getInstanceId("simple_traffic",
instances)));
-
assertTrue(instances.contains(randomAlgorithm.getInstanceId("simple_traffic",
instances)));
-
assertTrue(instances.contains(randomAlgorithm.getInstanceId("simple_traffic",
instances)));
+
assertTrue(instances.contains(randomAlgorithm.getInstanceMetaData("simple_traffic",
instances)));
+
assertTrue(instances.contains(randomAlgorithm.getInstanceMetaData("simple_traffic",
instances)));
+
assertTrue(instances.contains(randomAlgorithm.getInstanceMetaData("simple_traffic",
instances)));
}
}
diff --git
a/kernel/traffic/core/src/test/java/org/apache/shardingsphere/traffic/algorithm/loadbalance/RoundRobinTrafficLoadBalanceAlgorithmTest.java
b/kernel/traffic/core/src/test/java/org/apache/shardingsphere/traffic/algorithm/loadbalance/RoundRobinTrafficLoadBalanceAlgorithmTest.java
index 2d91acc72e6..b36f75c0473 100644
---
a/kernel/traffic/core/src/test/java/org/apache/shardingsphere/traffic/algorithm/loadbalance/RoundRobinTrafficLoadBalanceAlgorithmTest.java
+++
b/kernel/traffic/core/src/test/java/org/apache/shardingsphere/traffic/algorithm/loadbalance/RoundRobinTrafficLoadBalanceAlgorithmTest.java
@@ -35,8 +35,8 @@ class RoundRobinTrafficLoadBalanceAlgorithmTest {
InstanceMetaData instance2 = new
ProxyInstanceMetaData("127.0.0.1@3308", "127.0.0.1@3308", "foo_version");
List<InstanceMetaData> instances = Arrays.asList(instance1, instance2);
RoundRobinTrafficLoadBalanceAlgorithm roundRobinAlgorithm = new
RoundRobinTrafficLoadBalanceAlgorithm();
- assertThat(roundRobinAlgorithm.getInstanceId("simple_traffic",
instances), is(instance1));
- assertThat(roundRobinAlgorithm.getInstanceId("simple_traffic",
instances), is(instance2));
- assertThat(roundRobinAlgorithm.getInstanceId("simple_traffic",
instances), is(instance1));
+ assertThat(roundRobinAlgorithm.getInstanceMetaData("simple_traffic",
instances), is(instance1));
+ assertThat(roundRobinAlgorithm.getInstanceMetaData("simple_traffic",
instances), is(instance2));
+ assertThat(roundRobinAlgorithm.getInstanceMetaData("simple_traffic",
instances), is(instance1));
}
}
diff --git
a/kernel/traffic/distsql/handler/src/test/java/org/apache/shardingsphere/traffic/distsql/handler/fixture/DistSQLTrafficLoadBalanceAlgorithmFixture.java
b/kernel/traffic/distsql/handler/src/test/java/org/apache/shardingsphere/traffic/distsql/handler/fixture/DistSQLTrafficLoadBalanceAlgorithmFixture.java
index fc86ce430bf..c319474d923 100644
---
a/kernel/traffic/distsql/handler/src/test/java/org/apache/shardingsphere/traffic/distsql/handler/fixture/DistSQLTrafficLoadBalanceAlgorithmFixture.java
+++
b/kernel/traffic/distsql/handler/src/test/java/org/apache/shardingsphere/traffic/distsql/handler/fixture/DistSQLTrafficLoadBalanceAlgorithmFixture.java
@@ -25,7 +25,7 @@ import java.util.List;
public final class DistSQLTrafficLoadBalanceAlgorithmFixture implements
TrafficLoadBalanceAlgorithm {
@Override
- public InstanceMetaData getInstanceId(final String name, final
List<InstanceMetaData> instances) {
+ public InstanceMetaData getInstanceMetaData(final String name, final
List<InstanceMetaData> instances) {
return null;
}
