Commit 502079d0 authored by Kirill Smelkov's avatar Kirill Smelkov

.

parent 656ec766
...@@ -912,6 +912,7 @@ func diffT(ctx context.Context, a, b *Tree, δZTC SetOid, trackIdx map[zodb.Oid] ...@@ -912,6 +912,7 @@ func diffT(ctx context.Context, a, b *Tree, δZTC SetOid, trackIdx map[zodb.Oid]
bnode.done = true bnode.done = true
} }
fmt.Printf(" bv: %s\n", bv)
} }
// A queue // A queue
...@@ -952,6 +953,8 @@ func diffT(ctx context.Context, a, b *Tree, δZTC SetOid, trackIdx map[zodb.Oid] ...@@ -952,6 +953,8 @@ func diffT(ctx context.Context, a, b *Tree, δZTC SetOid, trackIdx map[zodb.Oid]
abucket.done = true abucket.done = true
} }
fmt.Printf(" av: %s\n", av)
} }
} }
...@@ -991,7 +994,7 @@ func δMerge(δ, δ2 map[Key]ΔValue) error { ...@@ -991,7 +994,7 @@ func δMerge(δ, δ2 map[Key]ΔValue) error {
δv.New = δv2.New δv.New = δv2.New
} }
fmt.Printf(" [%v] merge %s %s -> %s\n", k, δv1, δv2, δv) fmt.Printf(" [%v] merge %s %s -> %s\n", k, δv1, δv2, δv)
if δv.Old != δv.New { if δv.Old != δv.New {
δ[k] = δv δ[k] = δv
} else { } else {
...@@ -1474,9 +1477,10 @@ func vnode(node Node) string { ...@@ -1474,9 +1477,10 @@ func vnode(node Node) string {
} }
func (rn nodeInRange) String() string { func (rn nodeInRange) String() string {
slo := "-∞"; if rn.lo > KeyMin { slo = fmt.Sprintf("%v", rn.lo) } slo := "-∞"; if rn.lo > KeyMin { slo = fmt.Sprintf("%v", rn.lo) }
shi := "∞"; if rn.hi_ < KeyMax { shi = fmt.Sprintf("%v", rn.hi_+1) } shi := "∞"; if rn.hi_ < KeyMax { shi = fmt.Sprintf("%v", rn.hi_+1) }
return fmt.Sprintf("[%s,%s)%s", slo, shi, vnode(rn.node)) done := ""; if rn.done { done = "*" }
return fmt.Sprintf("%s[%s,%s)%s", done, slo, shi, vnode(rn.node))
} }
func (track nodeTrack) String() string { func (track nodeTrack) String() string {
......
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