.

wcfs/internal/zdata/δftail_test.go

@@ -247,7 +247,7 @@ func testΔFtail(t_ *testing.T, testq chan ΔFTestEntry) {
 			newRoot:    t.Root(),
 			oldBlkSize: -1,
 			newBlkSize: blksize,
-			oldTrackSetZBlk: nil,
+			oldZinblk:  nil,
 	})
 	epochv = append(epochv, t1.At)
 	for blk, zblk := range δt1 {
@@ -423,12 +423,12 @@ func testΔFtail(t_ *testing.T, testq chan ΔFTestEntry) {
 				δE.oldBlkSize = -1
 				δE.newBlkSize = blksize
 			}
-			oldTrackSetZBlk := map[zodb.Oid]setI64{}
+			oldZinblk := map[zodb.Oid]setI64{}
 			for zblk, inblk := range ZinblkPrev {
 				oid, _ := commit.XGetBlkByName(zblk)
-				oldTrackSetZBlk[oid] = inblk
+				oldZinblk[oid] = inblk
 			}
-			δE.oldTrackSetZBlk = oldTrackSetZBlk
+			δE.oldZinblk = oldZinblk
 			vδE = append(vδE, δE)
 		}
 
@@ -445,26 +445,64 @@ func testΔFtail(t_ *testing.T, testq chan ΔFTestEntry) {
 			retrackAll()
 		}
 
-		// verify δFtail.trackSetZBlk
-		trackZinblk := map[string]setI64{}
-		for oid, zt := range δFtail.trackSetZBlk {
-			zblki := commit.ZBlkTab[oid]
-			for root, blocks := range zt.inroot {
-				if root != t.Root() {
-					t.Errorf(".trackSetZBlk: zblk %s points to unexpected blktab %s", zblki.Name, t.Root())
-					continue
+		// verify byRoot, Zinroot
+		trackZinroot := map[string]setOid{}
+		trackRfiles  := map[zodb.Oid]setOid{}
+		for root, rt := range δFtail.byRoot {
+			trackRfiles[root] = rt.files
+			for zoid := range rt.Zinblk {
+				zblki := commit.ZBlkTab[zoid]
+				inroot, ok := trackZinroot[zblki.Name]
+				if !ok {
+					inroot = setOid{}
+					trackZinroot[zblki.Name] = inroot
+				}
+				inroot.Add(root)
+			}
 		}
 
-				inblk, ok := trackZinblk[zblki.Name]
+		Zinroot := map[string]setOid{}
+		for zblk := range Zinblk {
+			inroot := setOid{}; inroot.Add(t.Root())
+			Zinroot[zblk] = inroot
+		}
+		if !reflect.DeepEqual(trackZinroot, Zinroot) {
+			t.Errorf("Zinroot:\n~have: %v\n want: %v", trackZinroot, Zinroot)
+		}
+
+		filesOK := setOid{}
+		if !delfile {
+			filesOK.Add(foid)
+		}
+		RfilesOK := map[zodb.Oid]setOid{
+			t.Root(): filesOK,
+		}
+		if !reflect.DeepEqual(trackRfiles, RfilesOK) {
+			t.Errorf("Rfiles:\n~have: %v\n want: %v", trackRfiles, RfilesOK)
+		}
+
+		// verify Zinblk
+		trackZinblk := map[string]setI64{}
+		switch {
+		case len(δFtail.byRoot) == 0:
+			// ok
+
+		case len(δFtail.byRoot) == 1:
+			rt, ok := δFtail.byRoot[t.Root()]
 			if !ok {
-					inblk = setI64{}
-					trackZinblk[zblki.Name] = inblk
+				t.Errorf(".byRoot points to unexpected blktab")
+			} else {
+				for zoid, inblk := range rt.Zinblk {
+					zblki := commit.ZBlkTab[zoid]
+					trackZinblk[zblki.Name] = inblk.Clone()	// XXX clone needed?
 				}
-				inblk.Update(blocks)
 			}
+
+		default:
+			t.Errorf("len(.byRoot) != (0,1)  ; byRoot: %v", δFtail.byRoot)
 		}
 		if !reflect.DeepEqual(trackZinblk, Zinblk) {
-			t.Errorf(".trackSetZBlk:\n~have: %v\n want: %v", trackZinblk, Zinblk)
+			t.Errorf("Zinblk:\n~have: %v\n want: %v", trackZinblk, Zinblk)
 		}
 
 		// ForgetPast configured threshold
@@ -485,16 +523,6 @@ func testΔFtail(t_ *testing.T, testq chan ΔFTestEntry) {
 			vδE = vδE[icut:]
 		}
 
-		// verify δFtail.filesByRoot
-		filesByRootOK := map[zodb.Oid]setOid{}
-		if !delfile {
-			__ := setOid{}; __.Add(foid)
-			filesByRootOK[t.Root()] = __
-		}
-		if !reflect.DeepEqual(δFtail.filesByRoot, filesByRootOK) {
-			t.Errorf("filesByRoot:\nhave: %v\nwant: %v", δFtail.filesByRoot, filesByRootOK)
-		}
-
 		// verify δftail.root
 		δftail := δFtail.byFile[foid]
 		rootOK := t.Root()