.

wcfs/δftail.go

@@ -18,7 +18,6 @@
 // See https://www.nexedi.com/licensing for rationale and options.
 
 package main
-// ΔFtail - merge btree.ΔTail with history of ZBlk
 
 import (
 	"lab.nexedi.com/kirr/neo/go/zodb"
@@ -51,8 +50,9 @@ import (
 //
 //
 // XXX only tracked blocks.
+// XXX ΔFtail - merge btree.ΔTail with history of ZBlk
 type ΔFtail struct {
-	*xbtree.ΔTail
+	δBtail  *xbtree.ΔTail
 	fileIdx map[*btree.LOBTree]SetBigFile	// root -> {} BigFile	XXX root -> oid?
 }
 
@@ -64,21 +64,26 @@ type ΔF struct {
 
 func NewΔFTail(at0 zodb.Tid) *ΔFtail {
 	return &ΔFtail{
-		ΔTail:   xbtree.NewΔTail(at0),
+		δBtail:  xbtree.NewΔTail(at0),
 		fileIdx: make(map[*btree.LOBTree]SetBigFile),
 	}
 }
 
+// XXX
+func (δFtail *ΔFtail) Head() zodb.Tid { panic("TODO") }
+func (δFtail *ΔFtail) Tail() zodb.Tid { panic("TODO") }
+
+
 // Track adds tree path to tracked set and associates path root with file.
 //
 // A root can be associated with several files (each provided on different Track call).
-func (δf *ΔFtail) Track(file *BigFile, path []btree.LONode) {
-	δf.ΔTail.Track(path)
+func (δFtail *ΔFtail) Track(file *BigFile, path []btree.LONode) {
+	δFtail.δBtail.Track(path)
 	root := path[0].(*btree.LOBTree)
-	files, ok := δf.fileIdx[root]
+	files, ok := δFtail.fileIdx[root]
 	if !ok {
 		files = SetBigFile{}
-		δf.fileIdx[root] = files
+		δFtail.fileIdx[root] = files
 	}
 	files.Add(file)
 }
@@ -87,7 +92,7 @@ func (δf *ΔFtail) Track(file *BigFile, path []btree.LONode) {
 //
 // It returns corresponding change in files space.
 func (δFtail *ΔFtail) Update(δZ *zodb.EventCommit) ΔF {
-	δB := δFtail.ΔTail.Update(δZ)
+	δB := δFtail.δBtail.Update(δZ)
 	δF := ΔF{Rev: δB.Rev, Change: make(map[*BigFile]SetI64)}
 	for root, δt := range δB.Change {
 		files := δFtail.fileIdx[root]
@@ -120,9 +125,9 @@ func (δFtail *ΔFtail) Update(δZ *zodb.EventCommit) ΔF {
 //
 // XXX -> LastTrackedBlkRev ?
 func (f *BigFile) LastBlkRev(blk int64, at zodb.Tid) (_ zodb.Tid, exact bool) {
-	δf := f.head.bfdir.δFtail
+	δFtail := f.head.bfdir.δFtail
 
-	zblkOid, ok, tabRev, tabRevExact := δf.ΔTail.Get(f.zfile.blktab, blk, at)
+	zblkOid, ok, tabRev, tabRevExact := δFtail.δBtail.Get(f.zfile.blktab, blk, at)
 
 	// block was removed
 	// XXX or not in tracked set?
@@ -134,7 +139,7 @@ func (f *BigFile) LastBlkRev(blk int64, at zodb.Tid) (_ zodb.Tid, exact bool) {
 	// blk revision is max rev and when zblk changed last in (rev, at] range.
 	//
 	// XXX need to use full δZ, not only connected to tracked subset?
-	zblkRev, zblkRevExact := δf.ΔTail.ΔZtail.LastRevOf(zblkOid, at)
+	zblkRev, zblkRevExact := δFtail.δBtail.ΔZtail.LastRevOf(zblkOid, at)
 	if zblkRev > tabRev {
 		return zblkRev, zblkRevExact
 	} else {