mirror/dolt
1
0
Fork 0
mirror of https://github.com/dolthub/dolt.git synced 2026-05-01 20:00:22 -05:00
Code Issues Packages Projects Releases 159 Wiki Activity

go/store/datas: First pass at implementing FindCommonAncestor when parents_closure is present.

Browse Source
This commit is contained in:
Aaron Son
2021-10-12 09:40:55 -07:00
parent 1aead8d4cf
commit 8cece700e8
2 changed files with 166 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
go/store/datas/commit_test.go
+5 -4
View File
@@ -308,9 +308,10 @@ func assertCommonAncestor(t *testing.T, expected, a, b types.Struct, ldb, rdb Da
type caFinder func(ctx context.Context, c1, c2 types.Ref, vr1, vr2 types.ValueReader) (a types.Ref, ok bool, err error)
methods := map[string]caFinder{
"FindCommonAncestor": FindCommonAncestor,
"SetClosure": commonAncWithSetClosure,
"LazyClosure": commonAncWithLazyClosure,
"FindCommonAncestor": FindCommonAncestor,
"SetClosure": commonAncWithSetClosure,
"LazyClosure": commonAncWithLazyClosure,
"FindCommonAncestorUsingParentsList": FindCommonAncestorUsingParentsList,
}
for name, method := range methods {
@@ -578,7 +579,7 @@ func TestFindCommonAncestor(t *testing.T) {
// No common ancestor
found, ok, err := FindCommonAncestor(context.Background(), mustRef(types.NewRef(d2, types.Format_7_18)), mustRef(types.NewRef(a6, types.Format_7_18)), db, db)
assert.NoError(err)
require.NoError(t, err)
if !assert.False(ok) {
d2V, _, _ := d2.MaybeGet(ValueField)