diff --git a/net/src/main/java/com/zfoo/net/consumer/balancer/AbstractConsumerLoadBalancer.java b/net/src/main/java/com/zfoo/net/consumer/balancer/AbstractConsumerLoadBalancer.java index d1cf3b45..3a933020 100644 --- a/net/src/main/java/com/zfoo/net/consumer/balancer/AbstractConsumerLoadBalancer.java +++ b/net/src/main/java/com/zfoo/net/consumer/balancer/AbstractConsumerLoadBalancer.java @@ -24,13 +24,13 @@ public abstract class AbstractConsumerLoadBalancer implements IConsumerLoadBalan AbstractConsumerLoadBalancer balancer; switch (loadBalancer) { case "random": - balancer = RandomConsumerLoadBalancer.getInstance(); + balancer = RandomLoadBalancer.getInstance(); break; case "consistent-hash": - balancer = ConsistentHashConsumerLoadBalancer.getInstance(); + balancer = ConsistentHashLoadBalancer.getInstance(); break; - case "consistent-hash-of-memory": - balancer = ConsistentHashOfMemoryConsumerLoadBalancer.getInstance(); + case "cached-consistent-hash": + balancer = CachedConsistentHashLoadBalancer.getInstance(); break; default: throw new RuntimeException(StringUtils.format("Load balancer is not recognized[{}]", loadBalancer)); diff --git a/net/src/main/java/com/zfoo/net/consumer/balancer/ConsistentHashOfMemoryConsumerLoadBalancer.java b/net/src/main/java/com/zfoo/net/consumer/balancer/CachedConsistentHashLoadBalancer.java similarity index 78% rename from net/src/main/java/com/zfoo/net/consumer/balancer/ConsistentHashOfMemoryConsumerLoadBalancer.java rename to net/src/main/java/com/zfoo/net/consumer/balancer/CachedConsistentHashLoadBalancer.java index fd83227e..a58678d4 100644 --- a/net/src/main/java/com/zfoo/net/consumer/balancer/ConsistentHashOfMemoryConsumerLoadBalancer.java +++ b/net/src/main/java/com/zfoo/net/consumer/balancer/CachedConsistentHashLoadBalancer.java @@ -13,19 +13,19 @@ import java.util.Map; * @author qmr * @date 2024/1/6 */ -public class ConsistentHashOfMemoryConsumerLoadBalancer extends ConsistentHashConsumerLoadBalancer { +public class CachedConsistentHashLoadBalancer extends ConsistentHashLoadBalancer { - public static final ConsistentHashOfMemoryConsumerLoadBalancer INSTANCE = new ConsistentHashOfMemoryConsumerLoadBalancer(); + public static final CachedConsistentHashLoadBalancer INSTANCE = new CachedConsistentHashLoadBalancer(); /** * 存储已经负载后的sid */ private static final AtomicLongMap uid2sidMap = AtomicLongMap.create(); - private ConsistentHashOfMemoryConsumerLoadBalancer() { + private CachedConsistentHashLoadBalancer() { } - public static ConsistentHashOfMemoryConsumerLoadBalancer getInstance() { + public static CachedConsistentHashLoadBalancer getInstance() { return INSTANCE; } diff --git a/net/src/main/java/com/zfoo/net/consumer/balancer/ConsistentHashConsumerLoadBalancer.java b/net/src/main/java/com/zfoo/net/consumer/balancer/ConsistentHashLoadBalancer.java similarity index 92% rename from net/src/main/java/com/zfoo/net/consumer/balancer/ConsistentHashConsumerLoadBalancer.java rename to net/src/main/java/com/zfoo/net/consumer/balancer/ConsistentHashLoadBalancer.java index eb1ad2eb..009e6408 100644 --- a/net/src/main/java/com/zfoo/net/consumer/balancer/ConsistentHashConsumerLoadBalancer.java +++ b/net/src/main/java/com/zfoo/net/consumer/balancer/ConsistentHashLoadBalancer.java @@ -36,18 +36,18 @@ import java.util.concurrent.atomic.AtomicReferenceArray; * * @author godotg */ -public class ConsistentHashConsumerLoadBalancer extends AbstractConsumerLoadBalancer { +public class ConsistentHashLoadBalancer extends AbstractConsumerLoadBalancer { - public static final ConsistentHashConsumerLoadBalancer INSTANCE = new ConsistentHashConsumerLoadBalancer(); + public static final ConsistentHashLoadBalancer INSTANCE = new ConsistentHashLoadBalancer(); private volatile int lastClientSessionChangeId = 0; private static final AtomicReferenceArray consistentHashMap = new AtomicReferenceArray<>(ProtocolManager.MAX_MODULE_NUM); private static final int VIRTUAL_NODE_NUMS = 200; - public ConsistentHashConsumerLoadBalancer() { + public ConsistentHashLoadBalancer() { } - public static ConsistentHashConsumerLoadBalancer getInstance() { + public static ConsistentHashLoadBalancer getInstance() { return INSTANCE; } @@ -61,7 +61,7 @@ public class ConsistentHashConsumerLoadBalancer extends AbstractConsumerLoadBala @Override public Session selectProvider(List providers, Object packet, Object argument) { if (argument == null) { - return RandomConsumerLoadBalancer.getInstance().selectProvider(providers, packet, argument); + return RandomLoadBalancer.getInstance().selectProvider(providers, packet, argument); } updateConsistentHashMap(providers); diff --git a/net/src/main/java/com/zfoo/net/consumer/balancer/RandomConsumerLoadBalancer.java b/net/src/main/java/com/zfoo/net/consumer/balancer/RandomLoadBalancer.java similarity index 78% rename from net/src/main/java/com/zfoo/net/consumer/balancer/RandomConsumerLoadBalancer.java rename to net/src/main/java/com/zfoo/net/consumer/balancer/RandomLoadBalancer.java index 26efc40b..5eba14b7 100644 --- a/net/src/main/java/com/zfoo/net/consumer/balancer/RandomConsumerLoadBalancer.java +++ b/net/src/main/java/com/zfoo/net/consumer/balancer/RandomLoadBalancer.java @@ -23,14 +23,14 @@ import java.util.List; * * @author godotg */ -public class RandomConsumerLoadBalancer extends AbstractConsumerLoadBalancer { +public class RandomLoadBalancer extends AbstractConsumerLoadBalancer { - private static final RandomConsumerLoadBalancer INSTANCE = new RandomConsumerLoadBalancer(); + private static final RandomLoadBalancer INSTANCE = new RandomLoadBalancer(); - private RandomConsumerLoadBalancer() { + private RandomLoadBalancer() { } - public static RandomConsumerLoadBalancer getInstance() { + public static RandomLoadBalancer getInstance() { return INSTANCE; }