.

wcfs/internal/zdata/δftail.go

@@ -66,7 +66,7 @@ type setOid = set.Oid
 //   .Update(δZ) -> δF				- update files δ tail given raw ZODB changes
 //   .ForgetPast(revCut)			- forget changes past revCut
 //   .SliceByRev(lo, hi) -> []δF		- query for all files changes with rev ∈ (lo, hi]
-//   .SliceByFileRev(file, lo, hi) -> []δfile	- query for changes of file with rev ∈ (lo, hi]
+//   .SliceByFileRev(file, lo, hi) -> []δfile	- query for changes of a file with rev ∈ (lo, hi]
 //   .BlkRevAt(file, #blk, at)			- query for what is last revision that changed
 //						  file[#blk] as of @at database state.
 //
@@ -74,7 +74,7 @@ type setOid = set.Oid
 //
 //	δfile:
 //		.rev↑
-//		{}blk
+//		{}blk | EPOCH
 //
 // XXX concurrent use
 //
@@ -85,7 +85,7 @@ type ΔFtail struct {
 	fileIdx map[zodb.Oid]setOid      // tree-root -> {} ZBigFile<oid>  as of @head  XXX -> root2file ?
 	byFile  map[zodb.Oid]*_ΔFileTail // file -> vδf tail	XXX
 
-	// set of files, which are newly tracked and for which vδE was not yet rebuilt
+	// set of files, which are newly tracked and for which byFile[foid].vδE was not yet rebuilt
 	trackNew setOid // {}foid
 
 	trackSetZBlk  map[zodb.Oid]*zblkTrack // zblk -> {} root -> {}blk	as of @head
@@ -157,8 +157,6 @@ func (δFtail *ΔFtail) Tail() zodb.Tid { return δFtail.δBtail.Tail() }
 //
 // XXX Track adds tree path to tracked set and associates path root with file.
 //
-// XXX text
-//
 // XXX objects in path and zblk must be with .PJar().At() == .head
 //
 // A root can be associated with several files (each provided on different Track call).
@@ -186,7 +184,7 @@ func (δFtail *ΔFtail) Track(file *ZBigFile, blk int64, path []btree.LONode, zb
 
 	δftail, ok := δFtail.byFile[foid]
 	if !ok {
-		δftail = &_ΔFileTail{root: roid, vδE: nil /*will need to be rebuilt till past*/}
+		δftail = &_ΔFileTail{root: roid, vδE: nil /*will need to be rebuilt to past till tail*/}
 		δFtail.byFile[foid] = δftail
 		δFtail.trackNew.Add(foid)
 	}
@@ -221,11 +219,13 @@ func (δFtail *ΔFtail) rebuildAll() (err error) {
 	defer xerr.Contextf(&err, "ΔFtail rebuildAll")
 	// XXX locking
 
+	δBtail := δFtail.δBtail
+	δZtail := δBtail.ΔZtail()
+	db     := δBtail.DB()
 	for foid := range δFtail.trackNew {
 		δFtail.trackNew.Del(foid)
 		δftail := δFtail.byFile[foid]
-		δBtail := δFtail.δBtail
-		err := δftail.rebuild1(foid, δBtail.ΔZtail(), δBtail.DB())
+		err := δftail.rebuild1(foid, δZtail, db)
 		if err != nil {
 			return err
 		}