refactor: extract a helper
This commit is contained in:
1 parent
a1823af745
commit
c1d98ba59c
1 file changed
+10
-11
+10
-11
@@ -239,10 +239,15 @@ func (r *Ring) Merge(gossip Ring) (bool, error) {
|
|||||||
// indication whether the merge resulted in any changes, i.e. the
|
// indication whether the merge resulted in any changes, i.e. the
|
||||||
// result differs from the original.
|
// result differs from the original.
|
||||||
func (es entries) merge(other entries, ourPeer mesh.PeerName) (result entries, updated bool, err error) {
|
func (es entries) merge(other entries, ourPeer mesh.PeerName) (result entries, updated bool, err error) {
|
||||||
addToResult := func(e entry) { result = append(result, &e) }
|
|
||||||
|
|
||||||
var mine, theirs *entry
|
var mine, theirs *entry
|
||||||
var previousOwner *mesh.PeerName
|
var previousOwner *mesh.PeerName
|
||||||
|
addToResult := func(e entry) { result = append(result, &e) }
|
||||||
|
addTheirs := func(e entry) {
|
||||||
|
addToResult(e)
|
||||||
|
updated = true
|
||||||
|
previousOwner = nil
|
||||||
|
}
|
||||||
|
|
||||||
// i is index into es; j is index into other
|
// i is index into es; j is index into other
|
||||||
var i, j int
|
var i, j int
|
||||||
for i < len(es) && j < len(other) {
|
for i < len(es) && j < len(other) {
|
||||||
@@ -258,9 +263,7 @@ func (es entries) merge(other entries, ourPeer mesh.PeerName) (result entries, u
|
|||||||
err = errEntryInMyRange(theirs)
|
err = errEntryInMyRange(theirs)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
addToResult(*theirs)
|
addTheirs(*theirs)
|
||||||
updated = true
|
|
||||||
previousOwner = nil
|
|
||||||
j++
|
j++
|
||||||
case mine.Token == theirs.Token:
|
case mine.Token == theirs.Token:
|
||||||
// merge
|
// merge
|
||||||
@@ -277,9 +280,7 @@ func (es entries) merge(other entries, ourPeer mesh.PeerName) (result entries, u
|
|||||||
err = errNewerVersion(mine, theirs)
|
err = errNewerVersion(mine, theirs)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
addToResult(*theirs)
|
addTheirs(*theirs)
|
||||||
updated = true
|
|
||||||
previousOwner = nil
|
|
||||||
}
|
}
|
||||||
i++
|
i++
|
||||||
j++
|
j++
|
||||||
@@ -300,9 +301,7 @@ func (es entries) merge(other entries, ourPeer mesh.PeerName) (result entries, u
|
|||||||
err = errEntryInMyRange(theirs)
|
err = errEntryInMyRange(theirs)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
addToResult(*theirs)
|
addTheirs(*theirs)
|
||||||
updated = true
|
|
||||||
previousOwner = nil
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return
|
return
|
||||||
|
|||||||
Reference in new issue
Block a user