.

wcfs/internal/xbtree/δbtail.go

@@ -420,42 +420,6 @@ func (δTtail *_ΔTtail) rebuild(root zodb.Oid, δZtail *zodb.ΔTail, db *zodb.D
 	return trackNew, δrevSet, nil
 }
 
-// widenTrackNew widens trackNew to cover δtkeycov.
-func widenTrackNew(trackNew blib.PPTreeSubSet, δtkeycov *blib.RangedKeySet, root zodb.Oid, at zodb.Tid, db *zodb.DB) (err error) {
-	// XXX errctx, debug
-	defer xerr.Contextf(&err, "widenTrackNew tree<%s> @%s +%s", root, at, δtkeycov)
-
-	txn, ctx := transaction.New(context.TODO()) // XXX
-	defer txn.Abort()
-
-	zhead, err := db.Open(ctx, &zodb.ConnOptions{At: at});  /*X*/ if err != nil { return err }
-	xtree, err := zgetNodeOrNil(ctx, zhead, root);          /*X*/ if err != nil { return err }
-	if xtree == nil {
-		// root deleted -> root node covers [-∞,∞)
-		trackNew.AddPath([]zodb.Oid{root})
-		return nil
-	}
-	tree := xtree.(*Tree) // must succeed
-
-	top := &nodeInRange{prefix: nil, keycov: blib.KeyRange{KeyMin, KeyMax}, node: tree}
-	V   := rangeSplit{top}
-	for _, r := range δtkeycov.AllRanges() {
-		lo := r.Lo
-		for {
-			b, err := V.GetToLeaf(ctx, lo);  /*X*/ if err != nil { return err }
-			trackNew.AddPath(b.Path())
-
-			// continue with next right bucket until r coverage is complete
-			if r.Hi_ <= b.keycov.Hi_ {
-				break
-			}
-			lo = b.keycov.Hi_ + 1
-		}
-	}
-	return nil
-}
-
-
 // rebuild1 rebuilds δT for single δZ.
 //
 // δtrackNew/δtkeycov represents how trackNew changes when going through `atPrev <- δZ.Rev` .
@@ -548,6 +512,41 @@ func (δTtail *_ΔTtail) rebuild1(atPrev zodb.Tid, δZ zodb.ΔRevEntry, trackNew
 	return δtrack, δtkeycov, newRevEntry, nil
 }
 
+// widenTrackNew widens trackNew to cover δtkeycov.
+func widenTrackNew(trackNew blib.PPTreeSubSet, δtkeycov *blib.RangedKeySet, root zodb.Oid, at zodb.Tid, db *zodb.DB) (err error) {
+	defer xerr.Contextf(&err, "widenTrackNew tree<%s> @%s +%s", root, at, δtkeycov)
+	debugfΔBtail("\n  widenTrackNew %s @%s +%s", root, at, δtkeycov)
+
+	txn, ctx := transaction.New(context.TODO()) // XXX
+	defer txn.Abort()
+
+	zhead, err := db.Open(ctx, &zodb.ConnOptions{At: at});  /*X*/ if err != nil { return err }
+	xtree, err := zgetNodeOrNil(ctx, zhead, root);          /*X*/ if err != nil { return err }
+	if xtree == nil {
+		// root deleted -> root node covers [-∞,∞)
+		trackNew.AddPath([]zodb.Oid{root})
+		return nil
+	}
+	tree := xtree.(*Tree) // must succeed
+
+	top := &nodeInRange{prefix: nil, keycov: blib.KeyRange{KeyMin, KeyMax}, node: tree}
+	V   := rangeSplit{top}
+	for _, r := range δtkeycov.AllRanges() {
+		lo := r.Lo
+		for {
+			b, err := V.GetToLeaf(ctx, lo);  /*X*/ if err != nil { return err }
+			trackNew.AddPath(b.Path())
+
+			// continue with next right bucket until r coverage is complete
+			if r.Hi_ <= b.keycov.Hi_ {
+				break
+			}
+			lo = b.keycov.Hi_ + 1
+		}
+	}
+	return nil
+}
+
 
 // Update updates δB with object-level ZODB changes.
 //