Commit e7bc6180 authored by Kirill Smelkov's avatar Kirill Smelkov

.

parent ec505b13
...@@ -554,7 +554,7 @@ func (δFtail *ΔFtail) SliceByFileRev(zfile *ZBigFile, lo, hi zodb.Tid) /*reado ...@@ -554,7 +554,7 @@ func (δFtail *ΔFtail) SliceByFileRev(zfile *ZBigFile, lo, hi zodb.Tid) /*reado
if δfTail.Rev == tail { if δfTail.Rev == tail {
return δfTail return δfTail
} }
if !(tail <= δfTail.Rev) { if !(tail < δfTail.Rev) {
panic("tail not ↓") panic("tail not ↓")
} }
} }
...@@ -581,7 +581,7 @@ func (δFtail *ΔFtail) SliceByFileRev(zfile *ZBigFile, lo, hi zodb.Tid) /*reado ...@@ -581,7 +581,7 @@ func (δFtail *ΔFtail) SliceByFileRev(zfile *ZBigFile, lo, hi zodb.Tid) /*reado
// vδE[ie] is next epoch // vδE[ie] is next epoch
// vδE[ie-1] is epoch that covers hi // vδE[ie-1] is epoch that covers hi
// loop through all epochs till lo // loop through all epochs from hi till lo
for lastEpoch := false; !lastEpoch ; { for lastEpoch := false; !lastEpoch ; {
// current epoch // current epoch
var epoch zodb.Tid var epoch zodb.Tid
...@@ -613,7 +613,6 @@ func (δFtail *ΔFtail) SliceByFileRev(zfile *ZBigFile, lo, hi zodb.Tid) /*reado ...@@ -613,7 +613,6 @@ func (δFtail *ΔFtail) SliceByFileRev(zfile *ZBigFile, lo, hi zodb.Tid) /*reado
Zinblk[zblk] = inblk.Clone() Zinblk[zblk] = inblk.Clone()
} }
} }
// XXX ZinblkAt
} else { } else {
δE := vδE[ie+1] δE := vδE[ie+1]
root = δE.oldRoot root = δE.oldRoot
...@@ -633,7 +632,7 @@ func (δFtail *ΔFtail) SliceByFileRev(zfile *ZBigFile, lo, hi zodb.Tid) /*reado ...@@ -633,7 +632,7 @@ func (δFtail *ΔFtail) SliceByFileRev(zfile *ZBigFile, lo, hi zodb.Tid) /*reado
} }
// merge vδZ and vδT of current epoch // merge vδZ and vδT of current epoch
for ((iz >= 0 && vδZ[iz].Rev > epoch) || it >= 0) { // XXX -> `δZ.Rev > epoch` for ((iz >= 0 && vδZ[iz].Rev > epoch) || it >= 0) {
// δZ that is covered by current Zinblk // δZ that is covered by current Zinblk
// -> update δf // -> update δf
if iz >= 0 && vδZ[iz].Rev > epoch { if iz >= 0 && vδZ[iz].Rev > epoch {
......
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