Commit 622d511d authored by Kirill Smelkov's avatar Kirill Smelkov

.

parent 7dc564f5
...@@ -535,7 +535,7 @@ func (δftail *_ΔFileTail) forgetPast(revCut zodb.Tid) { ...@@ -535,7 +535,7 @@ func (δftail *_ΔFileTail) forgetPast(revCut zodb.Tid) {
// //
// Note: contrary to regular go slicing, low is exclusive while high is inclusive. // Note: contrary to regular go slicing, low is exclusive while high is inclusive.
func (δFtail *ΔFtail) SliceByFileRev(zfile *ZBigFile, lo, hi zodb.Tid) /*readonly*/[]*ΔFile { func (δFtail *ΔFtail) SliceByFileRev(zfile *ZBigFile, lo, hi zodb.Tid) /*readonly*/[]*ΔFile {
//fmt.Printf("\nslice f<%s> (@%s,@%s]\n", zfile.POid(), lo, hi) fmt.Printf("\nslice f<%s> (@%s,@%s]\n", zfile.POid(), lo, hi)
xtail.AssertSlice(δFtail, lo, hi) xtail.AssertSlice(δFtail, lo, hi)
// XXX locking // XXX locking
...@@ -635,6 +635,7 @@ func (δFtail *ΔFtail) SliceByFileRev(zfile *ZBigFile, lo, hi zodb.Tid) /*reado ...@@ -635,6 +635,7 @@ func (δFtail *ΔFtail) SliceByFileRev(zfile *ZBigFile, lo, hi zodb.Tid) /*reado
Zinblk[zblk] = inblk.Clone() Zinblk[zblk] = inblk.Clone()
} }
} }
fmt.Printf("Zinblk: %v\n", Zinblk)
// vδT for current epoch // vδT for current epoch
vδT := δFtail.δBtail.SliceByRootRev(root, epoch, head) // NOTE @head, not hi vδT := δFtail.δBtail.SliceByRootRev(root, epoch, head) // NOTE @head, not hi
...@@ -652,7 +653,7 @@ func (δFtail *ΔFtail) SliceByFileRev(zfile *ZBigFile, lo, hi zodb.Tid) /*reado ...@@ -652,7 +653,7 @@ func (δFtail *ΔFtail) SliceByFileRev(zfile *ZBigFile, lo, hi zodb.Tid) /*reado
if iz >= 0 && vδZ[iz].Rev > epoch { if iz >= 0 && vδZ[iz].Rev > epoch {
δZ := vδZ[iz] δZ := vδZ[iz]
if ZinblkAt <= δZ.Rev { if ZinblkAt <= δZ.Rev {
//fmt.Printf("δZ @%s\n", δZ.Rev) fmt.Printf("δZ @%s\n", δZ.Rev)
for _, oid := range δZ.Changev { for _, oid := range δZ.Changev {
inblk, ok := Zinblk[oid] inblk, ok := Zinblk[oid]
if ok && len(inblk) != 0 { if ok && len(inblk) != 0 {
...@@ -668,7 +669,7 @@ func (δFtail *ΔFtail) SliceByFileRev(zfile *ZBigFile, lo, hi zodb.Tid) /*reado ...@@ -668,7 +669,7 @@ func (δFtail *ΔFtail) SliceByFileRev(zfile *ZBigFile, lo, hi zodb.Tid) /*reado
// δT -> adjust Zinblk + update δf // δT -> adjust Zinblk + update δf
if it >= 0 { if it >= 0 {
δT := vδT[it] δT := vδT[it]
//fmt.Printf("δT @%s\n", δT.Rev) fmt.Printf("δT @%s %v\n", δT.Rev, δT.ΔKV)
for blk, δzblk := range δT.ΔKV { for blk, δzblk := range δT.ΔKV {
// apply in reverse as we go ← // apply in reverse as we go ←
if δzblk.New != xbtree.VDEL { if δzblk.New != xbtree.VDEL {
......
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