vitalif
/
etcd
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

raft : Write compact if statements

release-3.5
nilsocket 2019-08-02 02:56:10 +05:30
parent d5bd600aa5
commit 702c69c906
No known key found for this signature in database
GPG Key ID: 99BA5E54C20FEAB6
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
raft/log_unstable.go
View File

@ -55,10 +55,7 @@ func (u *unstable) maybeLastIndex() (uint64, bool) {
// is any. // is any.
func (u *unstable) maybeTerm(i uint64) (uint64, bool) { func (u *unstable) maybeTerm(i uint64) (uint64, bool) {
if i < u.offset { if i < u.offset {
if u.snapshot == nil { if u.snapshot != nil && u.snapshot.Metadata.Index == i {
return 0, false
}
if u.snapshot.Metadata.Index == i {
return u.snapshot.Metadata.Term, true return u.snapshot.Metadata.Term, true
} }
return 0, false return 0, false
@ -71,6 +68,7 @@ func (u *unstable) maybeTerm(i uint64) (uint64, bool) {
if i > last { if i > last {
return 0, false return 0, false
} }
return u.entries[i-u.offset].Term, true return u.entries[i-u.offset].Term, true
} }