Commit eaced681 authored by Kirill Smelkov's avatar Kirill Smelkov

.

parent 7973b942
...@@ -316,7 +316,7 @@ func (δTtail *ΔTtail) rebuild(root zodb.Oid, δZtail *zodb.ΔTail, db *zodb.DB ...@@ -316,7 +316,7 @@ func (δTtail *ΔTtail) rebuild(root zodb.Oid, δZtail *zodb.ΔTail, db *zodb.DB
vδZ := δZtail.Data() vδZ := δZtail.Data()
for { for {
δtkeycov := &RangedKeySet{} // all keys coming into tracking set during this lo..hi scan δtkeycov := &RangedKeySet{} // all keys coming into tracking set during this lo..hi scan
trackNewCur := trackNew.Clone() trackNewCur := trackNew.Clone() // trackNew adjusted when going to i<- entry
for i := len(vδZ)-1; i>=0; i-- { for i := len(vδZ)-1; i>=0; i-- {
δZ := vδZ[i] δZ := vδZ[i]
......
...@@ -1066,10 +1066,11 @@ func xverifyΔBTail_rebuild(t *testing.T, db *zodb.DB, treeRoot zodb.Oid, t0, t1 ...@@ -1066,10 +1066,11 @@ func xverifyΔBTail_rebuild(t *testing.T, db *zodb.DB, treeRoot zodb.Oid, t0, t1
xverifyΔBTail_rebuild_TR(t, db, δbtail_, t2, treeRoot, xat, xverifyΔBTail_rebuild_TR(t, db, δbtail_, t2, treeRoot, xat,
// after Track(keys2) // after Track(keys2)
keys2, keys2,
// /*trackSet*/ t2.xkv.trackSet(keys1_0.Union(keys1_2)),
/*trackSet*/ t2.xkv.trackSet(keys1_2), /*trackSet*/ t2.xkv.trackSet(keys1_2),
// FIXME vvv trackNew should not cover ranges that are already in trackSet /*trackNew*/ t2.xkv.trackSet(keys2).Difference(
/*trackNew*/ t2.xkv.trackSet(keys2), // trackNew should not cover ranges that are
// already in trackSet
t2.xkv.trackSet(keys1_2)),
// after rebuild // after rebuild
/* trackSet=*/ t2.xkv.trackSet(keys12R), /* trackSet=*/ t2.xkv.trackSet(keys12R),
......
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