.

wcfs/δbtail.go

@@ -719,8 +719,12 @@ func diffT(ctx context.Context, a, b *Tree, δZTC SetOid, trackIdx map[zodb.Oid]
 	δ = map[Key]ΔValue{}
 	defer fmt.Printf("    -> δt: %v\n", δ)
 
-	var av rangeSplit // nodes expanded from a
-	var bv rangeSplit // nodes expanded from b
+	var av rangeSplit  // nodes expanded from a
+	var bv rangeSplit  // nodes expanded from b
+	Aqueue := SetKey{} // "to process" keys on A
+	Bqueue := SetKey{} // "to process" keys on B
+	Adone  := SetKey{} // "processed" keys on A
+	Bdone  := SetKey{} // "processed" keys on B
 
 	// initial phase: expand changed nodes in a till buckets;
 	// XXX changed buckets -> δ-
@@ -754,7 +758,7 @@ func diffT(ctx context.Context, a, b *Tree, δZTC SetOid, trackIdx map[zodb.Oid]
 					// δ <- δA
 					δMerge(δ, δA)
 
-					// XXX AKeysDone <- δA
+					// XXX Adone <- δA
 					// XXX Bqueue    <- δA
 				}
 			}
@@ -769,8 +773,8 @@ func diffT(ctx context.Context, a, b *Tree, δZTC SetOid, trackIdx map[zodb.Oid]
 		btop := &nodeInRange{lo: KeyMin, hi_: KeyMax, node: b} // [-∞, ∞)
 		bv   = rangeSplit{btop}
 	}
-	for k := range Bkeysq {
-		BKeysDone.Add(k)
+	for k := range Bqueue {
+		Bdone.Add(k)
 		bbucket, ok, err := bv.GetToBucket(ctx, k)
 		if !ok {
 			continue // key not covered
@@ -786,10 +790,10 @@ func diffT(ctx context.Context, a, b *Tree, δZTC SetOid, trackIdx map[zodb.Oid]
 		// δ <- δB
 		δMerge(δ, δB)
 
-		// XXX Aqueue <- δB
+		// Aqueue <- δB
 		for k, δv := range δ {
-			if !AKeysDone.Has(k) {
-				Akeysq.Add(k)
+			if !Adone.Has(k) {
+				Aqueue.Add(k)
 			}
 		}