Parcourir la source

Merge pull request #4195 from davygeek/master

follow golint notice replace '+=1' to '++'
Xiang Li il y a 10 ans
Parent
commit
1df478ea5d
2 fichiers modifiés avec 3 ajouts et 3 suppressions
  1. 1 1
      raft/progress.go
  2. 2 2
      raft/raft.go

+ 1 - 1
raft/progress.go

@@ -220,7 +220,7 @@ func (in *inflights) freeTo(to uint64) {
 		}
 		}
 
 
 		// increase index and maybe rotate
 		// increase index and maybe rotate
-		if idx += 1; idx >= in.size {
+		if idx++; idx >= in.size {
 			idx -= in.size
 			idx -= in.size
 		}
 		}
 	}
 	}

+ 2 - 2
raft/raft.go

@@ -868,12 +868,12 @@ func (r *raft) checkQuorumActive() bool {
 
 
 	for id := range r.prs {
 	for id := range r.prs {
 		if id == r.id { // self is always active
 		if id == r.id { // self is always active
-			act += 1
+			act++
 			continue
 			continue
 		}
 		}
 
 
 		if r.prs[id].RecentActive {
 		if r.prs[id].RecentActive {
-			act += 1
+			act++
 		}
 		}
 
 
 		r.prs[id].RecentActive = false
 		r.prs[id].RecentActive = false