.

wcfs/internal/zdata/δftail.go

@@ -237,6 +237,43 @@ func (δFtail *ΔFtail) Update(δZ *zodb.EventCommit) (_ ΔF, err error) {
 
 	δF := ΔF{Rev: δB.Rev, ByFile: make(map[zodb.Oid]*ΔFile)}
 
+	// take ZBigFile changes into account
+	δzfile := map[zodb.Oid]*_ΔZBigFile{} // which tracked ZBigFiles are changed
+	for _, oid := range δZ.Changev {
+		δftail, ok := δFtail.byFile[oid]
+		if !ok {
+			continue // not ZBigFile or file is not tracked
+		}
+		δ, err := zfilediff(δFtail.δBtail.DB(), oid, headOld, δZ.Tid)
+		if err != nil {
+			return ΔF{}, err
+		}
+		//fmt.Printf("zfile<%s> diff %s..%s   -> δ: %v\n", oid, headOld, δZ.Tid, δ)
+
+		if δ != nil {
+			// XXX rebuild first
+			δzfile[oid] = δ
+			δE := _ΔFileEpoch{
+				Rev:             δZ.Tid,
+				oldRoot:         δ.blktabOld,
+				newRoot:         δ.blktabNew,
+				newBlkSize:      δ.blksizeNew,
+				oldTrackSetZBlk: map[zodb.Oid]setI64{},
+			}
+
+			for oid, zt := range δFtail.trackSetZBlk {
+				inblk, ok := zt.inroot[δftail.root]
+				if ok {
+					δE.oldTrackSetZBlk[oid] = inblk
+					delete(zt.inroot, δftail.root)
+				}
+			}
+
+			δftail.root = δE.newRoot
+			δftail.vδE  = append(δftail.vδE, δE)
+		}
+	}
+
 	// take btree changes into account
 //	fmt.Printf("δB.ΔByRoot: %v\n", δB.ΔByRoot)
 	for root, δt := range δB.ΔByRoot {
@@ -295,30 +332,7 @@ func (δFtail *ΔFtail) Update(δZ *zodb.EventCommit) (_ ΔF, err error) {
 	}
 
 	// take zblk changes into account
-	δzfile := map[zodb.Oid]*_ΔZBigFile{} // which tracked ZBigFiles are changed
 	for _, oid := range δZ.Changev {
-		δftail, ok := δFtail.byFile[oid]
-		if ok {
-			δ, err := zfilediff(δFtail.δBtail.DB(), oid, headOld, δZ.Tid)
-			if err != nil {
-				return ΔF{}, err
-			}
-			//fmt.Printf("zfile<%s> diff %s..%s   -> δ: %v\n", oid, headOld, δZ.Tid, δ)
-
-			if δ != nil {
-				// XXX rebuild first
-				δzfile[oid] = δ
-				δftail.vδE = append(δftail.vδE, _ΔFileEpoch{
-					Rev:        δZ.Tid,
-					oldRoot:    δ.blktabOld,
-					newRoot:    δ.blktabNew,
-					newBlkSize: δ.blksizeNew,
-				})
-			}
-
-			continue
-		}
-
 		zt, ok := δFtail.trackSetZBlk[oid]
 		if !ok {
 			continue // not tracked
@@ -359,7 +373,6 @@ func (δFtail *ΔFtail) Update(δZ *zodb.EventCommit) (_ ΔF, err error) {
 		//fmt.Printf("δZBigFile: %v\n", δ)
 
 		// XXX update .fileIdx
-		// XXX update .trackSetZBlk ?
 	}
 
 //	fmt.Printf("-> δF: %v\n", δF)

wcfs/internal/zdata/δftail_test.go

@@ -272,6 +272,11 @@ func testΔFtail(t_ *testing.T, testq chan ΔFTestEntry) {
 		newEpoch := delfile || (!delfile && delfile != delfilePrev)
 		delfilePrev = delfile
 
+		ZinblkPrev := map[string]setI64{}
+		for zblk, inblk := range Zinblk {
+			ZinblkPrev[zblk] = inblk.Clone()
+		}
+
 		// newEpoch -> reset
 		if newEpoch {
 			blkTab = map[int64]string{}
@@ -403,6 +408,12 @@ func testΔFtail(t_ *testing.T, testq chan ΔFTestEntry) {
 				δE.newBlkSize = blksize
 				// XXX oldBlkSize ?
 			}
+			oldTrackSetZBlk := map[zodb.Oid]setI64{}
+			for zblk, inblk := range ZinblkPrev {
+				oid, _ := commit.XGetBlkByName(zblk)
+				oldTrackSetZBlk[oid] = inblk
+			}
+			δE.oldTrackSetZBlk = oldTrackSetZBlk
 			vδE = append(vδE, δE)
 		}
 
@@ -479,8 +490,17 @@ func testΔFtail(t_ *testing.T, testq chan ΔFTestEntry) {
 			vδE = vδE[icut:]
 		}
 
-		// verify vδE
+		// verify δftail.root
 		δftail := δFtail.byFile[foid]
+		rootOK := blktabOid
+		if delfile {
+			rootOK = zodb.InvalidOid
+		}
+		if δftail.root != rootOK {
+			t.Errorf(".root: have %s  ; want %s", δftail.root, rootOK)
+		}
+
+		// verify vδE
 		if !reflect.DeepEqual(δftail.vδE, vδE) {
 			t.Errorf("vδE:\nhave: %v\nwant: %v", δftail.vδE, vδE)
 		}