Commit ccc251b9 authored by Kirill Smelkov's avatar Kirill Smelkov

.

parent e75cad4a
...@@ -562,6 +562,7 @@ func (prc *rangeCover) Expand(rnode *nodeInRange) []*nodeInRange { ...@@ -562,6 +562,7 @@ func (prc *rangeCover) Expand(rnode *nodeInRange) []*nodeInRange {
children = append(children, &nodeInRange{lo, hi_, treev[i].Child()}) children = append(children, &nodeInRange{lo, hi_, treev[i].Child()})
} }
// del[i]; insert(@i, children)
*prc = append(rc[:i], append(children, rc[i+1:]...)...) *prc = append(rc[:i], append(children, rc[i+1:]...)...)
return children return children
} }
...@@ -715,11 +716,13 @@ func diffT(ctx context.Context, a, b *Tree, δZTC SetOid, trackIdx map[zodb.Oid] ...@@ -715,11 +716,13 @@ func diffT(ctx context.Context, a, b *Tree, δZTC SetOid, trackIdx map[zodb.Oid]
children := av.Expand(arn) children := av.Expand(arn)
for _, rc := range children { for _, rc := range children {
if !δZTC.Has(rc.node.POid()) {
continue
}
switch rc.node.(type) { switch rc.node.(type) {
case *Tree: case *Tree:
if δZTC.Has(rc.node.POid()) {
aq = append(aq, rc) aq = append(aq, rc)
}
case *Bucket: case *Bucket:
// XXX δ += -[k]v -[k]ø (for tracked DEL) // XXX δ += -[k]v -[k]ø (for tracked DEL)
......
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