.

wcfs/internal/xbtree/rangeset.go

@@ -402,7 +402,7 @@ func (r KeyRange) String() string {
 	if hi < KeyMax {
 		hi += 1
 	}
-	return fmt.Sprintf("[%s,%s)", keyStr(r.lo), keyStr(hi))
+	return fmt.Sprintf("[%s,%s)", kstr(r.lo), kstr(hi))
 }
 
 

wcfs/internal/xbtree/treediff.go

@@ -992,7 +992,7 @@ func (rn nodeInRange) String() string {
 	if hi < KeyMax {
 		hi += 1
 	}
-	return fmt.Sprintf("%s[%s,%s)%s", done, keyStr(rn.lo), keyStr(hi), vnode(rn.node))
+	return fmt.Sprintf("%s[%s,%s)%s", done, kstr(rn.lo), kstr(hi), vnode(rn.node))
 }
 
 // push pushes element to node stack.

wcfs/internal/xbtree/xbtree.go

@@ -70,8 +70,8 @@ func nodePathToPath(nodePath []Node) (path []zodb.Oid) {
 }
 
 
-// keyStr formats key as string.
-func keyStr(k Key) string {
+// kstr formats key as string.
+func kstr(k Key) string {
 	if k == KeyMin {
 		return "-∞"
 	}

wcfs/internal/xbtree/δbtail_test.go

@@ -642,7 +642,7 @@ func _KAdj(t1, t2 *tTreeCommit, keysv ...SetKey) (kadj KAdjMatrix) {
 		done1 := &RangedKeySet{}
 		done2 := &RangedKeySet{}
 
-		tracefKAdj("\nk%d\n", k)
+		tracefKAdj("\nk%s\n", kstr(k))
 		for !q1.Empty() || !q2.Empty() {
 			tracefKAdj("q1:   %s\tdone1:  %s\n", q1, done1)
 			tracefKAdj("q2:   %s\tdone2:  %s\n", q2, done2)
@@ -654,6 +654,7 @@ func _KAdj(t1, t2 *tTreeCommit, keysv ...SetKey) (kadj KAdjMatrix) {
 					for k_ := range keys {
 						if b1.lo <= k_ && k_ <= b1.hi_ {
 							adj1.Add(k_)
+							tracefKAdj("    adj1 += %s\t-> %s\n", kstr(k_), adj1)
 						}
 					}
 					b1r := KeyRange{b1.lo, b1.hi_}
@@ -682,6 +683,7 @@ func _KAdj(t1, t2 *tTreeCommit, keysv ...SetKey) (kadj KAdjMatrix) {
 					for k_ := range keys {
 						if b2.lo <= k_ && k_ <= b2.hi_ {
 							adj2.Add(k_)
+							tracefKAdj("    adj2 += %s\t-> %s\n", kstr(k_), adj2)
 						}
 					}
 					b2r := KeyRange{b2.lo, b2.hi_}
@@ -1999,7 +2001,7 @@ func (b *RBucket) String() string {
 	if hi < KeyMax {
 		hi += 1
 	}
-	return fmt.Sprintf("[%s,%s)B%s{%s}", keyStr(b.lo), keyStr(hi), b.oid, kvtxt(b.kv))
+	return fmt.Sprintf("[%s,%s)B%s{%s}", kstr(b.lo), kstr(hi), b.oid, kvtxt(b.kv))
 
 }