Artifact 3b85be57eb2785a64549b34904e13b0d2c4c70fa484fccc7e3a63d809d595045:
- File
internal/content/availability_cache_test.go
— part of check-in
[81fbc0be5f]
at
2026-07-24 17:23:36
on branch trunk
— manifest: fix crosslink's WAL/availability/mlink working-set problems (#158)
* manifest: batch crosslink, memoize availability, preload mlink parents (#89)
Three throughput fixes for the whole-repository crosslink sweep, none of which change its observable output. Profiling the sweep on the Fossil SCM corpus (67,503 blobs, 27,084 events) after the delta-chain-order work (#126) found the earlier bottlenecks had moved on:
- Per-candidate transactions made every SQL statement open its own WAL read-transaction, whose setup cost climbs as the uncheckpointed WAL grows -- throughput collapsed from ~200 events/sec to ~7 within a few seconds of a large sweep. The sweep now commits in batches of crosslinkBatchSize candidates so SQLite checkpoints and truncates the WAL between batches, holding read-transaction cost flat. Batch-granular durability is correct for derived data: an interrupted sweep leaves committed batches and the candidate query re-selects only what is still unlinked. CrosslinkContext is split into crosslinkSweep / collectCrosslinkCandidates / linkCandidatesInOrder / linkBatch, with the per-artifact dispatch pulled into linkArtifact and the deferral rollup into deferCheckin / logDeferredCheckins.
- missingCheckinRefs walked a blob's whole delta chain (content.IsAvailable) once per F-card of every check-in to decide deferral -- ~40% of the sweep, re-walking the same file chains over and over. content.AvailabilityCache memoizes the verdict per rid and stops a walk at the first already-decided ancestor, bounding total walk work by the number of distinct blobs rather than F-card references.
- resolveMlinkParent looked up each F-card's parent version with SELECT ... FROM mlink WHERE mid=? AND fnid=?, which SQLite answers via the fnid index -- returning a file's entire crosslinked history, so the lookup grew as the mlink table did. loadMlinkParents now reads each parent's file set once with a single mid-indexed scan and resolves every F-card from the in-memory map. It reads exactly the same rows, so the mlink output is unchanged.
The crosslink helpers now take the batch's *db.Tx directly (replacing r *repo.Repo + per-helper r.WithTx), matching the single-transaction shape of internal/verify.Rebuild and letting a whole batch commit atomically; tag application routes through tag.ApplyTagWithTx. updateAttachmentComments materializes its cursor before writing so a single connection never runs two statements at once. crosslinkSingle (dephantomize) wraps its one artifact in its own transaction.
Whole suite green (1235 tests, 35 packages, incl. dst and the fossil-binary comparison). This does not by itself land #89's "minutes not hours" target; the dominant remaining cost is a separate, pre-existing mlink over-insertion documented on the issue.
* manifest: diff crosslink mlink against the parent manifest (#89)
insertCheckinMlinks emitted one mlink row per F-card and read pmid/pid from the parent's mlink rows. On the Fossil SCM repository that is ~180x canonical's row count (a full sweep would write ~19M rows against fossil's own 104,880), and because delta-chain order (#102/#126) routinely crosslinks a child before its parent, the parent's mlink rows were usually absent, so ~97% of rows defaulted to pid=0 -- wrong parent-column data independent of the volume.
Rewrite it to diff each check-in's file list against its primary parent's expanded manifest -- the same diff canonical Fossil computes in add_mlink (src/manifest.c) and the rebuild path already does in internal/verify.rebuildMlinks -- and emit a row only for a file that was added, modified, deleted, or renamed. pmid/pid now come from the parent MANIFEST, which is always present once a check-in is eligible to link, so pid is correct regardless of crosslink order. The parent expansion runs through the sweep's shared content cache, so each parent's delta chain is walked at most once across all its children.
Measured on the Fossil SCM corpus: 127,775 mlink rows (canonical: 104,878) with pid populated on 74% of rows (was ~3%); full-repo crosslink completes in ~15 minutes rather than the prior ~hour. The residual gap is 95 PGP-clearsigned parent manifests deck.Parse cannot yet strip, whose ~98 children fall back to the old all-added behavior -- a pre-existing deck limitation tracked separately. (user: [email protected], size: 3907) [annotate] [blame] [check-ins using]
package content import ( "testing" "github.com/danmestas/go-libfossil/internal/blob" libfossil "github.com/danmestas/go-libfossil/internal/fsltype" _ "github.com/danmestas/go-libfossil/internal/testdriver" ) // TestAvailabilityCacheMatchesIsAvailable pins that the memoizing availability // cache returns, for every kind of blob, exactly what the unmemoized // IsAvailable/AvailableByUUID pair returns. Methodology: build one grounded // delta chain, one full-text blob, and one phantom, then assert each verdict // twice through the cache (second call served from the memo) equals the direct // answer. func TestAvailabilityCacheMatchesIsAvailable(t *testing.T) { d := setupTestDB(t) // Grounded chain: full-text root + one delta on it. source := []byte("the original source content for availability cache testing here") target := []byte("the original source content for MODIFIED availability cache here") srcRid, srcUUID, err := blob.Store(d, source) if err != nil { t.Fatalf("Store source: %v", err) } deltaRid, deltaUUID, err := blob.StoreDelta(d, target, srcRid) if err != nil { t.Fatalf("StoreDelta: %v", err) } // A phantom blob: present row, unreadable content. phantomUUID := "0000000000000000000000000000000000000abc" if _, err := blob.StorePhantom(d, phantomUUID); err != nil { t.Fatalf("StorePhantom: %v", err) } cache := NewAvailabilityCache() cases := []struct { name string uuid string want bool }{ {"full-text root", srcUUID, true}, {"grounded delta", deltaUUID, true}, {"phantom", phantomUUID, false}, {"unknown uuid", "ffffffffffffffffffffffffffffffffffffffff", false}, } for _, tc := range cases { wantRid, want := AvailableByUUID(d, tc.uuid) if want != tc.want { t.Fatalf("%s: AvailableByUUID reference = %v, want %v", tc.name, want, tc.want) } // Twice: first computes and memoizes, second is served from the memo. for pass := 0; pass < 2; pass++ { gotRid, got := cache.ByUUID(d, tc.uuid) if got != want || gotRid != wantRid { t.Fatalf("%s pass %d: cache.ByUUID = (%d,%v), want (%d,%v)", tc.name, pass, gotRid, got, wantRid, want) } } } _ = deltaRid } // TestAvailabilityCacheServesChainFromMemo proves the cache short-circuits a // walk at the deepest already-decided ancestor. Methodology: expand a chain one // node at a time from the root down; after each node's verdict is cached, // deciding the next (deeper) node must touch only the one new row, which we // verify by counting queries through a wrapping Querier. func TestAvailabilityCacheServesChainFromMemo(t *testing.T) { d := setupTestDB(t) // Build a linear grounded chain root <- d1 <- d2 <- d3, each a delta on the // previous. Every node is available. root := []byte("chain root content long enough for the delta encoder to bite") rootRid, _, err := blob.Store(d, root) if err != nil { t.Fatalf("Store root: %v", err) } prev := rootRid chain := []libfossil.FslID{rootRid} for i := 0; i < 3; i++ { next := append([]byte{byte('a' + i)}, root...) rid, _, err := blob.StoreDelta(d, next, prev) if err != nil { t.Fatalf("StoreDelta %d: %v", i, err) } chain = append(chain, rid) prev = rid } cache := NewAvailabilityCache() counter := &countingQuerier{inner: d} // Decide root first: walks exactly one node. if !cache.isAvailable(counter, rootRid) { t.Fatalf("root not available") } // Deciding each deeper node with its base already memoized must read only // the node's own row (one availability step, then a memo hit on its base). // Decide nodes shallow-to-deep so each finds its base cached. for i := 1; i < len(chain); i++ { counter.availSteps = 0 if !cache.isAvailable(counter, chain[i]) { t.Fatalf("chain[%d] not available", i) } if counter.availSteps != 1 { t.Fatalf("chain[%d]: %d availability steps, want 1 (base must be a memo hit)", i, counter.availSteps) } } }