.

wcfs/internal/xbtree/δbtail.go

@@ -467,7 +467,7 @@ func (δBtail *ΔBtail) vδTSnapForTrackedKey(root zodb.Oid, key Key) (vδT []Δ
 
 	// key ∈ ktrackNew  ->  this goroutine becomes responsible to start rebuilding vδT for it
 	// run rebuild job for all keys queued in ktrackNew so far
-	err = δTtail._runRebuildJob(root, δBtail)
+	err = δTtail._rebuild(root, δBtail)
 	if err == nil {
 		vδT = δTtail.vδT
 	}
@@ -505,7 +505,7 @@ func (δBtail *ΔBtail) vδTSnapForTracked(root zodb.Oid) (vδT []ΔTree, err er
 	// run new rebuild job if there are not-yet-handled Track requests
 	var errJob error
 	if !δTtail.ktrackNew.Empty() {
-		errJob = δTtail._runRebuildJob(root, δBtail)
+		errJob = δTtail._rebuild(root, δBtail)
 	}
 
 	// wait for previous jobs to complete as well
@@ -525,17 +525,15 @@ func (δBtail *ΔBtail) vδTSnapForTracked(root zodb.Oid) (vδT []ΔTree, err er
 	return vδT, nil
 }
 
-// _runRebuildJob runs rebuild job for current .ktrackNew/.trackNew
+// _rebuild runs rebuild job for current .ktrackNew/.trackNew
 //
 // must be called with δBtail.mu locked.
 // returns with        δBtail.mu locked.
-//
-// XXX naming -> _rebuild1 ?
-func (δTtail *_ΔTtail) _runRebuildJob(root zodb.Oid, δBtail *ΔBtail) (err error) {
-	return δTtail.__runRebuildJob(root, δBtail, /*releaseLock=*/true)
+func (δTtail *_ΔTtail) _rebuild(root zodb.Oid, δBtail *ΔBtail) (err error) {
+	return δTtail.__rebuild(root, δBtail, /*releaseLock=*/true)
 }
-func (δTtail *_ΔTtail) __runRebuildJob(root zodb.Oid, δBtail *ΔBtail, releaseLock bool) (err error) {
-	// XXX errctx
+func (δTtail *_ΔTtail) __rebuild(root zodb.Oid, δBtail *ΔBtail, releaseLock bool) (err error) {
+	defer xerr.Contextf(&err, "ΔBtail._rebuild root<%s>", root)
 	job := &_RebuildJob{ready: make(chan struct{})}
 
 	trackNew  := δTtail.trackNew
@@ -730,12 +728,12 @@ func (δBtail *ΔBtail) _Update1(δZ *zodb.EventCommit) (δB1 _ΔBUpdate1, err e
 
 // _rebuildAll rebuilds ΔBtail taking all trackNew requests into account.
 func (δBtail *ΔBtail) _rebuildAll() (err error) {
-	defer xerr.Context(&err, "ΔBtail _rebuildAll")
+	defer xerr.Context(&err, "ΔBtail._rebuildAll")
 	tracefΔBtail("\nRebuildAll @%s..@%s    trackNewRoots: %s\n", δBtail.Tail(), δBtail.Head(), δBtail.trackNewRoots)
 
 	for root := range δBtail.trackNewRoots {
 		δTtail := δBtail.byRoot[root] // must be there
-		err = δTtail.__runRebuildJob(root, δBtail, /*releaseLock=*/false)
+		err = δTtail.__rebuild(root, δBtail, /*releaseLock=*/false)
 		if err != nil {
 			return err
 		}
@@ -852,7 +850,7 @@ func (δTtail *_ΔTtail) _forgetPast(revCut zodb.Tid) {
 // key must be tracked
 // at  must ∈ (tail, head]
 func (δBtail *ΔBtail) GetAt(root zodb.Oid, key Key, at zodb.Tid) (value Value, rev zodb.Tid, valueExact, revExact bool, err error) {
-	defer xerr.Contextf(&err, "δBtail: root<%s>: get %d @%s", root, key, at)
+	defer xerr.Contextf(&err, "ΔBtail: root<%s>: get %d @%s", root, key, at)
 
 	if traceΔBtail {
 		tracefΔBtail("\nGet root<%s>[%s] @%s\n", root, kstr(key), at)
@@ -1172,7 +1170,7 @@ func vδTMerge1Inplace(pvδT *[]ΔTree, δT ΔTree) (newRevEntry bool) {
 
 // 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)
+	defer xerr.Contextf(&err, "widenTrackNew root<%s> @%s +%s", root, at, δtkeycov)
 	debugfΔBtail("\n  widenTrackNew %s @%s +%s", root, at, δtkeycov)
 
 	txn, ctx := transaction.New(context.TODO()) // TODO - merge in cancel via ctx arg
@@ -1206,10 +1204,8 @@ func widenTrackNew(trackNew blib.PPTreeSubSet, δtkeycov *blib.RangedKeySet, roo
 }
 
 
-
 // ----------------------------------------
 
-
 // ΔZtail returns raw ZODB changes accumulated in δBtail so far.
 //
 // the caller must not modify returned δZtail.