X ΔFtail.SliceByFileRev: Fix untracked entries to be present uniformly in result

wcfs/internal/zdata/δftail.go

@@ -646,6 +646,49 @@ func (δFtail *ΔFtail) SliceByFileRev(zfile *ZBigFile, lo, hi zodb.Tid) /*reado
 			ZinblkAt = epoch
 		}
 
+		// merge cumulative vδT(epoch,head] update to Zinblk, so that
+		// changes to blocks that were not explicitly requested to be
+		// tracked, are present in resulting slice uniformly.
+		//
+		// For example on
+		//
+		//	at1   T/B0:a,1:b,2:c   δDø		δ{0,1,2}
+		//	at2   δT{0:d,1:e}      δD{c}		δ{0,1,2}
+		//	at3   δTø              δD{c,d,e}	δ{0,1,2}
+		//	at4   δTø              δD{c,e}		δ{  1,2}
+		//
+		// if tracked={0} for (at1,at4] query changes to 1 should be
+		// also all present @at2, @at3 and @at4 - because @at2 both 0
+		// and 1 are changed in the same tracked bucket. Note that
+		// changes to 2 should not be present at all.
+		ZinblkAdj := map[zodb.Oid]setI64{}
+		for _, δT := range vδT {
+			for blk, δzblk := range δT.ΔKV {
+				if δzblk.Old != xbtree.VDEL {
+					inblk, ok := ZinblkAdj[δzblk.Old]
+					if ok {
+						inblk.Del(blk)
+					}
+				}
+				if δzblk.New != xbtree.VDEL {
+					inblk, ok := ZinblkAdj[δzblk.New]
+					if !ok {
+						inblk = setI64{}
+						ZinblkAdj[δzblk.New] = inblk
+					}
+					inblk.Add(blk)
+				}
+			}
+		}
+		for zblk, inblkAdj := range ZinblkAdj {
+			inblk, ok := Zinblk[zblk]
+			if !ok {
+				Zinblk[zblk] = inblkAdj
+			} else {
+				inblk.Update(inblkAdj)
+			}
+		}
+
 		// merge vδZ and vδT of current epoch
 		for ((iz >= 0 && vδZ[iz].Rev > epoch) || it >= 0) {
 			// δZ that is covered by current Zinblk
@@ -675,7 +718,7 @@ func (δFtail *ΔFtail) SliceByFileRev(zfile *ZBigFile, lo, hi zodb.Tid) /*reado
 					if δzblk.New != xbtree.VDEL {
 						inblk, ok := Zinblk[δzblk.New]
 						if ok {
-							inblk.Del(blk)	// FIXME have to recheck vδZ for later entries of δzblk.New
+							inblk.Del(blk)
 						}
 					}
 					if δzblk.Old != xbtree.VDEL {

wcfs/internal/zdata/δftail_test.go

@@ -702,30 +702,36 @@ func TestΔFtailSliceUntrackedUniform(t_ *testing.T) {
 	// blktab[2] remains unnoticed because it is not changed past at1.
 	xtrackBlk(0)
 
-
-	// (at1, at4]
+	// (at1, at4]  -> changes to both 0 and 1, because they both are changed in the same bucket @at2
 	lo := t1.At
 	hi := t4.At
 	vδf := δFtail.SliceByFileRev(zfile, lo, hi)
 	vδf_ok := []*ΔFile{
 		&ΔFile{Rev: t2.At, Blocks: b(0,1), Size: true},
 		&ΔFile{Rev: t3.At, Blocks: b(0,1), Size: false},
-		&ΔFile{Rev: t4.At, Blocks: b(1),   Size: false},
+		&ΔFile{Rev: t4.At, Blocks: b(  1), Size: false},
 	}
 	if !reflect.DeepEqual(vδf, vδf_ok) {
 		t.Errorf("slice (@%s,@%s]:\nhave: %v\nwant: %v", xat[lo], xat[hi], vδfstr(vδf), vδfstr(vδf_ok))
 	}
 
 
-	return
-
-	// XXX vvv correct
-	// (at2, at4]
+	// (at2, at4]  -> changes to only 0, because there is no change to 2 via blktab
 	lo = t2.At
 	vδf = δFtail.SliceByFileRev(zfile, lo, hi)
 	vδf_ok = []*ΔFile{
-		&ΔFile{Rev: t3.At, Blocks: b(0,1), Size: false},
-		&ΔFile{Rev: t4.At, Blocks: b(1),   Size: false},
+		&ΔFile{Rev: t3.At, Blocks: b(0),   Size: false},
+	}
+	if !reflect.DeepEqual(vδf, vδf_ok) {
+		t.Errorf("slice (@%s,@%s]:\nhave: %v\nwant: %v", xat[lo], xat[hi], vδfstr(vδf), vδfstr(vδf_ok))
+	}
+
+	// (at3, at4]  -> changes to only 0, ----/----
+	lo = t3.At
+	vδf = δFtail.SliceByFileRev(zfile, lo, hi)
+	vδf_ok = []*ΔFile(nil)
+	if !reflect.DeepEqual(vδf, vδf_ok) {
+		t.Errorf("slice (@%s,@%s]:\nhave: %v\nwant: %v", xat[lo], xat[hi], vδfstr(vδf), vδfstr(vδf_ok))
 	}
 }