Commit 72b88b94 authored by Willem Thiart's avatar Willem Thiart
Browse files

Migrated source to new struct

parent 92b2f9a9
...@@ -321,10 +321,10 @@ int raft_recv_appendentries( ...@@ -321,10 +321,10 @@ int raft_recv_appendentries(
/* TODO: replace malloc with mempoll/arena */ /* TODO: replace malloc with mempoll/arena */
raft_entry_t* c = (raft_entry_t*)malloc(sizeof(raft_entry_t)); raft_entry_t* c = (raft_entry_t*)malloc(sizeof(raft_entry_t));
c->term = me->current_term; c->term = me->current_term;
c->len = cmd->len; c->len = cmd->data.len;
c->id = cmd->id; c->id = cmd->id;
c->data = (unsigned char*)malloc(cmd->len); c->data = (unsigned char*)malloc(cmd->data.len);
memcpy(c->data, cmd->data, cmd->len); memcpy(c->data, cmd->data.buf, cmd->data.len);
if (-1 == raft_append_entry(me_, c)) if (-1 == raft_append_entry(me_, c))
{ {
__log(me_, "AE failure; couldn't append entry"); __log(me_, "AE failure; couldn't append entry");
...@@ -419,9 +419,9 @@ int raft_recv_entry(raft_server_t* me_, int node, msg_entry_t* e, ...@@ -419,9 +419,9 @@ int raft_recv_entry(raft_server_t* me_, int node, msg_entry_t* e,
ety.term = me->current_term; ety.term = me->current_term;
ety.id = e->id; ety.id = e->id;
ety.len = e->len; ety.len = e->data.len;
ety.data = malloc(e->len); ety.data = malloc(e->data.len);
memcpy(ety.data, e->data, e->len); memcpy(ety.data, e->data.buf, e->data.len);
res = raft_append_entry(me_, &ety); res = raft_append_entry(me_, &ety);
for (i = 0; i < me->num_nodes; i++) for (i = 0; i < me->num_nodes; i++)
if (me->nodeid != i) if (me->nodeid != i)
......
...@@ -643,8 +643,8 @@ void TestRaft_follower_increases_log_after_appendentry(CuTest * tc) ...@@ -643,8 +643,8 @@ void TestRaft_follower_increases_log_after_appendentry(CuTest * tc)
ae.leader_commit = 5; ae.leader_commit = 5;
/* include one entry */ /* include one entry */
memset(&ety, 0, sizeof(msg_entry_t)); memset(&ety, 0, sizeof(msg_entry_t));
ety.data = str; ety.data.buf = str;
ety.len = 3; ety.data.len = 3;
ety.id = 1; ety.id = 1;
ae.entries = &ety; ae.entries = &ety;
ae.n_entries = 1; ae.n_entries = 1;
...@@ -690,8 +690,8 @@ TestRaft_follower_recv_appendentries_reply_false_if_doesnt_have_log_at_prev_log_ ...@@ -690,8 +690,8 @@ TestRaft_follower_recv_appendentries_reply_false_if_doesnt_have_log_at_prev_log_
ae.prev_log_term = 1; ae.prev_log_term = 1;
/* include one entry */ /* include one entry */
memset(&ety, 0, sizeof(msg_entry_t)); memset(&ety, 0, sizeof(msg_entry_t));
ety.data = str; ety.data.buf = str;
ety.len = 3; ety.data.len = 3;
ety.id = 1; ety.id = 1;
ae.entries = &ety; ae.entries = &ety;
ae.n_entries = 1; ae.n_entries = 1;
...@@ -758,8 +758,8 @@ TestRaft_follower_recv_appendentries_delete_entries_if_conflict_with_new_entries ...@@ -758,8 +758,8 @@ TestRaft_follower_recv_appendentries_delete_entries_if_conflict_with_new_entries
/* include one entry */ /* include one entry */
memset(&mety, 0, sizeof(msg_entry_t)); memset(&mety, 0, sizeof(msg_entry_t));
char *str3 = "333"; char *str3 = "333";
mety.data = str3; mety.data.buf = str3;
mety.len = 3; mety.data.len = 3;
mety.id = 3; mety.id = 3;
ae.entries = &mety; ae.entries = &mety;
ae.n_entries = 1; ae.n_entries = 1;
...@@ -1386,8 +1386,8 @@ void TestRaft_leader_responds_to_entry_msg_when_entry_is_committed(CuTest * tc) ...@@ -1386,8 +1386,8 @@ void TestRaft_leader_responds_to_entry_msg_when_entry_is_committed(CuTest * tc)
/* entry message */ /* entry message */
msg_entry_t ety; msg_entry_t ety;
ety.id = 1; ety.id = 1;
ety.data = "entry"; ety.data.buf = "entry";
ety.len = strlen("entry"); ety.data.len = strlen("entry");
/* receive entry */ /* receive entry */
raft_recv_entry(r, 1, &ety, &cr); raft_recv_entry(r, 1, &ety, &cr);
...@@ -1418,8 +1418,8 @@ void TestRaft_non_leader_recv_entry_msg_fails(CuTest * tc) ...@@ -1418,8 +1418,8 @@ void TestRaft_non_leader_recv_entry_msg_fails(CuTest * tc)
/* entry message */ /* entry message */
msg_entry_t ety; msg_entry_t ety;
ety.id = 1; ety.id = 1;
ety.data = "entry"; ety.data.buf = "entry";
ety.len = strlen("entry"); ety.data.len = strlen("entry");
/* receive entry */ /* receive entry */
int e = raft_recv_entry(r, 1, &ety, &cr); int e = raft_recv_entry(r, 1, &ety, &cr);
...@@ -1524,8 +1524,8 @@ void TestRaft_leader_append_entry_to_log_increases_idxno(CuTest * tc) ...@@ -1524,8 +1524,8 @@ void TestRaft_leader_append_entry_to_log_increases_idxno(CuTest * tc)
msg_entry_response_t cr; msg_entry_response_t cr;
ety.id = 1; ety.id = 1;
ety.data = "entry"; ety.data.buf = "entry";
ety.len = strlen("entry"); ety.data.len = strlen("entry");
r = raft_new(); r = raft_new();
raft_add_peer(r, (void*)1, 1); raft_add_peer(r, (void*)1, 1);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment