Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add checksum to confirm message #83

Merged
merged 7 commits into from
Jan 28, 2024
Merged

add checksum to confirm message #83

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
5ce71af
test
shihuili1218 Jan 28, 2024
2f4104d
example
shihuili1218 Jan 28, 2024
5a043b6
test
shihuili1218 Jan 28, 2024
9ebebd2
readme
shihuili1218 Jan 28, 2024
b574fbf
pom upgrade
shihuili1218 Jan 28, 2024
050e9df
0.0.3
shihuili1218 Jan 28, 2024
43552eb
0.0.3
shihuili1218 Jan 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions klein-common/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@
<parent>
<artifactId>klein</artifactId>
<groupId>com.ofcoder.klein</groupId>
<version>0.0.2</version>
<version>0.0.3-alpha</version>
</parent>
<modelVersion>4.0.0</modelVersion>

<groupId>com.ofcoder.klein.common</groupId>
<artifactId>klein-common</artifactId>
<version>0.0.2</version>
<version>0.0.3-alpha</version>
<packaging>jar</packaging>

<properties>
Expand Down
4 changes: 2 additions & 2 deletions klein-consensus/klein-consensus-facade/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@
<parent>
<artifactId>klein-consensus</artifactId>
<groupId>com.ofcoder.klein.consensus</groupId>
<version>0.0.2</version>
<version>0.0.3-alpha</version>
</parent>
<modelVersion>4.0.0</modelVersion>

<groupId>com.ofcoder.klein.consensus.facade</groupId>
<artifactId>klein-consensus-facade</artifactId>
<version>0.0.2</version>
<version>0.0.3-alpha</version>
<packaging>jar</packaging>

<properties>
Expand Down
4 changes: 2 additions & 2 deletions ...nsensus-facade/src/main/java/com/ofcoder/klein/consensus/facade/config/ConsensusProp.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,16 +34,16 @@
private Endpoint self = new Endpoint(
SystemPropertyUtil.get("klein.id", "1"),
SystemPropertyUtil.get("klein.ip", "127.0.0.1"),
SystemPropertyUtil.getInt("klein.port", 1218),
SystemPropertyUtil.getBoolean("klein.outsider", false)

Check warning on line 38 in klein-consensus/klein-consensus-facade/src/main/java/com/ofcoder/klein/consensus/facade/config/ConsensusProp.java

View check run for this annotation

Codecov / codecov/patch

klein-consensus/klein-consensus-facade/src/main/java/com/ofcoder/klein/consensus/facade/config/ConsensusProp.java#L37-L38 

Added lines #L37 - L38 were not covered by tests
);
/**
* all member, include self.
*/
private List<Endpoint> members = parseMember(SystemPropertyUtil.get("klein.members", "1:127.0.0.1:1218:false"));

Check warning on line 43 in klein-consensus/klein-consensus-facade/src/main/java/com/ofcoder/klein/consensus/facade/config/ConsensusProp.java

View check run for this annotation

Codecov / codecov/patch

klein-consensus/klein-consensus-facade/src/main/java/com/ofcoder/klein/consensus/facade/config/ConsensusProp.java#L43 

Added line #L43 was not covered by tests
/**
* 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);
/**
Expand Down
62 changes: 31 additions & 31 deletions ...nsus-facade/src/test/java/com/ofcoder/klein/consensus/facade/MemberConfigurationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@
public class MemberConfigurationTest extends TestCase {

public void testInit() {
List<Endpoint> 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<Endpoint> 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);

Expand All @@ -24,14 +24,14 @@ public void testInit() {

public void testSeenNewConfig() {
List<Endpoint> 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);
Expand All @@ -41,15 +41,15 @@ public void testSeenNewConfig() {

public void testGetEndpointById() {
List<Endpoint> 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));

Expand All @@ -72,15 +72,15 @@ public void testGetEndpointById() {

public void testIsValid() {
List<Endpoint> 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));

Expand All @@ -94,15 +94,15 @@ public void testIsValid() {

public void testGetMembersWithout() {
List<Endpoint> 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));

Expand All @@ -116,15 +116,15 @@ public void testGetMembersWithout() {

public void testGetLastMembers() {
List<Endpoint> 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));

Expand All @@ -133,15 +133,15 @@ public void testGetLastMembers() {

public void testGetEffectMembers() {
List<Endpoint> 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));

Expand All @@ -150,15 +150,15 @@ public void testGetEffectMembers() {

public void testEffectiveNewConfig() {
List<Endpoint> 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));
Expand Down
8 changes: 4 additions & 4 deletions .../klein-consensus-facade/src/test/java/com/ofcoder/klein/consensus/facade/nwr/NwrTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
Loading
Loading