Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

raft: refine raftLog.term

Browse Source
This commit is contained in:
Yicheng Qin 2014-11-24 23:27:57 -08:00
parent 7fcaca6d18
commit 0d200baf72
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
raft/log.go
View File

@ -195,24 +195,23 @@ func (l *raftLog) lastTerm() uint64 {
} }
func (l *raftLog) term(i uint64) uint64 { func (l *raftLog) term(i uint64) uint64 {
if i >= l.unstable+uint64(len(l.unstableEnts)) { switch {
case i > l.lastIndex():
return 0 return 0
} case i < l.unstable:
if i < l.unstable {
t, err := l.storage.Term(i) t, err := l.storage.Term(i)
if err == nil { switch err {
case nil:
return t return t
} case ErrCompacted:
if err == ErrCompacted {
return 0 return 0
} else { default:
panic(err) // TODO(bdarnell) panic(err) // TODO(bdarnell)
} }
} default:
return l.unstableEnts[i-l.unstable].Term return l.unstableEnts[i-l.unstable].Term
} }
}
func (l *raftLog) entries(i uint64) []pb.Entry { func (l *raftLog) entries(i uint64) []pb.Entry {
return l.slice(i, l.lastIndex()+1) return l.slice(i, l.lastIndex()+1)