Skip to content

Diff manager optimization #647

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
deff7 merged 1 commit into from
Mar 25, 2026
Merged

Diff manager optimization #647

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
80 changes: 44 additions & 36 deletions commonspace/object/tree/objecttree/changediffer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,32 +8,43 @@ import (
)

type (
hasChangesFunc func(ids ...string) bool
treeBuilderFunc func(heads []string) (ReadableObjectTree, error)
onRemoveFunc func(ids []string)
)

type diffChange struct {
Id string
PreviousIds []string
Previous []*diffChange
visited bool
}

func newDiffChange(id string, previousIds []string) *diffChange {
return &diffChange{
Id: id,
PreviousIds: previousIds,
}
}

type ChangeDiffer struct {
hasChanges hasChangesFunc
attached map[string]*Change
waitList map[string][]*Change
visitedBuf []*Change
known map[string]struct{}
attached map[string]*diffChange
waitList map[string][]*diffChange
visitedBuf []*diffChange
}

func NewChangeDiffer(tree ReadableObjectTree, hasChanges hasChangesFunc) (*ChangeDiffer, error) {
func NewChangeDiffer(tree ReadableObjectTree) (*ChangeDiffer, error) {
diff := &ChangeDiffer{
hasChanges: hasChanges,
attached: make(map[string]*Change),
waitList: make(map[string][]*Change),
known: make(map[string]struct{}),
attached: make(map[string]*diffChange),
waitList: make(map[string][]*diffChange),
}
if tree == nil {
return diff, nil
}
err := tree.IterateRoot(nil, func(c *Change) (isContinue bool) {
diff.add(&Change{
Id: c.Id,
PreviousIds: c.PreviousIds,
})
diff.known[c.Id] = struct{}{}
diff.add(newDiffChange(c.Id, c.PreviousIds))
return true
})
if err != nil {
Expand All @@ -44,7 +55,7 @@ func NewChangeDiffer(tree ReadableObjectTree, hasChanges hasChangesFunc) (*Chang

func (d *ChangeDiffer) RemoveBefore(ids []string, seenHeads []string) (removed []string, notFound []string, heads []string) {
var (
attached []*Change
attached []*diffChange
attachedIds []string
)
for _, id := range ids {
Expand All @@ -53,24 +64,23 @@ func (d *ChangeDiffer) RemoveBefore(ids []string, seenHeads []string) (removed [
attachedIds = append(attachedIds, id)
continue
}
// check if we have it at the bottom
if !d.hasChanges(id) {
if _, ok := d.known[id]; !ok {
notFound = append(notFound, id)
}
}
heads = make([]string, 0, len(seenHeads))
heads = append(heads, seenHeads...)
d.dfsPrev(attached, func(ch *Change) (isContinue bool) {
d.dfsPrev(attached, func(ch *diffChange) (isContinue bool) {
heads = append(heads, ch.Id)
heads = append(heads, ch.PreviousIds...)
removed = append(removed, ch.Id)
return true
}, func(changes []*Change) {
}, func() {
for _, ch := range removed {
delete(d.attached, ch)
}
for _, ch := range d.attached {
ch.Previous = slice.DiscardFromSlice(ch.Previous, func(change *Change) bool {
ch.Previous = slice.DiscardFromSlice(ch.Previous, func(change *diffChange) bool {
return change.visited
})
}
Expand All @@ -85,11 +95,11 @@ func (d *ChangeDiffer) RemoveBefore(ids []string, seenHeads []string) (removed [
return
}

func (d *ChangeDiffer) dfsPrev(stack []*Change, visit func(ch *Change) (isContinue bool), afterVisit func([]*Change)) {
func (d *ChangeDiffer) dfsPrev(stack []*diffChange, visit func(ch *diffChange) (isContinue bool), afterVisit func()) {
d.visitedBuf = d.visitedBuf[:0]
defer func() {
if afterVisit != nil {
afterVisit(d.visitedBuf)
afterVisit()
}
for _, ch := range d.visitedBuf {
ch.visited = false
Expand All @@ -116,12 +126,12 @@ func (d *ChangeDiffer) dfsPrev(stack []*Change, visit func(ch *Change) (isContin

func (d *ChangeDiffer) Add(changes ...*Change) {
for _, ch := range changes {
d.add(ch)
d.add(newDiffChange(ch.Id, ch.PreviousIds))
}
return
}

func (d *ChangeDiffer) add(change *Change) {
func (d *ChangeDiffer) add(change *diffChange) {
_, exists := d.attached[change.Id]
if exists {
return
Expand All @@ -147,12 +157,11 @@ func (d *ChangeDiffer) add(change *Change) {
}

type DiffManager struct {
differ *ChangeDiffer
readableTree ReadableObjectTree
notFound map[string]struct{}
onRemove func(ids []string)
heads []string
seenHeads []string
differ *ChangeDiffer
notFound map[string]struct{}
onRemove func(ids []string)
heads []string
seenHeads []string
}

func NewDiffManager(initHeads, curHeads []string, treeBuilder treeBuilderFunc, onRemove onRemoveFunc) (*DiffManager, error) {
Expand All @@ -163,17 +172,16 @@ func NewDiffManager(initHeads, curHeads []string, treeBuilder treeBuilderFunc, o
if err != nil {
return nil, err
}
differ, err := NewChangeDiffer(readableTree, readableTree.HasChanges)
differ, err := NewChangeDiffer(readableTree)
if err != nil {
return nil, err
}
return &DiffManager{
differ: differ,
heads: curHeads,
seenHeads: initHeads,
onRemove: onRemove,
readableTree: readableTree,
notFound: make(map[string]struct{}),
differ: differ,
heads: curHeads,
seenHeads: initHeads,
onRemove: onRemove,
notFound: make(map[string]struct{}),
}, nil
}

Expand Down
33 changes: 10 additions & 23 deletions commonspace/object/tree/objecttree/changediffer_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package objecttree

import (
"slices"
"testing"

"github.com/stretchr/testify/require"
Expand All @@ -19,9 +18,7 @@ func TestChangeDiffer_Add(t *testing.T) {
newChange("6", "0", "5"),
newChange("7", "0", "3", "6"),
}
differ, _ := NewChangeDiffer(nil, func(ids ...string) bool {
return false
})
differ, _ := NewChangeDiffer(nil)
differ.Add(changes...)
res, notFound, seenHeads := differ.RemoveBefore([]string{"7"}, []string{"0"})
require.Len(t, notFound, 0)
Expand All @@ -39,9 +36,7 @@ func TestChangeDiffer_Add(t *testing.T) {
newChange("6", "0", "5"),
newChange("7", "0", "3", "6"),
}
differ, _ := NewChangeDiffer(nil, func(ids ...string) bool {
return false
})
differ, _ := NewChangeDiffer(nil)
differ.Add(changes...)
res, notFound, seenHeads := differ.RemoveBefore([]string{"4"}, []string{"0"})
require.Len(t, notFound, 0)
Expand All @@ -59,9 +54,7 @@ func TestChangeDiffer_Add(t *testing.T) {
newChange("2", "0", "0"),
newChange("3", "0", "1", "2"),
}
differ, _ := NewChangeDiffer(nil, func(ids ...string) bool {
return false
})
differ, _ := NewChangeDiffer(nil)
differ.Add(changes...)
res, notFound, seenHeads := differ.RemoveBefore([]string{"3"}, []string{"0"})
require.Len(t, notFound, 0)
Expand All @@ -80,23 +73,17 @@ func TestChangeDiffer_Add(t *testing.T) {
require.Equal(t, []string{"7"}, seenHeads)
})
t.Run("remove not found", func(t *testing.T) {
differ, _ := NewChangeDiffer(nil, func(ids ...string) bool {
return false
})
differ, _ := NewChangeDiffer(nil)
_, notFound, seenHeads := differ.RemoveBefore([]string{"3", "4", "5"}, []string{"0"})
require.Equal(t, seenHeads, []string{"0"})
require.Len(t, notFound, 3)
})
t.Run("exists in storage", func(t *testing.T) {
storedIds := []string{"3", "4", "5"}
differ, _ := NewChangeDiffer(nil, func(ids ...string) bool {
for _, id := range ids {
if !slices.Contains(storedIds, id) {
return false
}
}
return true
})
t.Run("known from tree", func(t *testing.T) {
differ, _ := NewChangeDiffer(nil)
// simulate IDs that were known from the tree
differ.known["3"] = struct{}{}
differ.known["4"] = struct{}{}
differ.known["5"] = struct{}{}
res, notFound, seenHeads := differ.RemoveBefore([]string{"3", "4", "5"}, []string{"7"})
require.Len(t, res, 0)
require.Len(t, notFound, 0)
Expand Down
Loading