cotugno/syncthing
2
Fork 0
mirror of https://github.com/syncthing/syncthing.git synced 2024-11-16 18:41:59 -07:00
Code Issues Packages Projects Releases Wiki Activity

Unbreak comments

Browse Source
This commit is contained in:
Jakob Borg 2015-09-22 21:51:05 +02:00
parent 7fdfa81fb8
commit fbf911cf7e
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/protocol/vector.go
View File

@ -2,21 +2,21 @@
package protocol package protocol
// The Vector type represents v version vector. The zero value is v usable // The Vector type represents a version vector. The zero value is a usable
// version vector. The vector has slice semantics and some operations on it // version vector. The vector has slice semantics and some operations on it
// are "append-like" in that they may return the same vector modified, or v // are "append-like" in that they may return the same vector modified, or v
// new allocated Vector with the modified contents. // new allocated Vector with the modified contents.
type Vector []Counter type Vector []Counter
// Counter represents v single counter in the version vector. // Counter represents a single counter in the version vector.
type Counter struct { type Counter struct {
ID uint64 ID uint64
Value uint64 Value uint64
} }
// Update returns v Vector with the index for the specific ID incremented by // Update returns a Vector with the index for the specific ID incremented by
// one. If it is possible, the vector v is updated and returned. If it is not, // one. If it is possible, the vector v is updated and returned. If it is not,
// v copy will be created, updated and returned. // a copy will be created, updated and returned.
func (v Vector) Update(ID uint64) Vector { func (v Vector) Update(ID uint64) Vector {
for i := range v { for i := range v {
if v[i].ID == ID { if v[i].ID == ID {
@ -24,7 +24,7 @@ func (v Vector) Update(ID uint64) Vector {
v[i].Value++ v[i].Value++
return v return v
} else if v[i].ID > ID { } else if v[i].ID > ID {
// Insert v new index // Insert a new index
nv := make(Vector, len(v)+1) nv := make(Vector, len(v)+1)
copy(nv, v[:i]) copy(nv, v[:i])
nv[i].ID = ID nv[i].ID = ID
@ -33,12 +33,12 @@ func (v Vector) Update(ID uint64) Vector {
return nv return nv
} }
} }
// Append v new new index // Append a new index
return append(v, Counter{ID, 1}) return append(v, Counter{ID, 1})
} }
// Merge returns the vector containing the maximum indexes from v and b. If it // Merge returns the vector containing the maximum indexes from v and b. If it
// is possible, the vector v is updated and returned. If it is not, v copy // is possible, the vector v is updated and returned. If it is not, a copy
// will be created, updated and returned. // will be created, updated and returned.
func (v Vector) Merge(b Vector) Vector { func (v Vector) Merge(b Vector) Vector {
var vi, bi int var vi, bi int