.

wcfs/internal/xbtree/δbtail.go

@@ -336,82 +336,6 @@ func (δTtail *ΔTtail) rebuild(δZtail *zodb.ΔTail, db *zodb.DB) (δtrackSet P
 		_ = δtkeycov
 
 		// XXX update .KVAtTail, .lastRevOf
-
-
-/*
-		δZTC, δtopsByRoot := δZConnectTracked(δZ.Changev, trackNew)
-
-		debugfΔBtail("\n  rebuild @%s <- @%s\n", atPrev, δZ.Rev)
-		debugfΔBtail("  δZ:\t%v\n", δZ.Changev)
-		debugfΔBtail("  trackNew:  %v\n", trackNew)
-		defer debugfΔBtail("\n\n")
-
-		// XXX len(δtopsByRoot) == 0  -> skip
-
-
-		// open ZODB connection corresponding to "current" and "prev" states
-		txn, ctx := transaction.New(context.TODO()) // XXX
-		defer txn.Abort() // XXX -> into func() or don't use defer
-
-		zconnPrev, err := db.Open(ctx, &zodb.ConnOptions{At: atPrev})
-		if err != nil {
-			return nil, err
-		}
-		zconnCurr, err := db.Open(ctx, &zodb.ConnOptions{At: δZ.Rev})
-		if err != nil {
-			return nil, err
-		}
-
-		for root, δtops := range δtopsByRoot {
-			// diff backwards curr -> prev
-			δT, δtrack, δtkeycov, err := treediff(ctx, root, δtops, δZTC, trackNew, zconnCurr, zconnPrev)
-			if err != nil {
-				return nil, err
-			}
-
-			// FIXME use δtkeycov to recompute track coverage
-			_ = δtkeycov
-
-			debugfΔBtail("  -> root<%s>  δkv*: %v  δtrack*: %v\n", root, δT, δtrack)
-
-			trackNew.ApplyΔ(δtrack)
-//			vδtrack = append([]*ΔPPTreeSubSet{δtrack}, vδtrack...)
-
-			if len(δT) == 0 { // an object might be resaved without change
-				continue
-			}
-
-			// δTtail.vδT <- merge δT*
-			l := len(δTtail.vδT)
-			j := sort.Search(l, func(k int) bool {
-				return δZ.Rev <= δTtail.vδT[k].Rev
-			})
-			if j == l || δTtail.vδT[j].Rev != δZ.Rev {
-				δTcurr := ΔTree{Rev: δZ.Rev, ΔKV: map[Key]ΔValue{}}
-				// insert(@j, δTcurr)
-				δTtail.vδT = append(δTtail.vδT[:j],
-						    append([]ΔTree{δTcurr},
-						    δTtail.vδT[j:]...)...)
-			}
-			δTcurr := δTtail.vδT[j]
-
-			for k, δv := range δT {
-				// the diff was backward; δTtail entries are with diff forward
-				δv.New, δv.Old = δv.Old, δv.New
-
-				δv_, already := δTcurr.ΔKV[k]
-				if already {
-					if δv != δv_ {
-						panicf("[%v] inconsistent δv:\nδTcurr: %v\nδT:  %v", k, δTcurr, δT)
-					}
-				} else {
-					δTcurr.ΔKV[k] = δv
-				}
-			}
-
-			// XXX update .KVAtTail, .lastRevOf
-		}
-*/
 	}
 
 /*