.

wcfs/internal/zdata/δftail.go

@@ -79,19 +79,6 @@ type ΔFtail struct {
 
 	trackSetZFile setOid                  // set of tracked ZBigFiles	as of @head
 	trackSetZBlk  map[zodb.Oid]*zblkTrack // zblk -> {} root -> {}blk	as of @head
-
-// XXX kill
-/*
-	// XXX don't need vδF - everything is reconstructed at runtime from .δBtail.vδT
-	//     this way we also don't need to keep up updating vδF from vδT on its rebuild during.
-	// data with δF changes. Actual for part of tracked set that was taken
-	// into account.
-	vδF []ΔF
-
-	// tracked ZBlk that are not yet taken into account in current vδF.
-	// grows on new track requests; flushes on queries and update.
-	trackNew map[zodb.Oid]map[zodb.Oid]*zblkTrack // {} foid -> {} zoid -> zblk
-*/
 }
 
 // zblkTrack keeps information in which root/blocks ZBlk is present as of @head.
@@ -112,6 +99,9 @@ type ΔFile struct {
 	Size   bool   // whether file size changed	XXX -> ΔSize?
 }
 
+// XXX note about ΔFtail organization: queries results are built on the fly to
+// avoid complexity of recomputing vδF on tracking set change.
+
 
 // NewΔFtail creates new ΔFtail object.
 //
@@ -126,7 +116,6 @@ func NewΔFtail(at0 zodb.Tid, db *zodb.DB) *ΔFtail {
 		fileIdx:       map[zodb.Oid]setOid{},
 		trackSetZFile: setOid{},
 		trackSetZBlk:  map[zodb.Oid]*zblkTrack{},
-//		trackNew:      map[zodb.Oid]map[zodb.Oid]*zblkTrack{},
 	}
 }
 
@@ -189,18 +178,6 @@ func (δFtail *ΔFtail) Track(file *ZBigFile, blk int64, path []btree.LONode, zb
 			zt.inroot[roid] = inblk
 		}
 		inblk.Add(blk)
-
-/* XXX kill
-		if !ok {
-			// zblk was not associated with this file
-			ft := δFtail.trackNew[foid]
-			if ft == nil {
-				ft = make(map[zodb.Oid]*zblkTrack, 1)
-				δFtail.trackNew[foid] = ft
-			}
-			ft[zoid] = zt
-		}
-*/
 	}
 }
 
@@ -318,59 +295,9 @@ func (δFtail *ΔFtail) Update(δZ *zodb.EventCommit) (_ ΔF, err error) {
 	}
 
 //	fmt.Printf("-> δF: %v\n", δF)
-
-//	δFtail.vδF = append(δFtail.vδF, δF)
 	return δF, nil
 }
 
-/*
-// XXX kill after vδF is gone
-// update processes new track requests and updates vδF.
-//
-// If file != nil only track requests related to file are processed.
-// Otherwise all track requests are processed.
-func (δFtail *ΔFtail) update(file *ZBigFile) {
-	if file == nil {
-		panic("TODO")
-	}
-
-	// let's see if we need to rebuild .vδF due to not-yet processed track requests
-	foid := file.POid()
-
-	// XXX locking
-	// XXX dumb
-	zt, dirty := δFtail.trackNew[foid]
-	if !dirty {
-		return
-	}
-
-	delete(δFtail.trackNew, foid)
-	// XXX unlock here
-
-	for i, δZ := range δFtail.δBtail.ΔZtail().Data() {
-		δF := δFtail.vδF[i]
-		// XXX assert δF.Rev == δZ.Rev
-
-		for _, oid := range δZ.Changev {
-			z, ok := zt[oid]
-			if !ok {
-				continue
-			}
-
-			// XXX locking
-			// XXX -> func δF.δfile(foid) ?
-			δfile, ok := δF.ByFile[foid]
-			if !ok {
-				δfile = &ΔFile{Rev: δF.Rev, Blocks: make(setI64)}
-				δF.ByFile[foid] = δfile
-			}
-
-//			δfile.Blocks.Update(z.infile[foid])
-			δfile.Blocks.Update(z.inroot[file.blktab.POid()]) // XXX need .blktab.PActivate
-		}
-	}
-}
-*/
 
 // ForgetPast discards all δFtail entries with rev ≤ revCut.
 func (δFtail *ΔFtail) ForgetPast(revCut zodb.Tid) {
@@ -415,7 +342,6 @@ func (δFtail *ΔFtail) SliceByFileRev(zfile *ZBigFile, lo, hi zodb.Tid) /*reado
 	// δFile	────────o───────o──────x─────x────────────────────────
 
 
-//	vδT := δFtail.δBtail.SliceByRootRev(zfile.blktab, lo, hi) // XXX needs activate zfile
 	// XXX needs activate zfile
 	root := zfile.blktab.POid()
 	vδT := δFtail.δBtail.SliceByRootRev(root, lo, δFtail.Head()) // NOTE @head, not hi
@@ -532,78 +458,6 @@ func (δFtail *ΔFtail) SliceByFileRev(zfile *ZBigFile, lo, hi zodb.Tid) /*reado
 	}
 
 	return vδf
-
-/*
-	// state of `{} blk -> zblk` as we are scanning ↓
-	δblktab := map[int64]struct {
-		zblk   zodb.Oid // blk points to this zblk
-		lo, hi zodb.Tid // blk points to zblk during [lo, hi)
-	}{}
-
-	iz := len(vδZ) - 1
-	it := len(vδT) - 1
-	for (iz >= 0 && it >= 0) {	// XXX -> ||
-		δZ := vδZ[iz]
-		δT := vδT[it]
-		if δZ.Rev >= δT.Rev {
-			for _, oid := range δZ.Changev {
-				// XXX oid -> tracked ZBlk?
-				// ZBlk -> bound to {}blk @head
-				for blk := range boundToAtHead {
-					if !δblktab.Has(blk) {
-						δblktab[blk] = oid
-					}
-				}
-			}
-		}
-		if δT.Rev >= δZ.Rev {
-			...
-		}
-	}
-
-	return vδf
-*/
-
-
-/*
-	// XXX locking?
-	δFtail.update(file)
-
-	// find vδF range corresponding to (lo, hi]
-	// XXX linear scan
-	vδF := δFtail.vδF
-	if len(vδF) == 0 {
-		return nil
-	}
-
-	// find max j : [j].rev ≤ hi		XXX linear scan -> binary search
-	j := len(vδF)-1
-	for ; j >= 0 && vδF[j].Rev > hi; j-- {}
-	if j < 0 {
-		return nil // ø
-	}
-
-	// find max i : [i].rev > low		XXX linear scan -> binary search
-	i := j
-	for ; i >= 0 && vδF[i].Rev > lo; i-- {}
-	i++
-
-	vδF = vδF[i:j+1]
-
-	// filter found changed to have only file-related bits
-	foid := file.POid()
-	var vδfile []*ΔFile
-	for _, δF := range vδF {
-		δfile, ok := δF.ByFile[foid]
-		if ok {
-			vδfile = append(vδfile, δfile)
-		}
-	}
-
-	// XXX merge into vδF zblk from not yet handled tracked part
-
-	return vδfile
-*/
 }
 
 // XXX rename -> BlkRevAt