Remove num_nodes from raft_entry_t

willemt · Oct 1, 2015 · 8fb1f6c · 8fb1f6c
1 parent 14d6529
commit 8fb1f6c
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 29 deletions.
diff --git a/include/raft.h b/include/raft.h
@@ -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;
 

diff --git a/include/raft_log.h b/include/raft_log.h
@@ -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_);

diff --git a/src/raft_log.c b/src/raft_log.c
@@ -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_;

diff --git a/tests/test_log.c b/tests/test_log.c
@@ -1,4 +1,3 @@
-
 #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;