Commit 2f2ffdd5 authored by Kirill Smelkov's avatar Kirill Smelkov

.

parent 1af926c6
...@@ -883,7 +883,6 @@ func δMerge(δ, δ2 map[Key]ΔValue) error { ...@@ -883,7 +883,6 @@ func δMerge(δ, δ2 map[Key]ΔValue) error {
func diffB(ctx context.Context, a, b *Bucket) (δ map[Key]ΔValue, err error) { func diffB(ctx context.Context, a, b *Bucket) (δ map[Key]ΔValue, err error) {
tracefDiff(" diffB %s %s\n", xzodb.XidOf(a), xzodb.XidOf(b)) tracefDiff(" diffB %s %s\n", xzodb.XidOf(a), xzodb.XidOf(b))
defer xerr.Contextf(&err, "diffB %s %s", xzodb.XidOf(a), xzodb.XidOf(b)) defer xerr.Contextf(&err, "diffB %s %s", xzodb.XidOf(a), xzodb.XidOf(b))
// XXX oid can be InvalidOid for T/B... (i.e. B is part of T and is not yet committed separately)
var av []BucketEntry var av []BucketEntry
var bv []BucketEntry var bv []BucketEntry
...@@ -898,7 +897,7 @@ func diffB(ctx context.Context, a, b *Bucket) (δ map[Key]ΔValue, err error) { ...@@ -898,7 +897,7 @@ func diffB(ctx context.Context, a, b *Bucket) (δ map[Key]ΔValue, err error) {
bv = b.Entryv() // key↑ bv = b.Entryv() // key↑
} }
δ = map[Key]ΔValue{} δ = map[Key]ΔValue{}
defer tracefDiff(" -> δb: %v\n", δ) defer tracefDiff(" -> δb: %v\n", δ)
//debugfDiff(" av: %v", av) //debugfDiff(" av: %v", av)
//debugfDiff(" bv: %v", bv) //debugfDiff(" bv: %v", bv)
...@@ -949,6 +948,7 @@ func (rn *nodeInRange) String() string { ...@@ -949,6 +948,7 @@ func (rn *nodeInRange) String() string {
return fmt.Sprintf("%s%s%s", done, rn.keycov, vnode(rn.node)) return fmt.Sprintf("%s%s%s", done, rn.keycov, vnode(rn.node))
} }
// push pushes element to node stack. // push pushes element to node stack.
func push(nodeStk *[]*nodeInRange, top *nodeInRange) { func push(nodeStk *[]*nodeInRange, top *nodeInRange) {
*nodeStk = append(*nodeStk, top) *nodeStk = append(*nodeStk, top)
......
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