Commit 29848a1f authored by Kirill Smelkov's avatar Kirill Smelkov

.

parent 94a14ccd
......@@ -803,7 +803,7 @@ func diffT(ctx context.Context, A, B *Tree, δZTC SetOid, trackIdx map[zodb.Oid]
// Akqueue <- δB
for k_ := range δB {
Bkdone.Add(k_)
if !Akdone(k_) {
if !Akdone.Has(k_) {
Akqueue.Add(k_)
}
}
......@@ -852,6 +852,10 @@ func __qqq__diffT(ctx context.Context, A, B *Tree, δZTC SetOid, trackIdx map[zo
// initial phase: expand changed nodes in a till buckets;
// XXX changed buckets -> δ-
var atop *nodeInRange = nil // XXX stub
av := rangeSplit{nil} // XXX stub
bv := rangeSplit{nil} // XXX stub
Aqueue := []*nodeInRange{atop} // stack: "to process" nodes on A
Bqueue := []*nodeInRange{} // stack: "to process" nodes on B
......@@ -1314,7 +1318,7 @@ func __diffT(ctx context.Context, a, b *Tree, δZTC SetOid, trackIdx map[zodb.Oi
Aqueue = SetKey{}
for k := range Bqueue {
tracef(" B [%v]\n", k)
bnode, ok, err := bv.GetToLeaf(ctx, k)
bnode, ok, err := bv.GetToLeaf_(ctx, k)
if err != nil {
return nil, err
}
......@@ -1394,7 +1398,7 @@ func __diffT(ctx context.Context, a, b *Tree, δZTC SetOid, trackIdx map[zodb.Oi
Bqueue = SetKey{}
for k := range Aqueue {
tracef(" A [%v]\n", k)
anode, ok, err := av.GetToLeaf(ctx, k)
anode, ok, err := av.GetToLeaf_(ctx, k)
if err != nil {
return nil, err
}
......
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