Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ruanhaishen
Willemt Raft
Commits
8fb1f6c0
Commit
8fb1f6c0
authored
Oct 01, 2015
by
Willem Thiart
Browse files
Remove num_nodes from raft_entry_t
parent
14d65292
Changes
4
Hide whitespace changes
Inline
Side-by-side
include/raft.h
View file @
8fb1f6c0
...
...
@@ -138,9 +138,6 @@ typedef struct
/** the entry's unique ID */
unsigned
int
id
;
/** number of nodes that have this entry */
unsigned
int
num_nodes
;
raft_entry_data_t
data
;
}
raft_entry_t
;
...
...
include/raft_log.h
View file @
8fb1f6c0
...
...
@@ -39,8 +39,6 @@ raft_entry_t* log_get_from_idx(log_t* me_, int idx);
* @return youngest entry */
raft_entry_t
*
log_peektail
(
log_t
*
me_
);
void
log_mark_node_has_committed
(
log_t
*
me_
,
int
idx
);
void
log_delete
(
log_t
*
me_
,
int
idx
);
int
log_get_current_idx
(
log_t
*
me_
);
...
...
src/raft_log.c
View file @
8fb1f6c0
...
...
@@ -96,7 +96,6 @@ int log_append_entry(log_t* me_, raft_entry_t* c)
__ensurecapacity
(
me
);
memcpy
(
&
me
->
entries
[
me
->
back
],
c
,
sizeof
(
raft_entry_t
));
me
->
entries
[
me
->
back
].
num_nodes
=
0
;
if
(
me
->
cb
&&
me
->
cb
->
log_offer
)
me
->
cb
->
log_offer
(
me
->
raft
,
raft_get_udata
(
me
->
raft
),
c
,
me
->
back
);
me
->
count
++
;
...
...
@@ -192,13 +191,6 @@ void log_free(log_t * me_)
free
(
me
);
}
void
log_mark_node_has_committed
(
log_t
*
me_
,
int
idx
)
{
raft_entry_t
*
e
=
log_get_from_idx
(
me_
,
idx
);
if
(
e
)
e
->
num_nodes
+=
1
;
}
int
log_get_current_idx
(
log_t
*
me_
)
{
log_private_t
*
me
=
(
log_private_t
*
)
me_
;
...
...
tests/test_log.c
View file @
8fb1f6c0
#include <stdbool.h>
#include <assert.h>
#include <stdlib.h>
...
...
@@ -60,21 +59,6 @@ void TestLog_get_at_idx_returns_null_where_out_of_bounds(CuTest * tc)
CuAssertTrue
(
tc
,
NULL
==
log_get_from_idx
(
l
,
2
));
}
void
TestLog_mark_node_has_committed_adds_nodes
(
CuTest
*
tc
)
{
void
*
l
;
raft_entry_t
e1
;
l
=
log_new
();
e1
.
id
=
1
;
log_append_entry
(
l
,
&
e1
);
CuAssertTrue
(
tc
,
0
==
log_get_from_idx
(
l
,
1
)
->
num_nodes
);
log_mark_node_has_committed
(
l
,
1
);
CuAssertTrue
(
tc
,
1
==
log_get_from_idx
(
l
,
1
)
->
num_nodes
);
log_mark_node_has_committed
(
l
,
1
);
CuAssertTrue
(
tc
,
2
==
log_get_from_idx
(
l
,
1
)
->
num_nodes
);
}
void
TestLog_delete
(
CuTest
*
tc
)
{
void
*
l
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment