.

wcfs/internal/xbtree/δbtail.go

@@ -130,12 +130,12 @@ const debugΔBtail = false
 //
 // See also zodb.ΔTail and zdata.ΔFtail
 type ΔBtail struct {
-	// raw ZODB changes; Kept to rebuild .vδTbyRoot after new Track.
+	// raw ZODB changes; Kept to rebuild .byRoot after new Track.
 	// includes all changed objects, not only tracked ones.
 	δZtail *zodb.ΔTail
 
-	vδBroots  []_ΔBroots            // [] (rev↑, roots changed in this rev)
-	vδTbyRoot map[zodb.Oid]*_ΔTtail // {} root -> [] k/v change history; only for keys ∈ tracked subset
+	vδBroots  []_ΔBroots         // [] (rev↑, roots changed in this rev)
+	byRoot map[zodb.Oid]*_ΔTtail // {} root -> [] k/v change history; only for keys ∈ tracked subset
 
 	// set of tracked nodes as of @head state.
 	// For this set all vδT are fully computed.
@@ -195,7 +195,7 @@ func NewΔBtail(at0 zodb.Tid, db *zodb.DB) *ΔBtail {
 	return &ΔBtail{
 		δZtail:        zodb.NewΔTail(at0),
 		vδBroots:      nil,
-		vδTbyRoot:     map[zodb.Oid]*_ΔTtail{},
+		byRoot:        map[zodb.Oid]*_ΔTtail{},
 		trackSet:      blib.PPTreeSubSet{},
 		trackNewRoots: setOid{},
 		db:            db,
@@ -229,10 +229,10 @@ func (orig *ΔBtail) Clone() *ΔBtail {
 		klon.vδBroots = append(klon.vδBroots, klonδBroots)
 	}
 
-	// vδTbyRoot
-	klon.vδTbyRoot = make(map[zodb.Oid]*_ΔTtail, len(orig.vδTbyRoot))
-	for root, origΔTtail := range orig.vδTbyRoot {
-		klon.vδTbyRoot[root] = origΔTtail.Clone()
+	// byRoot
+	klon.byRoot = make(map[zodb.Oid]*_ΔTtail, len(orig.byRoot))
+	for root, origΔTtail := range orig.byRoot {
+		klon.byRoot[root] = origΔTtail.Clone()
 	}
 
 	// trackSet, trackNewRoots
@@ -358,10 +358,10 @@ func (δBtail *ΔBtail) track(key Key, path []zodb.Oid) {
 	}
 
 	// queue path into trackNew
-	δTtail, ok := δBtail.vδTbyRoot[root]
+	δTtail, ok := δBtail.byRoot[root]
 	if !ok {
 		δTtail = newΔTtail()
-		δBtail.vδTbyRoot[root] = δTtail
+		δBtail.byRoot[root] = δTtail
 	}
 
 	δBtail.trackNewRoots.Add(root)
@@ -399,7 +399,7 @@ func (δBtail *ΔBtail) rebuild1IfNeeded(root zodb.Oid) error {
 // rebuild1 rebuilds ΔBtail for single root.
 func (δBtail *ΔBtail) rebuild1(root zodb.Oid) error {
 	// XXX locking
-	δTtail := δBtail.vδTbyRoot[root] // must be there
+	δTtail := δBtail.byRoot[root] // must be there
 	δtrackSet, δrevSet, err := δTtail.rebuild(root, δBtail.δZtail, δBtail.db)
 	if err != nil {
 		return err
@@ -640,7 +640,7 @@ func (δBtail *ΔBtail) Update(δZ *zodb.EventCommit) (_ ΔB, err error) {
 
 	δB := ΔB{Rev: δZ.Tid, ByRoot: make(map[zodb.Oid]map[Key]ΔValue)}
 	for root, δT1 := range δB1.ByRoot {
-		δTtail := δBtail.vδTbyRoot[root] // must succeed
+		δTtail := δBtail.byRoot[root] // must succeed
 
 		// δtkeycov1 != ø   ->  rebuild δTtail with trackNew ~= δtkeycov1
 		if !δT1.δtkeycov1.Empty() && δBtail.δZtail.Len() > 1 {
@@ -701,7 +701,7 @@ func (δBtail *ΔBtail) _Update1(δZ *zodb.EventCommit) (δB1 _ΔBUpdate1, err e
 	tracefΔBtail("\nUpdate  @%s -> @%s    δZ: %v\n", δBtail.Head(), δZ.Tid, δZ.Changev)
 	tracefΔBtail("trackSet:       %v\n", δBtail.trackSet)
 	for _, root := range δBtail.trackNewRoots.SortedElements() {
-		δTtail := δBtail.vδTbyRoot[root]
+		δTtail := δBtail.byRoot[root]
 		tracefΔBtail("[%s].trackNew:  %v\n", root, δTtail.trackNew)
 	}
 
@@ -745,7 +745,7 @@ func (δBtail *ΔBtail) _Update1(δZ *zodb.EventCommit) (δB1 _ΔBUpdate1, err e
 
 		tracefΔBtail("\n-> root<%s>  δkv: %v  δtrack: %v  δtkeycov: %v\n", root, δT, δtrack, δtkeycov)
 
-		δTtail := δBtail.vδTbyRoot[root] // must be there
+		δTtail := δBtail.byRoot[root] // must be there
 		if len(δT) > 0 { // an object might be resaved without change
 			// NOTE no need to clone .vδT here because we only append to it:
 			//      Even though queries return vδT aliases, append
@@ -809,7 +809,7 @@ func (δBtail *ΔBtail) ForgetPast(revCut zodb.Tid) {
 
 	// trim roots
 	for root := range totrim {
-		δTtail := δBtail.vδTbyRoot[root] // must be present
+		δTtail := δBtail.byRoot[root] // must be present
 		δTtail.forgetPast(revCut)
 	}
 }
@@ -875,7 +875,7 @@ func (δBtail *ΔBtail) GetAt(root zodb.Oid, key Key, at zodb.Tid) (value Value,
 		return value, rev, valueExact, revExact, err
 	}
 
-	δTtail := δBtail.vδTbyRoot[root]
+	δTtail := δBtail.byRoot[root]
 	if δTtail == nil {
 		panicf("δBtail: root<%s> not tracked", root)
 	}
@@ -924,7 +924,7 @@ func (δBtail *ΔBtail) SliceByRootRev(root zodb.Oid, lo, hi zodb.Tid) /*readonl
 		panic(err) // XXX
 	}
 
-	δTtail, ok := δBtail.vδTbyRoot[root]
+	δTtail, ok := δBtail.byRoot[root]
 	if !ok {
 		return []ΔTree{}
 	}

wcfs/internal/xbtree/δbtail_test.go

@@ -738,8 +738,21 @@ func xverifyΔBTail_Update1(t *testing.T, subj string, db *zodb.DB, treeRoot zod
 	}
 
 	δB, err  := δbtail.Update(δZ);     X(err)
-	// XXX assert δB.roots == δTKeyCov roots
-	// XXX assert δBtail[root].vδT = δBtail_[root].vδT
+
+	// assert δBtail[root].vδT = δBtail_[root].vδT
+	//
+	// NOTE we don't verify .roots because δB1.roots always has treeRoot because
+	// for debugging δtkeycov information is always recorded, even if empty.
+	var vδT, vδT_ []ΔTree
+	if δttail, ok := δbtail.byRoot[treeRoot]; ok {
+		vδT = δttail.vδT
+	}
+	if δttail_, ok := δbtail_.byRoot[treeRoot]; ok {
+		vδT_ = δttail_.vδT
+	}
+	if !reflect.DeepEqual(vδT, vδT_) {
+		badf("δBtail.vδT differs after Update and _Update1:\n_Update1: %v\n  Update: %v", vδT_, vδT)
+	}
 
 	if δB.Rev != δZ.Tid {
 		badf("δB: rev != δZ.Tid  ; rev=%s  δZ.Tid=%s", δB.Rev, δZ.Tid)
@@ -1017,7 +1030,7 @@ func xverifyΔBTail_rebuild_U(t *testing.T, δbtail *ΔBtail, treeRoot zodb.Oid,
 	}
 
 	δroots := setOid{}
-	for root := range δbtail.vδTbyRoot {
+	for root := range δbtail.byRoot {
 		δroots.Add(root)
 	}
 	δToid, ok := δB.ByRoot[treeRoot]
@@ -1053,7 +1066,7 @@ func xverifyΔBTail_rebuild_TR(t *testing.T, δbtail *ΔBtail, tj *xbtreetest.Co
 
 	// XXX verify Get -> XXX assertΔTtail ?
 
-	// verify δbtail.vδTbyRoot[treeRoot]
+	// verify δbtail.byRoot[treeRoot]
 	assertΔTtail(t, subj, δbtail, tj, treeRoot, vδTok...)
 }
 
@@ -1210,7 +1223,7 @@ func TestΔBtailSliceByRootRev(t_ *testing.T) {
 	trackKeys(δbtail, t2, _2)
 	err = δbtail.rebuildAll();  X(err)
 
-	δttail := δbtail.vδTbyRoot[t.Root()]
+	δttail := δbtail.byRoot[t.Root()]
 
 	// assertvδT asserts that vδT matches vδTok
 	assertvδT := func(subj string, vδT []ΔTree, vδTok ...ΔT) {
@@ -1535,7 +1548,7 @@ func assertΔTtail(t *testing.T, subj string, δbtail *ΔBtail, tj *xbtreetest.C
 		t0 = t0.Prev
 	}
 	vδTok = vδTok_
-	δTtail, ok := δbtail.vδTbyRoot[treeRoot]
+	δTtail, ok := δbtail.byRoot[treeRoot]
 	var vδToid []ΔTree
 	if ok {
 		vδToid = δTtail.vδT
@@ -1597,7 +1610,7 @@ func (δBtail *ΔBtail) assertTrack(t *testing.T, subj string, trackSetOK blib.P
 	}
 
 	roots := setOid{}
-	for root := range δBtail.vδTbyRoot {
+	for root := range δBtail.byRoot {
 		roots.Add(root)
 	}
 
@@ -1606,7 +1619,7 @@ func (δBtail *ΔBtail) assertTrack(t *testing.T, subj string, trackSetOK blib.P
 		nrootsOK = 0
 	}
 	if len(roots) != nrootsOK {
-		t.Errorf("%s: len(vδTbyRoot) != %d   ; roots=%v", subj, nrootsOK, roots)
+		t.Errorf("%s: len(byRoot) != %d   ; roots=%v", subj, nrootsOK, roots)
 		return
 	}
 	if nrootsOK == 0 {
@@ -1615,7 +1628,7 @@ func (δBtail *ΔBtail) assertTrack(t *testing.T, subj string, trackSetOK blib.P
 
 	root := roots.Elements()[0]
 
-	δTtail := δBtail.vδTbyRoot[root]
+	δTtail := δBtail.byRoot[root]
 
 	trackNewRootsOK := setOid{}
 	if !trackNewOK.Empty() {