From 5ce71af1e3b8e888537914576f59850a63e53991 Mon Sep 17 00:00:00 2001 From: shihuili1218 Date: Sun, 28 Jan 2024 17:44:56 +0800 Subject: [PATCH 1/7] test --- .../main/java/com/ofcoder/klein/spi/ExtensionLoader.java | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/klein-spi/src/main/java/com/ofcoder/klein/spi/ExtensionLoader.java b/klein-spi/src/main/java/com/ofcoder/klein/spi/ExtensionLoader.java index 0328abca..4be92414 100644 --- a/klein-spi/src/main/java/com/ofcoder/klein/spi/ExtensionLoader.java +++ b/klein-spi/src/main/java/com/ofcoder/klein/spi/ExtensionLoader.java @@ -160,11 +160,7 @@ public T getDefaultJoin() { * @return join */ public T register(final String name, final Object... args) { - if (!globalName.compareAndSet(null, name)) { - if (!StringUtils.equals(name, globalName.get())) { - throw new SpiException(String.format("get global join, but global join[%s] already exists", globalName)); - } - } + globalName.compareAndSet(null, name); Holder objectHolder = cachedInstances.get(name); if (Objects.isNull(objectHolder)) { From 2f4104d8e1e36e40862d312835c5179481a61a73 Mon Sep 17 00:00:00 2001 From: shihuili1218 Date: Sun, 28 Jan 2024 18:07:19 +0800 Subject: [PATCH 2/7] example --- .../facade/config/ConsensusProp.java | 4 +-- .../com/ofcoder/klein/core/cache/CacheSM.java | 4 +-- .../ofcoder/klein/example/cache/Main1.java | 29 ++++++++++--------- .../com/ofcoder/klein/example/nwr/Main2.java | 6 ++-- .../com/ofcoder/klein/example/nwr/Main3.java | 6 ++-- 5 files changed, 25 insertions(+), 24 deletions(-) diff --git a/klein-consensus/klein-consensus-facade/src/main/java/com/ofcoder/klein/consensus/facade/config/ConsensusProp.java b/klein-consensus/klein-consensus-facade/src/main/java/com/ofcoder/klein/consensus/facade/config/ConsensusProp.java index 6a4eef9b..23b14b91 100644 --- a/klein-consensus/klein-consensus-facade/src/main/java/com/ofcoder/klein/consensus/facade/config/ConsensusProp.java +++ b/klein-consensus/klein-consensus-facade/src/main/java/com/ofcoder/klein/consensus/facade/config/ConsensusProp.java @@ -42,8 +42,8 @@ public class ConsensusProp { */ private List members = parseMember(SystemPropertyUtil.get("klein.members", "1:127.0.0.1:1218:false")); /** - * new node joining the cluster. - * this member is not in the cluster, and will automatically join the cluster at startup. + * The node is not included in the cluster. + * When it starts, it will actively join the cluster, and when it shuts down, it will actively exit the cluster. */ private boolean joinCluster = SystemPropertyUtil.getBoolean("klein.consensus.join-cluster", false); /** diff --git a/klein-core/src/main/java/com/ofcoder/klein/core/cache/CacheSM.java b/klein-core/src/main/java/com/ofcoder/klein/core/cache/CacheSM.java index 997970c0..36ad93ad 100644 --- a/klein-core/src/main/java/com/ofcoder/klein/core/cache/CacheSM.java +++ b/klein-core/src/main/java/com/ofcoder/klein/core/cache/CacheSM.java @@ -61,12 +61,12 @@ public Object apply(final Object data) { Message message = (Message) data; switch (message.getOp()) { case Message.PUT: - LOG.info("put {} → {} {}", message.getKey(), message.getData(), message.getExpire()); + LOG.debug("put {} → {} {}", message.getKey(), message.getData(), message.getExpire()); container.put(message.getKey(), message.getData(), message.getExpire()); break; case Message.GET: Object o = container.get(message.getKey()); - LOG.info("get {} from {}", o, message.getKey()); + LOG.debug("get {} from {}", o, message.getKey()); return o; case Message.INVALIDATE: container.remove(message.getKey()); diff --git a/klein-example/src/main/java/com/ofcoder/klein/example/cache/Main1.java b/klein-example/src/main/java/com/ofcoder/klein/example/cache/Main1.java index af3ea8df..2a138054 100644 --- a/klein-example/src/main/java/com/ofcoder/klein/example/cache/Main1.java +++ b/klein-example/src/main/java/com/ofcoder/klein/example/cache/Main1.java @@ -16,16 +16,17 @@ */ package com.ofcoder.klein.example.cache; +import java.io.Serializable; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import com.ofcoder.klein.Klein; import com.ofcoder.klein.KleinFactory; import com.ofcoder.klein.KleinProp; import com.ofcoder.klein.common.util.ThreadExecutor; import com.ofcoder.klein.core.cache.KleinCache; import com.ofcoder.klein.rpc.facade.Endpoint; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.io.Serializable; /** * Main: operate cache. @@ -48,29 +49,29 @@ public static void main(final String[] args) throws Exception { KleinCache klein = KleinFactory.getInstance().createCache("klein"); - String key = "hello"; - String value = "klein"; long start = System.currentTimeMillis(); LOG.info("++++++++++first put: " + klein.put("hello1", "klein1") + ", cost: " + (System.currentTimeMillis() - start)); - start = System.currentTimeMillis(); LOG.info("++++++++++second put: " + klein.put("hello2", "klein2") + ", cost: " + (System.currentTimeMillis() - start)); - start = System.currentTimeMillis(); - LOG.info("++++++++++third put: " + klein.put("hello3", "klein3") + ", cots: " + (System.currentTimeMillis() - start)); - - LOG.info("----------get hello3: " + klein.get("hello3")); - LOG.info("----------get hello4: " + klein.get("hello4")); + LOG.info("++++++++++third put: " + klein.put("hello3", "klein3") + ", cost: " + (System.currentTimeMillis() - start)); + start = System.currentTimeMillis(); + LOG.info("----------get hello3: " + klein.get("hello3") + ", cost: " + (System.currentTimeMillis() - start)); + start = System.currentTimeMillis(); + LOG.info("----------get hello4: " + klein.get("hello4") + ", cost: " + (System.currentTimeMillis() - start)); for (int i = 0; i < 50; i++) { int finalI = i; ThreadExecutor.execute(() -> { Serializable hello3 = null; + long begin = System.currentTimeMillis(); try { + long cost = System.currentTimeMillis() - begin; hello3 = klein.get("hello3"); - LOG.info("---------{}---------, end {}", finalI, hello3); + LOG.info("{}, succ: {}, cost: {}", finalI, hello3, cost); } catch (Exception e) { - LOG.info("---------{}---------, err {}", finalI, hello3); + long cost = System.currentTimeMillis() - begin; + LOG.info("{}, err {}, cost: {}", finalI, hello3, cost); } }); } diff --git a/klein-example/src/main/java/com/ofcoder/klein/example/nwr/Main2.java b/klein-example/src/main/java/com/ofcoder/klein/example/nwr/Main2.java index ca2ebbfe..023abc70 100644 --- a/klein-example/src/main/java/com/ofcoder/klein/example/nwr/Main2.java +++ b/klein-example/src/main/java/com/ofcoder/klein/example/nwr/Main2.java @@ -22,7 +22,9 @@ import org.slf4j.LoggerFactory; import com.ofcoder.klein.Klein; +import com.ofcoder.klein.KleinFactory; import com.ofcoder.klein.KleinProp; +import com.ofcoder.klein.core.cache.KleinCache; /** * Main2: cluster member. @@ -41,10 +43,8 @@ public static void main(final String[] args) throws IOException { KleinProp prop2 = KleinProp.loadIfPresent(); -// prop2.getConsensusProp().setSelf(new Endpoint("2", "127.0.0.1", 1219)); -// prop2.getRpcProp().setPort(1219); - Klein instance2 = Klein.startup(); + KleinCache klein = KleinFactory.getInstance().createCache("klein"); System.in.read(); } diff --git a/klein-example/src/main/java/com/ofcoder/klein/example/nwr/Main3.java b/klein-example/src/main/java/com/ofcoder/klein/example/nwr/Main3.java index a7c40482..da4b6b4e 100644 --- a/klein-example/src/main/java/com/ofcoder/klein/example/nwr/Main3.java +++ b/klein-example/src/main/java/com/ofcoder/klein/example/nwr/Main3.java @@ -22,7 +22,9 @@ import org.slf4j.LoggerFactory; import com.ofcoder.klein.Klein; +import com.ofcoder.klein.KleinFactory; import com.ofcoder.klein.KleinProp; +import com.ofcoder.klein.core.cache.KleinCache; /** * Main3: cluster member. @@ -41,10 +43,8 @@ public static void main(final String[] args) throws IOException { KleinProp prop3 = KleinProp.loadIfPresent(); -// prop3.getConsensusProp().setSelf(new Endpoint("3", "127.0.0.1", 1220)); -// prop3.getRpcProp().setPort(1220); - Klein instance3 = Klein.startup(); + KleinCache klein = KleinFactory.getInstance().createCache("klein"); System.in.read(); } From 5a043b6b609172b663076e5e7fbc4ff76b4b92a6 Mon Sep 17 00:00:00 2001 From: shihuili1218 Date: Sun, 28 Jan 2024 18:19:57 +0800 Subject: [PATCH 3/7] test --- .../facade/MemberConfigurationTest.java | 62 +++++------ .../klein/consensus/facade/nwr/NwrTest.java | 8 +- .../quorum/JoinConsensusQuorumTest.java | 100 +++++++++--------- .../facade/quorum/SingleQuorumTest.java | 19 ++-- 4 files changed, 94 insertions(+), 95 deletions(-) diff --git a/klein-consensus/klein-consensus-facade/src/test/java/com/ofcoder/klein/consensus/facade/MemberConfigurationTest.java b/klein-consensus/klein-consensus-facade/src/test/java/com/ofcoder/klein/consensus/facade/MemberConfigurationTest.java index 1b94adb9..be3c1c5f 100644 --- a/klein-consensus/klein-consensus-facade/src/test/java/com/ofcoder/klein/consensus/facade/MemberConfigurationTest.java +++ b/klein-consensus/klein-consensus-facade/src/test/java/com/ofcoder/klein/consensus/facade/MemberConfigurationTest.java @@ -12,9 +12,9 @@ public class MemberConfigurationTest extends TestCase { public void testInit() { - List nodes = ImmutableList.of(RpcUtil.parseEndpoint("1:127.0.0.1:1218"), - RpcUtil.parseEndpoint("2:127.0.0.1:1219"), - RpcUtil.parseEndpoint("3:127.0.0.1:1220")); + List nodes = ImmutableList.of(RpcUtil.parseEndpoint("1:127.0.0.1:1218:false"), + RpcUtil.parseEndpoint("2:127.0.0.1:1219:false"), + RpcUtil.parseEndpoint("3:127.0.0.1:1220:false")); MemberConfiguration configuration = new MemberConfiguration(); configuration.init(null, nodes); @@ -24,14 +24,14 @@ public void testInit() { public void testSeenNewConfig() { List nodes = new ArrayList<>(); - nodes.add(RpcUtil.parseEndpoint("1:127.0.0.1:1218")); - nodes.add(RpcUtil.parseEndpoint("2:127.0.0.1:1219")); - nodes.add(RpcUtil.parseEndpoint("3:127.0.0.1:1220")); + nodes.add(RpcUtil.parseEndpoint("1:127.0.0.1:1218:false")); + nodes.add(RpcUtil.parseEndpoint("2:127.0.0.1:1219:false")); + nodes.add(RpcUtil.parseEndpoint("3:127.0.0.1:1220:false")); MemberConfiguration configuration = new MemberConfiguration(); configuration.init(null, nodes); - nodes.add(RpcUtil.parseEndpoint("4:127.0.0.1:1221")); + nodes.add(RpcUtil.parseEndpoint("4:127.0.0.1:1221:false")); configuration.seenNewConfig(new HashSet<>(nodes)); assertEquals(configuration.effectMembers.size(), nodes.size() - 1); @@ -41,15 +41,15 @@ public void testSeenNewConfig() { public void testGetEndpointById() { List nodes = new ArrayList<>(); - Endpoint effect = RpcUtil.parseEndpoint("1:127.0.0.1:1218"); + Endpoint effect = RpcUtil.parseEndpoint("1:127.0.0.1:1218:false"); nodes.add(effect); - nodes.add(RpcUtil.parseEndpoint("2:127.0.0.1:1219")); - nodes.add(RpcUtil.parseEndpoint("3:127.0.0.1:1220")); + nodes.add(RpcUtil.parseEndpoint("2:127.0.0.1:1219:false")); + nodes.add(RpcUtil.parseEndpoint("3:127.0.0.1:1220:false")); MemberConfiguration configuration = new MemberConfiguration(); configuration.init(null, nodes); - Endpoint last = RpcUtil.parseEndpoint("4:127.0.0.1:1221"); + Endpoint last = RpcUtil.parseEndpoint("4:127.0.0.1:1221:false"); nodes.add(last); configuration.seenNewConfig(new HashSet<>(nodes)); @@ -72,15 +72,15 @@ public void testGetEndpointById() { public void testIsValid() { List nodes = new ArrayList<>(); - Endpoint effect = RpcUtil.parseEndpoint("1:127.0.0.1:1218"); + Endpoint effect = RpcUtil.parseEndpoint("1:127.0.0.1:1218:false"); nodes.add(effect); - nodes.add(RpcUtil.parseEndpoint("2:127.0.0.1:1219")); - nodes.add(RpcUtil.parseEndpoint("3:127.0.0.1:1220")); + nodes.add(RpcUtil.parseEndpoint("2:127.0.0.1:1219:false")); + nodes.add(RpcUtil.parseEndpoint("3:127.0.0.1:1220:false")); MemberConfiguration configuration = new MemberConfiguration(); configuration.init(null, nodes); - Endpoint last = RpcUtil.parseEndpoint("4:127.0.0.1:1221"); + Endpoint last = RpcUtil.parseEndpoint("4:127.0.0.1:1221:false"); nodes.add(last); configuration.seenNewConfig(new HashSet<>(nodes)); @@ -94,15 +94,15 @@ public void testIsValid() { public void testGetMembersWithout() { List nodes = new ArrayList<>(); - Endpoint effect = RpcUtil.parseEndpoint("1:127.0.0.1:1218"); + Endpoint effect = RpcUtil.parseEndpoint("1:127.0.0.1:1218:false"); nodes.add(effect); - nodes.add(RpcUtil.parseEndpoint("2:127.0.0.1:1219")); - nodes.add(RpcUtil.parseEndpoint("3:127.0.0.1:1220")); + nodes.add(RpcUtil.parseEndpoint("2:127.0.0.1:1219:false")); + nodes.add(RpcUtil.parseEndpoint("3:127.0.0.1:1220:false")); MemberConfiguration configuration = new MemberConfiguration(); configuration.init(null, nodes); - Endpoint last = RpcUtil.parseEndpoint("4:127.0.0.1:1221"); + Endpoint last = RpcUtil.parseEndpoint("4:127.0.0.1:1221:false"); nodes.add(last); configuration.seenNewConfig(new HashSet<>(nodes)); @@ -116,15 +116,15 @@ public void testGetMembersWithout() { public void testGetLastMembers() { List nodes = new ArrayList<>(); - Endpoint effect = RpcUtil.parseEndpoint("1:127.0.0.1:1218"); + Endpoint effect = RpcUtil.parseEndpoint("1:127.0.0.1:1218:false"); nodes.add(effect); - nodes.add(RpcUtil.parseEndpoint("2:127.0.0.1:1219")); - nodes.add(RpcUtil.parseEndpoint("3:127.0.0.1:1220")); + nodes.add(RpcUtil.parseEndpoint("2:127.0.0.1:1219:false")); + nodes.add(RpcUtil.parseEndpoint("3:127.0.0.1:1220:false")); MemberConfiguration configuration = new MemberConfiguration(); configuration.init(null, nodes); - Endpoint last = RpcUtil.parseEndpoint("4:127.0.0.1:1221"); + Endpoint last = RpcUtil.parseEndpoint("4:127.0.0.1:1221:false"); nodes.add(last); configuration.seenNewConfig(new HashSet<>(nodes)); @@ -133,15 +133,15 @@ public void testGetLastMembers() { public void testGetEffectMembers() { List nodes = new ArrayList<>(); - Endpoint effect = RpcUtil.parseEndpoint("1:127.0.0.1:1218"); + Endpoint effect = RpcUtil.parseEndpoint("1:127.0.0.1:1218:false"); nodes.add(effect); - nodes.add(RpcUtil.parseEndpoint("2:127.0.0.1:1219")); - nodes.add(RpcUtil.parseEndpoint("3:127.0.0.1:1220")); + nodes.add(RpcUtil.parseEndpoint("2:127.0.0.1:1219:false")); + nodes.add(RpcUtil.parseEndpoint("3:127.0.0.1:1220:false")); MemberConfiguration configuration = new MemberConfiguration(); configuration.init(null, nodes); - Endpoint last = RpcUtil.parseEndpoint("4:127.0.0.1:1221"); + Endpoint last = RpcUtil.parseEndpoint("4:127.0.0.1:1221:false"); nodes.add(last); configuration.seenNewConfig(new HashSet<>(nodes)); @@ -150,15 +150,15 @@ public void testGetEffectMembers() { public void testEffectiveNewConfig() { List nodes = new ArrayList<>(); - Endpoint effect = RpcUtil.parseEndpoint("1:127.0.0.1:1218"); + Endpoint effect = RpcUtil.parseEndpoint("1:127.0.0.1:1218:false"); nodes.add(effect); - nodes.add(RpcUtil.parseEndpoint("2:127.0.0.1:1219")); - nodes.add(RpcUtil.parseEndpoint("3:127.0.0.1:1220")); + nodes.add(RpcUtil.parseEndpoint("2:127.0.0.1:1219:false")); + nodes.add(RpcUtil.parseEndpoint("3:127.0.0.1:1220:false")); MemberConfiguration configuration = new MemberConfiguration(); configuration.init(null, nodes); - Endpoint last = RpcUtil.parseEndpoint("4:127.0.0.1:1221"); + Endpoint last = RpcUtil.parseEndpoint("4:127.0.0.1:1221:false"); nodes.add(last); int version = configuration.seenNewConfig(new HashSet<>(nodes)); configuration.effectiveNewConfig(version, new HashSet<>(nodes)); diff --git a/klein-consensus/klein-consensus-facade/src/test/java/com/ofcoder/klein/consensus/facade/nwr/NwrTest.java b/klein-consensus/klein-consensus-facade/src/test/java/com/ofcoder/klein/consensus/facade/nwr/NwrTest.java index cfdfafd5..f60983ef 100644 --- a/klein-consensus/klein-consensus-facade/src/test/java/com/ofcoder/klein/consensus/facade/nwr/NwrTest.java +++ b/klein-consensus/klein-consensus-facade/src/test/java/com/ofcoder/klein/consensus/facade/nwr/NwrTest.java @@ -6,16 +6,16 @@ public class NwrTest extends TestCase { public void testR() { - Nwr majority = ExtensionLoader.getExtensionLoader(Nwr.class).getJoin("majority"); - Nwr fastWrite = ExtensionLoader.getExtensionLoader(Nwr.class).getJoin("fastWrite"); + Nwr majority = ExtensionLoader.getExtensionLoader(Nwr.class).register("majority"); + Nwr fastWrite = ExtensionLoader.getExtensionLoader(Nwr.class).register("fastWrite"); assertEquals(2, majority.r(3)); assertEquals(3, fastWrite.r(3)); } public void testW() { - Nwr majority = ExtensionLoader.getExtensionLoader(Nwr.class).getJoin("majority"); - Nwr fastWrite = ExtensionLoader.getExtensionLoader(Nwr.class).getJoin("fastWrite"); + Nwr majority = ExtensionLoader.getExtensionLoader(Nwr.class).register("majority"); + Nwr fastWrite = ExtensionLoader.getExtensionLoader(Nwr.class).register("fastWrite"); assertEquals(majority.w(3), 2); assertEquals(fastWrite.w(3), 1); diff --git a/klein-consensus/klein-consensus-facade/src/test/java/com/ofcoder/klein/consensus/facade/quorum/JoinConsensusQuorumTest.java b/klein-consensus/klein-consensus-facade/src/test/java/com/ofcoder/klein/consensus/facade/quorum/JoinConsensusQuorumTest.java index 686b729d..d12a47f1 100644 --- a/klein-consensus/klein-consensus-facade/src/test/java/com/ofcoder/klein/consensus/facade/quorum/JoinConsensusQuorumTest.java +++ b/klein-consensus/klein-consensus-facade/src/test/java/com/ofcoder/klein/consensus/facade/quorum/JoinConsensusQuorumTest.java @@ -11,60 +11,60 @@ public class JoinConsensusQuorumTest extends TestCase { public void testRefuse() { Set effect = new HashSet<>(); - effect.add(RpcUtil.parseEndpoint("1:127.0.0.1:1218")); - effect.add(RpcUtil.parseEndpoint("2:127.0.0.1:1219")); - effect.add(RpcUtil.parseEndpoint("3:127.0.0.1:1220")); + effect.add(RpcUtil.parseEndpoint("1:127.0.0.1:1218:false")); + effect.add(RpcUtil.parseEndpoint("2:127.0.0.1:1219:false")); + effect.add(RpcUtil.parseEndpoint("3:127.0.0.1:1220:false")); Set last = new HashSet<>(); - last.add(RpcUtil.parseEndpoint("1:127.0.0.1:1218")); - last.add(RpcUtil.parseEndpoint("2:127.0.0.1:1219")); - last.add(RpcUtil.parseEndpoint("3:127.0.0.1:1220")); - last.add(RpcUtil.parseEndpoint("4:127.0.0.1:1221")); + last.add(RpcUtil.parseEndpoint("1:127.0.0.1:1218:false")); + last.add(RpcUtil.parseEndpoint("2:127.0.0.1:1219:false")); + last.add(RpcUtil.parseEndpoint("3:127.0.0.1:1220:false")); + last.add(RpcUtil.parseEndpoint("4:127.0.0.1:1221:false")); JoinConsensusQuorum quorum = new JoinConsensusQuorum(effect, last, 2 , 3); SingleQuorum oldQuorum = (SingleQuorum) quorum.getOldQuorum(); SingleQuorum newQuorum = (SingleQuorum) quorum.getNewQuorum(); // granting - quorum.refuse(RpcUtil.parseEndpoint("1:127.0.0.1:1218")); + quorum.refuse(RpcUtil.parseEndpoint("1:127.0.0.1:1218:false")); assertEquals(oldQuorum.getFailedMembers().size(), 1); - assertTrue(oldQuorum.getFailedMembers().contains(RpcUtil.parseEndpoint("1:127.0.0.1:1218"))); - assertFalse(oldQuorum.getGrantedMembers().contains(RpcUtil.parseEndpoint("1:127.0.0.1:1218"))); + assertTrue(oldQuorum.getFailedMembers().contains(RpcUtil.parseEndpoint("1:127.0.0.1:1218:false"))); + assertFalse(oldQuorum.getGrantedMembers().contains(RpcUtil.parseEndpoint("1:127.0.0.1:1218:false"))); assertEquals(newQuorum.getFailedMembers().size(), 1); - assertTrue(newQuorum.getFailedMembers().contains(RpcUtil.parseEndpoint("1:127.0.0.1:1218"))); - assertFalse(newQuorum.getGrantedMembers().contains(RpcUtil.parseEndpoint("1:127.0.0.1:1218"))); + assertTrue(newQuorum.getFailedMembers().contains(RpcUtil.parseEndpoint("1:127.0.0.1:1218:false"))); + assertFalse(newQuorum.getGrantedMembers().contains(RpcUtil.parseEndpoint("1:127.0.0.1:1218:false"))); assertEquals(oldQuorum.isGranted(), Quorum.GrantResult.GRANTING); assertEquals(newQuorum.isGranted(), Quorum.GrantResult.GRANTING); assertEquals(quorum.isGranted(), Quorum.GrantResult.GRANTING); // not exists - quorum.refuse(RpcUtil.parseEndpoint("-1:127.0.0.1:1218")); + quorum.refuse(RpcUtil.parseEndpoint("-1:127.0.0.1:1217:false")); assertEquals(oldQuorum.getFailedMembers().size(), 1); - assertFalse(oldQuorum.getFailedMembers().contains(RpcUtil.parseEndpoint("-1:127.0.0.1:1218"))); + assertFalse(oldQuorum.getFailedMembers().contains(RpcUtil.parseEndpoint("-1:127.0.0.1:1217:false"))); assertEquals(newQuorum.getFailedMembers().size(), 1); - assertFalse(newQuorum.getFailedMembers().contains(RpcUtil.parseEndpoint("-1:127.0.0.1:1218"))); + assertFalse(newQuorum.getFailedMembers().contains(RpcUtil.parseEndpoint("-1:127.0.0.1:1217:false"))); assertEquals(oldQuorum.isGranted(), Quorum.GrantResult.GRANTING); assertEquals(newQuorum.isGranted(), Quorum.GrantResult.GRANTING); assertEquals(quorum.isGranted(), Quorum.GrantResult.GRANTING); // refuse - quorum.refuse(RpcUtil.parseEndpoint("4:127.0.0.1:1221")); + quorum.refuse(RpcUtil.parseEndpoint("4:127.0.0.1:1221:false")); assertEquals(oldQuorum.getFailedMembers().size(), 1); - assertFalse(oldQuorum.getFailedMembers().contains(RpcUtil.parseEndpoint("4:127.0.0.1:1221"))); - assertFalse(oldQuorum.getGrantedMembers().contains(RpcUtil.parseEndpoint("4:127.0.0.1:1221"))); + assertFalse(oldQuorum.getFailedMembers().contains(RpcUtil.parseEndpoint("4:127.0.0.1:1221:false"))); + assertFalse(oldQuorum.getGrantedMembers().contains(RpcUtil.parseEndpoint("4:127.0.0.1:1221:false"))); assertEquals(newQuorum.getFailedMembers().size(), 2); - assertTrue(newQuorum.getFailedMembers().contains(RpcUtil.parseEndpoint("4:127.0.0.1:1221"))); - assertFalse(newQuorum.getGrantedMembers().contains(RpcUtil.parseEndpoint("4:127.0.0.1:1221"))); + assertTrue(newQuorum.getFailedMembers().contains(RpcUtil.parseEndpoint("4:127.0.0.1:1221:false"))); + assertFalse(newQuorum.getGrantedMembers().contains(RpcUtil.parseEndpoint("4:127.0.0.1:1221:false"))); assertEquals(oldQuorum.isGranted(), Quorum.GrantResult.GRANTING); assertEquals(newQuorum.isGranted(), Quorum.GrantResult.REFUSE); assertEquals(quorum.isGranted(), Quorum.GrantResult.REFUSE); // refuse - quorum.refuse(RpcUtil.parseEndpoint("2:127.0.0.1:1219")); + quorum.refuse(RpcUtil.parseEndpoint("2:127.0.0.1:1219:false")); assertEquals(oldQuorum.getFailedMembers().size(), 2); - assertTrue(oldQuorum.getFailedMembers().contains(RpcUtil.parseEndpoint("2:127.0.0.1:1219"))); - assertFalse(oldQuorum.getGrantedMembers().contains(RpcUtil.parseEndpoint("2:127.0.0.1:1219"))); + assertTrue(oldQuorum.getFailedMembers().contains(RpcUtil.parseEndpoint("2:127.0.0.1:1219:false"))); + assertFalse(oldQuorum.getGrantedMembers().contains(RpcUtil.parseEndpoint("2:127.0.0.1:1219:false"))); assertEquals(newQuorum.getFailedMembers().size(), 3); - assertTrue(newQuorum.getFailedMembers().contains(RpcUtil.parseEndpoint("2:127.0.0.1:1219"))); - assertFalse(newQuorum.getGrantedMembers().contains(RpcUtil.parseEndpoint("2:127.0.0.1:1219"))); + assertTrue(newQuorum.getFailedMembers().contains(RpcUtil.parseEndpoint("2:127.0.0.1:1219:false"))); + assertFalse(newQuorum.getGrantedMembers().contains(RpcUtil.parseEndpoint("2:127.0.0.1:1219:false"))); assertEquals(oldQuorum.isGranted(), Quorum.GrantResult.REFUSE); assertEquals(newQuorum.isGranted(), Quorum.GrantResult.REFUSE); assertEquals(quorum.isGranted(), Quorum.GrantResult.REFUSE); @@ -72,60 +72,60 @@ public void testRefuse() { public void testGrant() { Set effect = new HashSet<>(); - effect.add(RpcUtil.parseEndpoint("1:127.0.0.1:1218")); - effect.add(RpcUtil.parseEndpoint("2:127.0.0.1:1219")); - effect.add(RpcUtil.parseEndpoint("3:127.0.0.1:1220")); + effect.add(RpcUtil.parseEndpoint("1:127.0.0.1:1218:false")); + effect.add(RpcUtil.parseEndpoint("2:127.0.0.1:1219:false")); + effect.add(RpcUtil.parseEndpoint("3:127.0.0.1:1220:false")); Set last = new HashSet<>(); - last.add(RpcUtil.parseEndpoint("1:127.0.0.1:1218")); - last.add(RpcUtil.parseEndpoint("2:127.0.0.1:1219")); - last.add(RpcUtil.parseEndpoint("3:127.0.0.1:1220")); - last.add(RpcUtil.parseEndpoint("4:127.0.0.1:1221")); + last.add(RpcUtil.parseEndpoint("1:127.0.0.1:1218:false")); + last.add(RpcUtil.parseEndpoint("2:127.0.0.1:1219:false")); + last.add(RpcUtil.parseEndpoint("3:127.0.0.1:1220:false")); + last.add(RpcUtil.parseEndpoint("4:127.0.0.1:1221:false")); JoinConsensusQuorum quorum = new JoinConsensusQuorum(effect, last, 2 , 3); SingleQuorum oldQuorum = (SingleQuorum) quorum.getOldQuorum(); SingleQuorum newQuorum = (SingleQuorum) quorum.getNewQuorum(); // granting - quorum.grant(RpcUtil.parseEndpoint("1:127.0.0.1:1218")); + quorum.grant(RpcUtil.parseEndpoint("1:127.0.0.1:1218:false")); assertEquals(oldQuorum.getGrantedMembers().size(), 1); - assertTrue(oldQuorum.getGrantedMembers().contains(RpcUtil.parseEndpoint("1:127.0.0.1:1218"))); - assertFalse(oldQuorum.getFailedMembers().contains(RpcUtil.parseEndpoint("1:127.0.0.1:1218"))); + assertTrue(oldQuorum.getGrantedMembers().contains(RpcUtil.parseEndpoint("1:127.0.0.1:1218:false"))); + assertFalse(oldQuorum.getFailedMembers().contains(RpcUtil.parseEndpoint("1:127.0.0.1:1218:false"))); assertEquals(newQuorum.getGrantedMembers().size(), 1); - assertTrue(newQuorum.getGrantedMembers().contains(RpcUtil.parseEndpoint("1:127.0.0.1:1218"))); - assertFalse(newQuorum.getFailedMembers().contains(RpcUtil.parseEndpoint("1:127.0.0.1:1218"))); + assertTrue(newQuorum.getGrantedMembers().contains(RpcUtil.parseEndpoint("1:127.0.0.1:1218:false"))); + assertFalse(newQuorum.getFailedMembers().contains(RpcUtil.parseEndpoint("1:127.0.0.1:1218:false"))); assertEquals(oldQuorum.isGranted(), Quorum.GrantResult.GRANTING); assertEquals(newQuorum.isGranted(), Quorum.GrantResult.GRANTING); assertEquals(quorum.isGranted(), Quorum.GrantResult.GRANTING); // not exists - quorum.grant(RpcUtil.parseEndpoint("-1:127.0.0.1:1218")); + quorum.grant(RpcUtil.parseEndpoint("-1:127.0.0.1:1217:false")); assertEquals(oldQuorum.getGrantedMembers().size(), 1); - assertFalse(oldQuorum.getGrantedMembers().contains(RpcUtil.parseEndpoint("-1:127.0.0.1:1218"))); + assertFalse(oldQuorum.getGrantedMembers().contains(RpcUtil.parseEndpoint("-1:127.0.0.1:1217:false"))); assertEquals(newQuorum.getGrantedMembers().size(), 1); - assertFalse(newQuorum.getGrantedMembers().contains(RpcUtil.parseEndpoint("-1:127.0.0.1:1218"))); + assertFalse(newQuorum.getGrantedMembers().contains(RpcUtil.parseEndpoint("-1:127.0.0.1:1217:false"))); assertEquals(oldQuorum.isGranted(), Quorum.GrantResult.GRANTING); assertEquals(newQuorum.isGranted(), Quorum.GrantResult.GRANTING); assertEquals(quorum.isGranted(), Quorum.GrantResult.GRANTING); // granting - quorum.grant(RpcUtil.parseEndpoint("4:127.0.0.1:1221")); + quorum.grant(RpcUtil.parseEndpoint("4:127.0.0.1:1221:false")); assertEquals(oldQuorum.getGrantedMembers().size(), 1); - assertFalse(oldQuorum.getGrantedMembers().contains(RpcUtil.parseEndpoint("4:127.0.0.1:1221"))); - assertFalse(oldQuorum.getFailedMembers().contains(RpcUtil.parseEndpoint("4:127.0.0.1:1221"))); + assertFalse(oldQuorum.getGrantedMembers().contains(RpcUtil.parseEndpoint("4:127.0.0.1:1221:false"))); + assertFalse(oldQuorum.getFailedMembers().contains(RpcUtil.parseEndpoint("4:127.0.0.1:1221:false"))); assertEquals(newQuorum.getGrantedMembers().size(), 2); - assertTrue(newQuorum.getGrantedMembers().contains(RpcUtil.parseEndpoint("4:127.0.0.1:1221"))); - assertFalse(newQuorum.getFailedMembers().contains(RpcUtil.parseEndpoint("4:127.0.0.1:1221"))); + assertTrue(newQuorum.getGrantedMembers().contains(RpcUtil.parseEndpoint("4:127.0.0.1:1221:false"))); + assertFalse(newQuorum.getFailedMembers().contains(RpcUtil.parseEndpoint("4:127.0.0.1:1221:false"))); assertEquals(oldQuorum.isGranted(), Quorum.GrantResult.GRANTING); assertEquals(newQuorum.isGranted(), Quorum.GrantResult.GRANTING); assertEquals(quorum.isGranted(), Quorum.GrantResult.GRANTING); // pass - quorum.grant(RpcUtil.parseEndpoint("2:127.0.0.1:1219")); + quorum.grant(RpcUtil.parseEndpoint("2:127.0.0.1:1219:false")); assertEquals(oldQuorum.getGrantedMembers().size(), 2); - assertTrue(oldQuorum.getGrantedMembers().contains(RpcUtil.parseEndpoint("2:127.0.0.1:1219"))); - assertFalse(oldQuorum.getFailedMembers().contains(RpcUtil.parseEndpoint("2:127.0.0.1:1219"))); + assertTrue(oldQuorum.getGrantedMembers().contains(RpcUtil.parseEndpoint("2:127.0.0.1:1219:false"))); + assertFalse(oldQuorum.getFailedMembers().contains(RpcUtil.parseEndpoint("2:127.0.0.1:1219:false"))); assertEquals(newQuorum.getGrantedMembers().size(), 3); - assertTrue(newQuorum.getGrantedMembers().contains(RpcUtil.parseEndpoint("2:127.0.0.1:1219"))); - assertFalse(newQuorum.getFailedMembers().contains(RpcUtil.parseEndpoint("2:127.0.0.1:1219"))); + assertTrue(newQuorum.getGrantedMembers().contains(RpcUtil.parseEndpoint("2:127.0.0.1:1219:false"))); + assertFalse(newQuorum.getFailedMembers().contains(RpcUtil.parseEndpoint("2:127.0.0.1:1219:false"))); assertEquals(oldQuorum.isGranted(), Quorum.GrantResult.PASS); assertEquals(newQuorum.isGranted(), Quorum.GrantResult.PASS); assertEquals(quorum.isGranted(), Quorum.GrantResult.PASS); diff --git a/klein-consensus/klein-consensus-facade/src/test/java/com/ofcoder/klein/consensus/facade/quorum/SingleQuorumTest.java b/klein-consensus/klein-consensus-facade/src/test/java/com/ofcoder/klein/consensus/facade/quorum/SingleQuorumTest.java index fcdae1c3..911c81ea 100644 --- a/klein-consensus/klein-consensus-facade/src/test/java/com/ofcoder/klein/consensus/facade/quorum/SingleQuorumTest.java +++ b/klein-consensus/klein-consensus-facade/src/test/java/com/ofcoder/klein/consensus/facade/quorum/SingleQuorumTest.java @@ -11,29 +11,28 @@ public class SingleQuorumTest extends TestCase { public void testIsGranted() { Set members = new HashSet<>(); - members.add(RpcUtil.parseEndpoint("1:127.0.0.1:1218")); - members.add(RpcUtil.parseEndpoint("2:127.0.0.1:1219")); - members.add(RpcUtil.parseEndpoint("3:127.0.0.1:1220")); + members.add(RpcUtil.parseEndpoint("1:127.0.0.1:1218:false")); + members.add(RpcUtil.parseEndpoint("2:127.0.0.1:1219:false")); + members.add(RpcUtil.parseEndpoint("3:127.0.0.1:1220:false")); SingleQuorum passQuorum = new SingleQuorum(members, 2); - passQuorum.grant(RpcUtil.parseEndpoint("1:127.0.0.1:1218")); + passQuorum.grant(RpcUtil.parseEndpoint("1:127.0.0.1:1218:false")); assertEquals(passQuorum.isGranted(), Quorum.GrantResult.GRANTING); - passQuorum.grant(RpcUtil.parseEndpoint("4:127.0.0.1:1219")); + passQuorum.grant(RpcUtil.parseEndpoint("4:127.0.0.1:1221:false")); assertEquals(passQuorum.isGranted(), Quorum.GrantResult.GRANTING); - passQuorum.grant(RpcUtil.parseEndpoint("2:127.0.0.1:1219")); + passQuorum.grant(RpcUtil.parseEndpoint("2:127.0.0.1:1219:false")); assertEquals(passQuorum.isGranted(), Quorum.GrantResult.PASS); - SingleQuorum refuseQuorum = new SingleQuorum(members, 2); - refuseQuorum.refuse(RpcUtil.parseEndpoint("1:127.0.0.1:1218")); + refuseQuorum.refuse(RpcUtil.parseEndpoint("1:127.0.0.1:1218:false")); assertEquals(refuseQuorum.isGranted(), Quorum.GrantResult.GRANTING); - refuseQuorum.refuse(RpcUtil.parseEndpoint("1:127.0.0.1:1218")); + refuseQuorum.refuse(RpcUtil.parseEndpoint("1:127.0.0.1:1218:false")); assertEquals(refuseQuorum.isGranted(), Quorum.GrantResult.GRANTING); - refuseQuorum.refuse(RpcUtil.parseEndpoint("2:127.0.0.1:1219")); + refuseQuorum.refuse(RpcUtil.parseEndpoint("2:127.0.0.1:1219:false")); assertEquals(refuseQuorum.isGranted(), Quorum.GrantResult.REFUSE); } From 9ebebd209362f51704d46aff4502f078f34fde47 Mon Sep 17 00:00:00 2001 From: shihuili1218 Date: Sun, 28 Jan 2024 18:36:16 +0800 Subject: [PATCH 4/7] readme --- readme.md | 5 ++++- readme_zh_cn.md | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/readme.md b/readme.md index 1fe48232..e17204fd 100644 --- a/readme.md +++ b/readme.md @@ -48,7 +48,10 @@ If you are interested in distributed message queue, distributed List, distribute ### startup ``` Klein instance = Klein.startup(); -instance.getCache().put("hello", "klein"); +instance.awaitInit(); + +KleinCache klein = KleinFactory.getInstance().createCache("klein"); +klein.put("hello", "klein"); ``` ### set property For all configurable parameters, see: `com.ofcoder.klein.KleinProp` diff --git a/readme_zh_cn.md b/readme_zh_cn.md index 44662213..f4c47258 100644 --- a/readme_zh_cn.md +++ b/readme_zh_cn.md @@ -48,7 +48,10 @@ Klein是一个基于Paxos的分布式集合工具库，包括分布式Cache、 ### 启动 ``` Klein instance = Klein.startup(); -instance.getCache().put("hello", "klein"); +instance.awaitInit(); + +KleinCache klein = KleinFactory.getInstance().createCache("klein"); +klein.put("hello", "klein"); ``` ### 配置 所有可配置的参数，请查看：`com.ofcoder.klein.KleinProp` From b574fbf34497fffc5e4b123d0d7b1388d5e88d17 Mon Sep 17 00:00:00 2001 From: shihuili1218 Date: Sun, 28 Jan 2024 18:42:45 +0800 Subject: [PATCH 5/7] pom upgrade --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 694bfced..e2f9d2e7 100644 --- a/pom.xml +++ b/pom.xml @@ -59,8 +59,8 @@ 3.3.7 3.12.0 - 2.6 - 31.1-jre + 2.15.1 + 33.0.0-jre 4.4 1.7.21 @@ -71,7 +71,7 @@ 3.20.0-GA 2.1.214 4.13.1 - 4.8.2 + 4.11 1.3 1.9.5 3.21.7 From 050e9df20bc4df469fa497ce065edb6addd6cf5e Mon Sep 17 00:00:00 2001 From: shihuili1218 Date: Sun, 28 Jan 2024 18:53:02 +0800 Subject: [PATCH 6/7] 0.0.3 --- klein-common/pom.xml | 4 ++-- klein-consensus/klein-consensus-facade/pom.xml | 4 ++-- klein-consensus/klein-consensus-paxos/pom.xml | 4 ++-- klein-consensus/pom.xml | 4 ++-- klein-core/pom.xml | 4 ++-- klein-example/pom.xml | 8 ++++---- klein-jepsen/klein-jepsen-server/pom.xml | 4 ++-- klein-jepsen/pom.xml | 4 ++-- klein-rpc/klein-rpc-facade/pom.xml | 4 ++-- klein-rpc/klein-rpc-grpc/pom.xml | 4 ++-- klein-rpc/pom.xml | 4 ++-- klein-spi/pom.xml | 4 ++-- klein-storage/klein-storage-facade/pom.xml | 4 ++-- klein-storage/klein-storage-file/pom.xml | 4 ++-- klein-storage/klein-storage-h2/pom.xml | 4 ++-- klein-storage/pom.xml | 4 ++-- pom.xml | 6 +++--- 17 files changed, 37 insertions(+), 37 deletions(-) diff --git a/klein-common/pom.xml b/klein-common/pom.xml index 735f5733..21e66a53 100644 --- a/klein-common/pom.xml +++ b/klein-common/pom.xml @@ -5,13 +5,13 @@ klein com.ofcoder.klein - 0.0.2 + 0.0.3-alpha 4.0.0 com.ofcoder.klein.common klein-common - 0.0.2 + 0.0.3-alpha jar diff --git a/klein-consensus/klein-consensus-facade/pom.xml b/klein-consensus/klein-consensus-facade/pom.xml index 585b3663..377edcd0 100644 --- a/klein-consensus/klein-consensus-facade/pom.xml +++ b/klein-consensus/klein-consensus-facade/pom.xml @@ -5,13 +5,13 @@ klein-consensus com.ofcoder.klein.consensus - 0.0.2 + 0.0.3-alpha 4.0.0 com.ofcoder.klein.consensus.facade klein-consensus-facade - 0.0.2 + 0.0.3-alpha jar diff --git a/klein-consensus/klein-consensus-paxos/pom.xml b/klein-consensus/klein-consensus-paxos/pom.xml index 24df70b4..a8a2ff98 100644 --- a/klein-consensus/klein-consensus-paxos/pom.xml +++ b/klein-consensus/klein-consensus-paxos/pom.xml @@ -5,13 +5,13 @@ klein-consensus com.ofcoder.klein.consensus - 0.0.2 + 0.0.3-alpha 4.0.0 com.ofcoder.klein.consensus.paxos klein-consensus-paxos - 0.0.2 + 0.0.3-alpha jar diff --git a/klein-consensus/pom.xml b/klein-consensus/pom.xml index df1fb609..74edd0bb 100644 --- a/klein-consensus/pom.xml +++ b/klein-consensus/pom.xml @@ -5,14 +5,14 @@ klein com.ofcoder.klein - 0.0.2 + 0.0.3-alpha 4.0.0 com.ofcoder.klein.consensus klein-consensus pom - 0.0.2 + 0.0.3-alpha klein-consensus-paxos diff --git a/klein-core/pom.xml b/klein-core/pom.xml index 0275e40a..68d9fc91 100644 --- a/klein-core/pom.xml +++ b/klein-core/pom.xml @@ -5,13 +5,13 @@ klein com.ofcoder.klein - 0.0.2 + 0.0.3-alpha 4.0.0 com.ofcoder.klein.core klein-core - 0.0.2 + 0.0.3-alpha jar diff --git a/klein-example/pom.xml b/klein-example/pom.xml index 34909c32..530cd9a0 100644 --- a/klein-example/pom.xml +++ b/klein-example/pom.xml @@ -5,21 +5,21 @@ klein com.ofcoder.klein - 0.0.2 + 0.0.3-alpha 4.0.0 com.ofcoder.klein.example klein-example - 0.0.2 + 0.0.3-alpha jar 8 8 UTF-8 - 2.10.5.1 - 2.10.4 + 2.16.1 + 2.16.1 diff --git a/klein-jepsen/klein-jepsen-server/pom.xml b/klein-jepsen/klein-jepsen-server/pom.xml index 6237995b..ca4e7888 100644 --- a/klein-jepsen/klein-jepsen-server/pom.xml +++ b/klein-jepsen/klein-jepsen-server/pom.xml @@ -5,13 +5,13 @@ klein-jepsen com.ofcoder.klein.jepsen - 0.0.2 + 0.0.3-alpha 4.0.0 com.ofcoder.klein.jepsen.server klein-jepsen-server - 0.0.2 + 0.0.3-alpha jar diff --git a/klein-jepsen/pom.xml b/klein-jepsen/pom.xml index dda43cc2..426badde 100644 --- a/klein-jepsen/pom.xml +++ b/klein-jepsen/pom.xml @@ -5,13 +5,13 @@ klein com.ofcoder.klein - 0.0.2 + 0.0.3-alpha 4.0.0 com.ofcoder.klein.jepsen klein-jepsen - 0.0.2 + 0.0.3-alpha pom klein-jepsen-server diff --git a/klein-rpc/klein-rpc-facade/pom.xml b/klein-rpc/klein-rpc-facade/pom.xml index 2c2d27b6..432cb515 100644 --- a/klein-rpc/klein-rpc-facade/pom.xml +++ b/klein-rpc/klein-rpc-facade/pom.xml @@ -5,13 +5,13 @@ klein-rpc com.ofcoder.klein.rpc - 0.0.2 + 0.0.3-alpha 4.0.0 com.ofcoder.klein.rpc.facade klein-rpc-facade - 0.0.2 + 0.0.3-alpha jar diff --git a/klein-rpc/klein-rpc-grpc/pom.xml b/klein-rpc/klein-rpc-grpc/pom.xml index 32800d4e..acec1a31 100644 --- a/klein-rpc/klein-rpc-grpc/pom.xml +++ b/klein-rpc/klein-rpc-grpc/pom.xml @@ -5,13 +5,13 @@ klein-rpc com.ofcoder.klein.rpc - 0.0.2 + 0.0.3-alpha 4.0.0 com.ofcoder.klein.rpc.grpc klein-rpc-grpc - 0.0.2 + 0.0.3-alpha jar diff --git a/klein-rpc/pom.xml b/klein-rpc/pom.xml index b8728503..2211ef03 100644 --- a/klein-rpc/pom.xml +++ b/klein-rpc/pom.xml @@ -5,14 +5,14 @@ klein com.ofcoder.klein - 0.0.2 + 0.0.3-alpha 4.0.0 com.ofcoder.klein.rpc klein-rpc pom - 0.0.2 + 0.0.3-alpha klein-rpc-grpc diff --git a/klein-spi/pom.xml b/klein-spi/pom.xml index a475c80c..915c2e39 100644 --- a/klein-spi/pom.xml +++ b/klein-spi/pom.xml @@ -5,13 +5,13 @@ klein com.ofcoder.klein - 0.0.2 + 0.0.3-alpha 4.0.0 com.ofcoder.klein.spi klein-spi - 0.0.2 + 0.0.3-alpha jar diff --git a/klein-storage/klein-storage-facade/pom.xml b/klein-storage/klein-storage-facade/pom.xml index 858b25ff..6c7ef965 100644 --- a/klein-storage/klein-storage-facade/pom.xml +++ b/klein-storage/klein-storage-facade/pom.xml @@ -5,13 +5,13 @@ klein-storage com.ofcoder.klein.storage - 0.0.2 + 0.0.3-alpha 4.0.0 com.ofcoder.klein.storage.api klein-storage-facade - 0.0.2 + 0.0.3-alpha jar diff --git a/klein-storage/klein-storage-file/pom.xml b/klein-storage/klein-storage-file/pom.xml index fbda6f8f..90bc63f9 100644 --- a/klein-storage/klein-storage-file/pom.xml +++ b/klein-storage/klein-storage-file/pom.xml @@ -5,13 +5,13 @@ klein-storage com.ofcoder.klein.storage - 0.0.2 + 0.0.3-alpha 4.0.0 com.ofcoder.klein.storage.file klein-storage-file - 0.0.2 + 0.0.3-alpha jar diff --git a/klein-storage/klein-storage-h2/pom.xml b/klein-storage/klein-storage-h2/pom.xml index a1741a19..94cd6de1 100644 --- a/klein-storage/klein-storage-h2/pom.xml +++ b/klein-storage/klein-storage-h2/pom.xml @@ -5,13 +5,13 @@ klein-storage com.ofcoder.klein.storage - 0.0.2 + 0.0.3-alpha 4.0.0 com.ofcoder.klein.storage.h2 klein-storage-h2 - 0.0.2 + 0.0.3-alpha jar diff --git a/klein-storage/pom.xml b/klein-storage/pom.xml index 4d75cd1b..10eb5bc2 100644 --- a/klein-storage/pom.xml +++ b/klein-storage/pom.xml @@ -5,14 +5,14 @@ klein com.ofcoder.klein - 0.0.2 + 0.0.3-alpha 4.0.0 com.ofcoder.klein.storage klein-storage pom - 0.0.2 + 0.0.3-alpha klein-storage-facade diff --git a/pom.xml b/pom.xml index e2f9d2e7..5bcfd35b 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ com.ofcoder.klein klein pom - 0.0.2 + 0.0.3-alpha Klein is a Paxos based distributed collection tool library https://klein-doc.gitbook.io/ @@ -69,7 +69,7 @@ 3.10.6.Final 4.0.66 3.20.0-GA - 2.1.214 + 2.2.224 4.13.1 4.11 1.3 @@ -77,7 +77,7 @@ 3.21.7 1.50.0 - 3.0.9 + 3.1.0 3.1.0 From 43552ebbc41e9c00c4886bcefdf0ff1b08a45a12 Mon Sep 17 00:00:00 2001 From: shihuili1218 Date: Sun, 28 Jan 2024 19:00:34 +0800 Subject: [PATCH 7/7] 0.0.3 --- .../java/com/ofcoder/klein/consensus/paxos/PaxosNodeTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/klein-consensus/klein-consensus-paxos/src/test/java/com/ofcoder/klein/consensus/paxos/PaxosNodeTest.java b/klein-consensus/klein-consensus-paxos/src/test/java/com/ofcoder/klein/consensus/paxos/PaxosNodeTest.java index eae94293..38f5bfcc 100644 --- a/klein-consensus/klein-consensus-paxos/src/test/java/com/ofcoder/klein/consensus/paxos/PaxosNodeTest.java +++ b/klein-consensus/klein-consensus-paxos/src/test/java/com/ofcoder/klein/consensus/paxos/PaxosNodeTest.java @@ -14,7 +14,7 @@ public class PaxosNodeTest extends TestCase { public void testGenerateNextProposalNo() { - ExtensionLoader.getExtensionLoader(Nwr.class).getJoin("majority"); + ExtensionLoader.getExtensionLoader(Nwr.class).register("majority"); MemberRegistry.getInstance().init( null, Lists.newArrayList(new Endpoint("1", "127.0.0.1", 1218, false), new Endpoint("2", "127.0.0.1", 1219, false), new Endpoint("3", "127.0.0.1", 1220, false))