.

wcfs/δbtail_test.go

@@ -884,11 +884,9 @@ func xverifyΔBTail_rebuild(t *testing.T, db *zodb.DB, treeRoot zodb.Oid, t0, t1
 		fmt.Printf("@%s:  %v\n", xat[t1.at], t1.xkv.Flatten())
 		fmt.Printf("@%s:  %v\n", xat[t2.at], t2.xkv.Flatten())
 
-		kadj01 := KAdj(t0,t1, allTestKeys(t0,t1,t2))
-		kadj11 := KAdj(t1,t1, allTestKeys(t0,t1,t2))
+		kadj10 := KAdj(t1,t0, allTestKeys(t0,t1,t2))
+		kadj21 := KAdj(t2,t1, allTestKeys(t0,t1,t2))
 		kadj12 := KAdj(t1,t2, allTestKeys(t0,t1,t2))
-		kadj22 := KAdj(t2,t2, allTestKeys(t0,t1,t2))
-		_ = kadj01
 
 		ø := trackIndex{}
 
@@ -900,10 +898,10 @@ func xverifyΔBTail_rebuild(t *testing.T, db *zodb.DB, treeRoot zodb.Oid, t0, t1
 				keys1.Add(tAllKeyv[idx1])
 			}
 
-			// δkv1_1 = t1.δxkv / kadj11(keys1)
-			keys1_1 := kadj11.Map(keys1)
+			// δkv1_1 = t1.δxkv / kadj10(keys1)
+			keys1_0 := kadj10.Map(keys1)
 			δkv1_1 := map[Key]Δstring{}
-			for k := range keys1_1 {
+			for k := range keys1_0 {
 				δv, ok := t1.δxkv[k]
 				if ok {
 					δkv1_1[k] = δv
@@ -941,6 +939,24 @@ func xverifyΔBTail_rebuild(t *testing.T, db *zodb.DB, treeRoot zodb.Oid, t0, t1
 							keys2.Add(tRestKeyv2[idx2])
 						}
 
+						// δkv1_2 = t1.δxkv / kadj10(kadj21(kadj12(keys1) | keys2))
+						// δkv2_2 = t2.δxkv / kadj10(kadj21(kadj12(keys1) | keys2))
+						keys12_2 := keys1_2.Union(keys2)
+						keys12_0 := kadj10.Map(kadj21.Map(keys12_2))
+						δkv1_2 := map[Key]Δstring{}
+						δkv2_2 := map[Key]Δstring{}
+						for k := range keys12_0 {
+							δv1, ok := t1.δxkv[k]
+							if ok {
+								δkv1_2[k] = δv1
+							}
+							δv2, ok := t2.δxkv[k]
+							if ok {
+								δkv2_2[k] = δv2
+							}
+						}
+
+/*
 						// δkv1_2 = t1.δxkv / (kadj12(keys1) | kadj22(keys2))
 						// δkv2_2 = t2.δxkv / (kadj12(keys1) | kadj22(keys2))
 						keys2_2  := kadj22.Map(keys2)
@@ -957,6 +973,7 @@ func xverifyΔBTail_rebuild(t *testing.T, db *zodb.DB, treeRoot zodb.Oid, t0, t1
 								δkv2_2[k] = δv2
 							}
 						}
+*/
 
 						// t.Run is expensive at this level of nest
 //						t.Run(" T"+keys2.String()+";R", func(t *testing.T) {