benjamyn/any-sync
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Few more changes and tree fixes

Browse Source
This commit is contained in:
mcrakhman 2022-09-09 09:45:25 +02:00 committed by Mikhail Iudin
parent b1c6c7e44e
commit 2d00719a05
No known key found for this signature in database
GPG Key ID: FAAAA8BAABDFF1C0
2 changed files with 28 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
pkg/acl/tree/tree.go
View File

@ -106,11 +106,14 @@ func (t *Tree) Add(changes ...*Change) (mode Mode) {
return Rebuild
}
// beforeHeadsIds is definitely not empty, because the tree is not empty
stack := make([]*Change, len(beforeHeadIds), len(beforeHeadIds))
for i, hid := range beforeHeadIds {
stack[i] = t.attached[hid]
}
// mode is Append for cases when we can safely start iterating
// from old heads to append the state
mode = Append
t.dfsNext(stack,
func(_ *Change) (isContinue bool) {
@ -119,6 +122,12 @@ func (t *Tree) Add(changes ...*Change) (mode Mode) {
func(_ []*Change) {
// checking if some new changes were not visited
for _, ch := range changes {
// if the change was not added, then skipping
if _, ok := t.attached[ch.Id]; !ok {
continue
}
// if some new change was not visited,
// then we can't start from old heads, we need to start from root, so Rebuild
if !ch.visited {
mode = Rebuild
break
@ -297,7 +306,9 @@ func (t *Tree) dfsPrev(stack []*Change, breakpoints []string, visit func(ch *Cha
}
defer func() {
if afterVisit != nil {
afterVisit(t.visitedBuf)
}
for _, ch := range t.visitedBuf {
ch.visited = false
}
@ -329,7 +340,9 @@ func (t *Tree) dfsNext(stack []*Change, visit func(ch *Change) (isContinue bool)
t.visitedBuf = t.visitedBuf[:0]
defer func() {
if afterVisit != nil {
afterVisit(t.visitedBuf)
}
for _, ch := range t.visitedBuf {
ch.visited = false
}
@ -358,12 +371,15 @@ func (t *Tree) dfsNext(stack []*Change, visit func(ch *Change) (isContinue bool)
func (t *Tree) updateHeads() {
var newHeadIds []string
t.iterate(t.root, func(c *Change) (isContinue bool) {
if len(c.Next) == 0 {
newHeadIds = append(newHeadIds, c.Id)
t.dfsNext(
[]*Change{t.root},
func(ch *Change) (isContinue bool) {
if len(ch.Next) == 0 {
newHeadIds = append(newHeadIds, ch.Id)
}
return true
})
},
nil)
t.headIds = newHeadIds
sort.Strings(t.headIds)
}

8
pkg/acl/tree/treeiterator.go
View File

@ -46,20 +46,20 @@ func (i *iterator) topSort(start *Change) {
ch := stack[len(stack)-1]
stack = stack[:len(stack)-1]
// this looks a bit clumsy, but the idea is that we will go through the change again as soon as we finished
// going through its branches
// here we visit the change second time to add it to results
// all next changes at this point were visited
if ch.branchesFinished {
i.resBuf = append(i.resBuf, ch)
ch.branchesFinished = false
continue
}
// in theory, it may be the case that we add the change two times
// but probably due to the way how we build the tree, we won't need it
if ch.visited {
continue
}
// put the change again into stack, so we can add it to results
// after all the next changes
stack = append(stack, ch)
ch.visited = true
ch.branchesFinished = true