Commit 5c2ae713 authored by Kirill Smelkov's avatar Kirill Smelkov

.

parent c112b414
...@@ -803,6 +803,9 @@ func diffT(ctx context.Context, A, B *Tree, δZTC SetOid, trackIdx map[zodb.Oid] ...@@ -803,6 +803,9 @@ func diffT(ctx context.Context, A, B *Tree, δZTC SetOid, trackIdx map[zodb.Oid]
continue continue
} }
// XXX tree with embedded bucket
// a is normal tree - expand it and queue children // a is normal tree - expand it and queue children
// check for each children whether it can be skipped // check for each children whether it can be skipped
// XXX if a is ø tree // XXX if a is ø tree
...@@ -879,13 +882,17 @@ func diffT(ctx context.Context, A, B *Tree, δZTC SetOid, trackIdx map[zodb.Oid] ...@@ -879,13 +882,17 @@ func diffT(ctx context.Context, A, B *Tree, δZTC SetOid, trackIdx map[zodb.Oid]
// * -B23, which queues B.3 and leads to // * -B23, which queues B.3 and leads to
// * +B23, ... // * +B23, ...
tracef("\nphase 2:\n") tracef("\nphase 2:\n")
for len(Bkqueue) > 0 { for {
tracef("\n") tracef("\n")
tracef(" av: %s\n", Av) tracef(" av: %s\n", Av)
tracef(" bv: %s\n", Bv) tracef(" bv: %s\n", Bv)
tracef("\n") tracef("\n")
tracef(" Bkq: %s\n", Bkqueue) tracef(" Bkq: %s\n", Bkqueue)
if len(Bkqueue) == 0 {
break
}
for k := range Bkqueue { for k := range Bkqueue {
b, err := Bv.GetToLeaf(ctx, k); /*X*/if err != nil { return nil, err } b, err := Bv.GetToLeaf(ctx, k); /*X*/if err != nil { return nil, err }
tracef(" B k%d -> %s\n", k, b) tracef(" B k%d -> %s\n", k, b)
......
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