.

wcfs/δbtail.go

@@ -716,28 +716,11 @@ func diffT(ctx context.Context, a, b *Tree, δZTC SetOid, trackIdx map[zodb.Oid]
 	fmt.Printf("  T %s %s\n", xidOf(a), xidOf(b))
 	defer xerr.Contextf(&err, "diffT %s %s", xidOf(a), xidOf(b))
 
-/*
-	var av []TreeEntry
-	var bv []TreeEntry
-	if a != nil {
-		err = a.PActivate(ctx);  if err != nil { return nil, err }
-		defer a.PDeactivate()
-		av  = a.Entryv() // key↑
-	}
-	if b != nil {
-		err = b.PActivate(ctx);  if err != nil { return nil, err }
-		defer b.PDeactivate()
-		bv  = b.Entryv() // key↑
-	}
-	fmt.Printf("  av: %s\n", vtree(av))
-	fmt.Printf("  bv: %v\n", vtree(bv))
-*/
-
 	δ = map[Key]ΔValue{}
 	defer fmt.Printf("    -> δt: %v\n", δ)
 
-	var av rangeSplit
-	var bv rangeSplit
+	var av rangeSplit // nodes expanded from a
+	var bv rangeSplit // nodes expanded from b
 
 	// initial phase: expand changed nodes in a till buckets;
 	// XXX changed buckets -> δ-
@@ -768,8 +751,11 @@ func diffT(ctx context.Context, a, b *Tree, δZTC SetOid, trackIdx map[zodb.Oid]
 						return nil, err
 					}
 
-					// XXX δ <- δA
+					// δ <- δA
+					δMerge(δ, δA)
+
 					// XXX AKeysDone <- δA
+					// XXX Bqueue    <- δA
 				}
 			}
 		}
@@ -792,13 +778,15 @@ func diffT(ctx context.Context, a, b *Tree, δZTC SetOid, trackIdx map[zodb.Oid]
 
 		// XXX check bucket for already "done" (i.e. taken into account)
 
-		bbucket.node.(*Bucket)
 		δB, err := diffB(ctx, nil, bbucket.node.(*Bucket))
 		if err != nil {
 			return nil, err
 		}
 
-		// XXX δ <- δB
+		// δ <- δB
+		δMerge(δ, δB)
+
+		// XXX Aqueue <- δB
 		for k, δv := range δ {
 			if !AKeysDone.Has(k) {
 				Akeysq.Add(k)
@@ -881,7 +869,7 @@ func diffT(ctx context.Context, a, b *Tree, δZTC SetOid, trackIdx map[zodb.Oid]
 		}
 
 		// merge δ <- δc
-		δmergeInto(δ, δc)
+		δMerge(δ, δc)
 
 		// update δc -> tracked keys
 
@@ -915,9 +903,9 @@ func diffT(ctx context.Context, a, b *Tree, δZTC SetOid, trackIdx map[zodb.Oid]
 }
 
 
-// δmergeInto merges changes from δ2 into δ.
-// Usually δ is total-building δ, while δ2 is diff from comparing some subnodes.
-func δmergeInto(δ, δ2 map[Key]ΔValue) {
+// δMerge merges changes from δ2 into δ.
+// δ is total-building diff, while δ2 is diff from comparing some subnodes.
+func δMerge(δ, δ2 map[Key]ΔValue) {
 	// merge δ <- δ2
 	for k, δv2 := range δ2 {
 		δv1, already := δ[k]
@@ -928,6 +916,7 @@ func δmergeInto(δ, δ2 map[Key]ΔValue) {
 
 		// both δ and δ2 has [k] - it can be that key
 		// entry migrated from one bucket into another.
+		// XXX also handle ø->ø + ø->c  i.e. [k] was hole and become value
 		if !( (δv1.New == VDEL && δv2.Old == VDEL) ||
 		      (δv1.Old == VDEL && δv2.New == VDEL) ) {
 			return nil, fmt.Errorf("BUG or btree corrupt: [%v] has " +