X xbtree: tests: Also verify state of ΔTtail.ktrackNew

wcfs/internal/xbtree/δbtail_test.go

@@ -703,7 +703,8 @@ func xverifyΔBTail_Update1(t *testing.T, subj string, db *zodb.DB, treeRoot zod
 		}
 	}
 
-	ø := blib.PPTreeSubSet{}
+	ø  := blib.PPTreeSubSet{}
+	kø := &blib.RangedKeySet{}
 
 	// trackSet1 = xkv1[tracked1]
 	// trackSet2 = xkv2[tracked2]  ( = xkv2[kadj[tracked1]]
@@ -711,7 +712,7 @@ func xverifyΔBTail_Update1(t *testing.T, subj string, db *zodb.DB, treeRoot zod
 	trackSet2, tkeyCov2 := trackSetWithCov(t2.Xkv, initialTrackedKeys.Union(kadjTrackedδZ))
 
 	// verify δbtail.trackSet against @at1
-	δbtail.assertTrack(t, "1", ø, trackSet1)
+	δbtail.assertTrack(t, "1", ø, trackSet1, tkeyCov1)
 
 	// δB <- δZ
 	//
@@ -756,7 +757,7 @@ func xverifyΔBTail_Update1(t *testing.T, subj string, db *zodb.DB, treeRoot zod
 	}
 
 	// verify δbtail.trackSet  against @at2
-	δbtail.assertTrack(t, "2", trackSet2, ø)
+	δbtail.assertTrack(t, "2", trackSet2, ø, kø)
 
 
 	// assert δB.ByRoot == {treeRoot -> ...}  if δTok != ø
@@ -838,7 +839,8 @@ func xverifyΔBTail_rebuild(t *testing.T, db *zodb.DB, treeRoot zodb.Oid, t0, t1
 		// kadj210 = kadj10·kadj21
 		kadj210 := kadj10.Mul(kadj21)
 
-		ø := blib.PPTreeSubSet{}
+		ø  := blib.PPTreeSubSet{}
+		kø := &blib.RangedKeySet{}
 
 		// verify t0 -> t1 Track(keys1) Rebuild -> t2 Track(keys2) Rebuild
 		// for all combinations of keys1 and keys2
@@ -858,14 +860,14 @@ func xverifyΔBTail_rebuild(t *testing.T, db *zodb.DB, treeRoot zodb.Oid, t0, t1
 				}
 			}
 
-			Tkeys1   := trackSet(t1.Xkv, keys1)
-			Tkeys1_0 := trackSet(t1.Xkv, keys1_0)
+			Tkeys1, kTkeys1  := trackSetWithCov(t1.Xkv, keys1)
+			Tkeys1_0         := trackSet(t1.Xkv, keys1_0)
 
 			t.Run(fmt.Sprintf(" T%s;R", keys1), func(t *testing.T) {
 				δbtail := NewΔBtail(t0.At, db)
 
 				// assert trackSet=ø, trackNew=ø, vδB=[]
-				δbtail.assertTrack(t, "@at0", ø, ø)
+				δbtail.assertTrack(t, "@at0", ø, ø, kø)
 				assertΔTtail(t, "@at0", δbtail, t0, treeRoot,
 					/*vδT=ø*/)
 
@@ -875,8 +877,9 @@ func xverifyΔBTail_rebuild(t *testing.T, db *zodb.DB, treeRoot zodb.Oid, t0, t1
 				xverifyΔBTail_rebuild_TR(t, δbtail, t1, treeRoot,
 					// after Track(keys1)
 					keys1,
-					/*trackSet=*/ ø,
-					/*trackNew=*/ Tkeys1,
+					/*trackSet=*/  ø,
+					/*trackNew=*/  Tkeys1,
+					/*ktrackNew=*/ kTkeys1,
 
 					// after rebuild
 					/*trackSet=*/ Tkeys1_0,
@@ -908,7 +911,7 @@ func xverifyΔBTail_rebuild(t *testing.T, db *zodb.DB, treeRoot zodb.Oid, t0, t1
 						}
 					}
 
-					Tkeys1R2  := trackSet(t2.Xkv, keys1R2)
+					Tkeys1R2, kTkeys1R2 := trackSetWithCov(t2.Xkv, keys1R2)
 
 					xverifyΔBTail_rebuild_U(t, δbtail, treeRoot, t1, t2,
 						/*trackSet=*/ Tkeys1R2,
@@ -943,8 +946,8 @@ func xverifyΔBTail_rebuild(t *testing.T, db *zodb.DB, treeRoot zodb.Oid, t0, t1
 							keys12R2 = keys12R2_
 						}
 
-						Tkeys2    := trackSet(t2.Xkv, keys2)
-						Tkeys12R2 := trackSet(t2.Xkv, keys12R2)
+						Tkeys2, kTkeys2  := trackSetWithCov(t2.Xkv, keys2)
+						Tkeys12R2        := trackSet(t2.Xkv, keys12R2)
 /*
 						fmt.Printf("\n\n\nKKK\nkeys1=%s  keys2=%s\n", keys1, keys2)
 						fmt.Printf("keys1R2:  %s\n", keys1R2)
@@ -987,6 +990,9 @@ func xverifyΔBTail_rebuild(t *testing.T, db *zodb.DB, treeRoot zodb.Oid, t0, t1
 									// trackNew should not cover ranges that are
 									// already in trackSet
 									Tkeys1R2),
+								/*ktrackNew*/ kTkeys2.Difference(
+									// see ^^^ about trackNew
+									kTkeys1R2),
 
 								// after rebuild
 								/* trackSet=*/ Tkeys12R2,
@@ -1004,12 +1010,13 @@ func xverifyΔBTail_rebuild_U(t *testing.T, δbtail *ΔBtail, treeRoot zodb.Oid,
 	t.Helper()
 	X := exc.Raiseif
 	ø := blib.PPTreeSubSet{}
+	kø := &blib.RangedKeySet{}
 
 	subj := fmt.Sprintf("after Update(@%s→@%s)", ti.AtSymb(), tj.AtSymb())
 
 	// Update ati -> atj
 	δB, err := δbtail.Update(tj.ΔZ);  X(err)
-	δbtail.assertTrack(t, subj, trackSet, ø)
+	δbtail.assertTrack(t, subj, trackSet, ø, kø)
 	assertΔTtail(t, subj, δbtail, tj, treeRoot, vδTok...)
 
 	// assert δB = vδTok[-1]
@@ -1045,20 +1052,21 @@ func xverifyΔBTail_rebuild_U(t *testing.T, δbtail *ΔBtail, treeRoot zodb.Oid,
 }
 
 // xverifyΔBTail_rebuild_TR verifies ΔBtail state after Track(keys) + rebuild.
-func xverifyΔBTail_rebuild_TR(t *testing.T, δbtail *ΔBtail, tj *xbtreetest.Commit, treeRoot zodb.Oid, keys setKey, trackSet blib.PPTreeSubSet, trackNew, trackSetAfterRebuild blib.PPTreeSubSet, vδTok ...map[Key]Δstring) {
+func xverifyΔBTail_rebuild_TR(t *testing.T, δbtail *ΔBtail, tj *xbtreetest.Commit, treeRoot zodb.Oid, keys setKey, trackSet, trackNew blib.PPTreeSubSet, ktrackNew *blib.RangedKeySet, trackSetAfterRebuild blib.PPTreeSubSet, vδTok ...map[Key]Δstring) {
 	t.Helper()
 	ø := blib.PPTreeSubSet{}
+	kø := &blib.RangedKeySet{}
 
 	// Track(keys)
 	trackKeys(δbtail, tj, keys)
 
 	subj := fmt.Sprintf("@%s: after Track%v", tj.AtSymb(), keys)
-	δbtail.assertTrack(t, subj, trackSet, trackNew)
+	δbtail.assertTrack(t, subj, trackSet, trackNew, ktrackNew)
 
 	δbtail._rebuildAll()
 
 	subj += " + rebuild"
-	δbtail.assertTrack(t, subj, trackSetAfterRebuild, ø)
+	δbtail.assertTrack(t, subj, trackSetAfterRebuild, ø, kø)
 
 	// verify δbtail.byRoot[treeRoot]
 	assertΔTtail(t, subj, δbtail, tj, treeRoot, vδTok...)
@@ -1679,9 +1687,9 @@ func assertΔTtail(t *testing.T, subj string, δbtail *ΔBtail, tj *xbtreetest.C
 	}
 }
 
-// assertTrack verifies state of .trackSet and ΔTtail.trackNew.		XXX and .ktrackNew
+// assertTrack verifies state of .trackSet and ΔTtail.(k)trackNew.
 // it assumes that only one tree root is being tracked.
-func (δBtail *ΔBtail) assertTrack(t *testing.T, subj string, trackSetOK blib.PPTreeSubSet, trackNewOK blib.PPTreeSubSet) {
+func (δBtail *ΔBtail) assertTrack(t *testing.T, subj string, trackSetOK blib.PPTreeSubSet, trackNewOK blib.PPTreeSubSet, ktrackNewOK *blib.RangedKeySet) {
 	t.Helper()
 	if !δBtail.trackSet.Equal(trackSetOK) {
 		t.Errorf("%s: trackSet:\n\thave: %v\n\twant: %v", subj, δBtail.trackSet, trackSetOK)
@@ -1692,8 +1700,14 @@ func (δBtail *ΔBtail) assertTrack(t *testing.T, subj string, trackSetOK blib.P
 		roots.Add(root)
 	}
 
+	tEmpty := trackNewOK.Empty()
+	kEmpty := ktrackNewOK.Empty()
+	if tEmpty != kEmpty {
+		t.Errorf("BUG: %s: empty(trackNewOK) != empty(ktrackNewOK)", subj)
+		return
+	}
 	nrootsOK := 1
-	if trackSetOK.Empty() && trackNewOK.Empty() {
+	if trackSetOK.Empty() && tEmpty {
 		nrootsOK = 0
 	}
 	if len(roots) != nrootsOK {
@@ -1720,6 +1734,9 @@ func (δBtail *ΔBtail) assertTrack(t *testing.T, subj string, trackSetOK blib.P
 	if !δTtail.trackNew.Equal(trackNewOK) {
 		t.Errorf("%s: vδT.trackNew:\n\thave: %v\n\twant: %v", subj, δTtail.trackNew, trackNewOK)
 	}
+	if !δTtail.ktrackNew.Equal(ktrackNewOK) {
+		t.Errorf("%s: vδT.ktrackNew:\n\thave: %v\n\twant: %v", subj, δTtail.ktrackNew, ktrackNewOK)
+	}
 }
 
 // trackSet returns what should be ΔBtail.trackSet coverage for specified tracked key set.