Commit 11538410 authored by Kirill Smelkov's avatar Kirill Smelkov

.

parent 48f82774
...@@ -266,7 +266,7 @@ func XGetTree(db *zodb.DB, at zodb.Tid, root zodb.Oid) map[Key]string { ...@@ -266,7 +266,7 @@ func XGetTree(db *zodb.DB, at zodb.Tid, root zodb.Oid) map[Key]string {
} }
// XXX better load through direct nodes traversal, not via bucket.next? // XXX better load through direct nodes traversal, not via bucket.next?
// (firstbucket and .next might be broken) // (firstbucket and .next are scondary and might be broken)
err = ztree.PActivate(ctx); X(err) err = ztree.PActivate(ctx); X(err)
defer ztree.PDeactivate() defer ztree.PDeactivate()
zbucket := ztree.FirstBucket() zbucket := ztree.FirstBucket()
...@@ -439,7 +439,8 @@ func xverifyΔBTail1(t *testing.T, subj string, db *zodb.DB, treeRoot zodb.Oid, ...@@ -439,7 +439,8 @@ func xverifyΔBTail1(t *testing.T, subj string, db *zodb.DB, treeRoot zodb.Oid,
emsg += fmt.Sprintf("d12: %v\nδT: %v\n\n", d12, δT) emsg += fmt.Sprintf("d12: %v\nδT: %v\n\n", d12, δT)
emsg += strings.Join(badv, "\n") emsg += strings.Join(badv, "\n")
emsg += "\n" emsg += "\n"
t.Error(emsg) //t.Error(emsg)
t.Fatal(emsg)
} }
} }
...@@ -691,13 +692,8 @@ func kvdiff(kv1, kv2 map[Key]string) map[Key]string { ...@@ -691,13 +692,8 @@ func kvdiff(kv1, kv2 map[Key]string) map[Key]string {
keys := SetKey{} keys := SetKey{}
for k := range kv1 { keys.Add(k) } for k := range kv1 { keys.Add(k) }
for k := range kv2 { keys.Add(k) } for k := range kv2 { keys.Add(k) }
keyv := []Key{}
for k := range keys { keyv = append(keyv, k) }
sort.Slice(keyv, func(i,j int) bool {
return keyv[i] < keyv[j]
})
for _, k := range keyv { for k := range keys {
v1, ok := kv1[k] v1, ok := kv1[k]
if !ok { v1 = DEL } if !ok { v1 = DEL }
v2, ok := kv2[k] v2, ok := kv2[k]
......
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