anyproto/any-sync
1
0
Fork 0
mirror of https://github.com/anyproto/any-sync.git synced 2025-06-08 05:57:03 +09:00
Code Activity

Tree builder fixes

Browse source
This commit is contained in:
mcrakhman 2024-11-25 22:20:21 +01:00
parent 3c6284c750
commit c8a5002d8c
No known key found for this signature in database
GPG key ID: DED12CFEF5B8396B
3 changed files with 137 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

103
commonspace/object/tree/objecttree/objecttree_test.go
View file

@ -1091,6 +1091,109 @@ func TestObjectTree(t *testing.T) {
require.Equal(t, "0", objTree.Root().Id)
})
t.Run("find correct common snapshot", func(t *testing.T) {
// checking that adding old changes did not affect the tree
ctx := prepareTreeContext(t, aclList)
changeCreator := ctx.changeCreator
objTree := ctx.objTree
rawChanges := []*treechangeproto.RawTreeChangeWithId{
changeCreator.CreateRaw("1", aclList.Head().Id, "0", true, "0"),
changeCreator.CreateRaw("2", aclList.Head().Id, "1", true, "1"),
changeCreator.CreateRaw("3", aclList.Head().Id, "2", true, "2"),
changeCreator.CreateRaw("4", aclList.Head().Id, "3", true, "3"),
changeCreator.CreateRaw("5", aclList.Head().Id, "4", true, "4"),
changeCreator.CreateRaw("6", aclList.Head().Id, "5", true, "5"),
changeCreator.CreateRaw("6.a.1", aclList.Head().Id, "6", true, "6"),
changeCreator.CreateRaw("6.a.2", aclList.Head().Id, "6.a.1", true, "6.a.1"),
changeCreator.CreateRaw("6.a.3", aclList.Head().Id, "6.a.2", true, "6.a.2"),
changeCreator.CreateRaw("6.b.1", aclList.Head().Id, "6", true, "6"),
changeCreator.CreateRaw("6.b.2", aclList.Head().Id, "6.b.1", true, "6.b.1"),
changeCreator.CreateRaw("6.b.3", aclList.Head().Id, "6.b.2", true, "6.b.2"),
}
payload := RawChangesPayload{
NewHeads: []string{"6.b.3", "6.a.3"},
RawChanges: rawChanges,
}
_, err := objTree.AddRawChanges(context.Background(), payload)
require.NoError(t, err, "adding changes should be without error")
require.Equal(t, "6", objTree.Root().Id)
rawChanges = []*treechangeproto.RawTreeChangeWithId{
changeCreator.CreateRaw("4.a.1", aclList.Head().Id, "4", true, "4"),
changeCreator.CreateRaw("4.a.2", aclList.Head().Id, "4.a.1", true, "4.a.1"),
changeCreator.CreateRaw("4.a.3", aclList.Head().Id, "4.a.2", true, "4.a.2"),
changeCreator.CreateRaw("4.b.1", aclList.Head().Id, "4", true, "4"),
changeCreator.CreateRaw("4.b.2", aclList.Head().Id, "4.b.1", true, "4.b.1"),
changeCreator.CreateRaw("4.b.3", aclList.Head().Id, "4.b.2", true, "4.b.2"),
changeCreator.CreateRaw("5.a.1", aclList.Head().Id, "5", true, "5"),
changeCreator.CreateRaw("5.a.2", aclList.Head().Id, "5.a.1", true, "5.a.1"),
changeCreator.CreateRaw("5.a.3", aclList.Head().Id, "5.a.2", true, "5.a.2"),
changeCreator.CreateRaw("5.b.1", aclList.Head().Id, "5", true, "5"),
changeCreator.CreateRaw("5.b.2", aclList.Head().Id, "5.b.1", true, "5.b.1"),
changeCreator.CreateRaw("5.b.3", aclList.Head().Id, "5.b.2", true, "5.b.2"),
}
payload = RawChangesPayload{
NewHeads: []string{"4.b.3", "4.a.3", "5.b.3", "5.a.3"},
RawChanges: rawChanges,
}
_, err = objTree.AddRawChanges(context.Background(), payload)
require.NoError(t, err, "adding changes should be without error")
require.Equal(t, "4", objTree.Root().Id)
})
t.Run("find correct common snapshot with existing path", func(t *testing.T) {
// checking that adding old changes did not affect the tree
ctx := prepareTreeContext(t, aclList)
changeCreator := ctx.changeCreator
objTree := ctx.objTree
rawChanges := []*treechangeproto.RawTreeChangeWithId{
changeCreator.CreateRaw("1", aclList.Head().Id, "0", true, "0"),
changeCreator.CreateRaw("2", aclList.Head().Id, "1", true, "1"),
changeCreator.CreateRaw("3", aclList.Head().Id, "2", true, "2"),
changeCreator.CreateRaw("4", aclList.Head().Id, "3", true, "3"),
changeCreator.CreateRaw("5", aclList.Head().Id, "4", true, "4"),
changeCreator.CreateRaw("6", aclList.Head().Id, "5", true, "5"),
changeCreator.CreateRaw("6.a.1", aclList.Head().Id, "6", true, "6"),
changeCreator.CreateRaw("6.a.2", aclList.Head().Id, "6.a.1", true, "6.a.1"),
changeCreator.CreateRaw("6.a.3", aclList.Head().Id, "6.a.2", true, "6.a.2"),
changeCreator.CreateRaw("6.b.1", aclList.Head().Id, "6", true, "6"),
changeCreator.CreateRaw("6.b.2", aclList.Head().Id, "6.b.1", true, "6.b.1"),
changeCreator.CreateRaw("6.b.3", aclList.Head().Id, "6.b.2", true, "6.b.2"),
}
payload := RawChangesPayload{
NewHeads: []string{"6.b.3", "6.a.3"},
RawChanges: rawChanges,
}
_, err := objTree.AddRawChanges(context.Background(), payload)
require.NoError(t, err, "adding changes should be without error")
require.Equal(t, "6", objTree.Root().Id)
rawChanges = []*treechangeproto.RawTreeChangeWithId{
changeCreator.CreateRaw("4.a.1", aclList.Head().Id, "4", true, "4"),
changeCreator.CreateRaw("4.a.2", aclList.Head().Id, "4.a.1", true, "4.a.1"),
changeCreator.CreateRaw("4.a.3", aclList.Head().Id, "4.a.2", true, "4.a.2"),
changeCreator.CreateRaw("4.b.1", aclList.Head().Id, "4", true, "4"),
changeCreator.CreateRaw("4.b.2", aclList.Head().Id, "4.b.1", true, "4.b.1"),
changeCreator.CreateRaw("4.b.3", aclList.Head().Id, "4.b.2", true, "4.b.2"),
changeCreator.CreateRaw("5.a.1", aclList.Head().Id, "5", true, "5"),
changeCreator.CreateRaw("5.a.2", aclList.Head().Id, "5.a.1", true, "5.a.1"),
changeCreator.CreateRaw("5.a.3", aclList.Head().Id, "5.a.2", true, "5.a.2"),
changeCreator.CreateRaw("5.b.1", aclList.Head().Id, "5", true, "5"),
changeCreator.CreateRaw("5.b.2", aclList.Head().Id, "5.b.1", true, "5.b.1"),
changeCreator.CreateRaw("5.b.3", aclList.Head().Id, "5.b.2", true, "5.b.2"),
}
payload = RawChangesPayload{
NewHeads: []string{"4.b.3", "4.a.3", "5.b.3", "5.a.3"},
RawChanges: rawChanges,
SnapshotPath: []string{"4", "3", "2", "1", "0"},
}
_, err = objTree.AddRawChanges(context.Background(), payload)
require.NoError(t, err, "adding changes should be without error")
require.Equal(t, "4", objTree.Root().Id)
})
t.Run("their heads before common snapshot", func(t *testing.T) {
// checking that adding old changes did not affect the tree
ctx := prepareTreeContext(t, aclList)