Browse Source

Merge pull request #10971 from nilsocket/codeReformat

raft : write compact if statements
Xiang Li 6 years ago
parent
commit
f4dfd1976d
1 changed files with 2 additions and 4 deletions
  1. 2 4
      raft/log_unstable.go

+ 2 - 4
raft/log_unstable.go

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