Commit 597329f1 authored by Kirill Smelkov's avatar Kirill Smelkov

.

parent 29848a1f
......@@ -716,7 +716,7 @@ func diffT(ctx context.Context, A, B *Tree, δZTC SetOid, trackIdx map[zodb.Oid]
Akdone := SetKey{} // already processed keys in A
Bkdone := SetKey{} // ----//---- in B
// phase 1: expand A top-down driven by δZTC
// phase 1: expand A top->down driven by δZTC.
// by default a node contributes to δ-
// a node ac does not contribute to δ- and can be skipped, if:
// - ac is not tracked, or
......@@ -738,7 +738,7 @@ func diffT(ctx context.Context, A, B *Tree, δZTC SetOid, trackIdx map[zodb.Oid]
Akdone.Add(k)
Bkqueue.Add(k)
}
// XXX ra.range -> Bqholes
// XXX Bkqueue <- holes(ra.range)
ra.done = true
case *Tree:
......@@ -760,7 +760,7 @@ func diffT(ctx context.Context, A, B *Tree, δZTC SetOid, trackIdx map[zodb.Oid]
if err != nil { return nil, err }
if ok {
// ac can be skipped
// XXX ac.range \ bc.range -> Bqholes
// XXX Bkqueue <- holes(ac.range \ bc.range)
continue
}
}
......@@ -824,7 +824,6 @@ func diffT(ctx context.Context, A, B *Tree, δZTC SetOid, trackIdx map[zodb.Oid]
if !ok { // !ok means ø tree
δA, err := diffB(ctx, abucket, nil); /*X*/if err != nil { return nil, err }
}
// XXX also process holes?
// δ <- δA
err = δMerge(δ, δA); /*X*/if err != nil { return nil, err }
......@@ -836,6 +835,7 @@ func diffT(ctx context.Context, A, B *Tree, δZTC SetOid, trackIdx map[zodb.Oid]
Bkqueue.Add(k_)
}
}
// XXX Bkqueue <- holes(a.range)
a.done = true
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment