Artifact 58c1d3178295faca891c9febe48011704c2be2d6f49c708aa12ceace308480b2:
- File
internal/verify/check_derived.go
— part of check-in
[39b524c37c]
at
2026-10-19 12:56:28
on branch feat/submanifest-reader
— fix(verify): count a tree gap found in the one-pass check-in sweep
checkCheckins now gathers into a staging report and copied only its issues back, so the MissingRefs count treeGap adds was lost: Verify reported a missing sub-manifest as an issue but counted zero missing references. (user: [email protected], size: 8093) [annotate] [blame] [check-ins using] [more...]
package verify import ( "database/sql" "fmt" "sort" "github.com/danmestas/go-libfossil/db" "github.com/danmestas/go-libfossil/internal/blob" "github.com/danmestas/go-libfossil/internal/content" "github.com/danmestas/go-libfossil/internal/deck" libfossil "github.com/danmestas/go-libfossil/internal/fsltype" "github.com/danmestas/go-libfossil/internal/manifest" "github.com/danmestas/go-libfossil/internal/repo" ) // checkDerived verifies consistency of derived tables: event, mlink, plink, tagxref, filename, leaf. func checkDerived(r *repo.Repo, report *Report) error { if r == nil { panic("verify: checkDerived: nil repo") } if report == nil { panic("verify: checkDerived: nil report") } if err := checkCheckins(r, report); err != nil { return err } if err := checkLeaves(r, report); err != nil { return err } return nil } // treeGapCacheBytes bounds the cache checkCheckins gives treeGap. It holds // manifests and sub-manifests only, never file content, so it is far smaller // than an expansion cache; it has not been measured. const treeGapCacheBytes = 32 << 20 // checkCheckins verifies event and plink tables against checkin manifests. // It expands every blob once through content.ExpandAll, which visits in // delta-tree order; issues are collected apart and sorted by rid, stably, so // they keep the rid order and per-check-in order of a blob-by-blob sweep. func checkCheckins(r *repo.Repo, report *Report) error { if r == nil { panic("verify: checkCheckins: nil repo") } if report == nil { panic("verify: checkCheckins: nil report") } found := &Report{} // ExpandAll hands each blob over once; the cache serves only treeGap's // baseline and sub-manifest reads, which many check-ins share. cache := content.NewCache(treeGapCacheBytes) err := content.ExpandAll(r.DB(), func(rid libfossil.FslID, uuid string, data []byte, err error) error { if err != nil { // Not expandable - skip silently (corrupt, reported by checkBlobs) return nil } return checkOneCheckin(r, found, rid, uuid, data, cache) }) if err != nil { return fmt.Errorf("checkCheckins: %w", err) } sort.SliceStable(found.Issues, func(i, j int) bool { return found.Issues[i].RID < found.Issues[j].RID }) for _, issue := range found.Issues { report.addIssue(issue) } // found is a staging report: carry its counters over with its issues. report.MissingRefs += found.MissingRefs return nil } // checkOneCheckin verifies a single blob's derived data if it's a checkin. // data is the blob's expanded content. func checkOneCheckin( r *repo.Repo, report *Report, rid libfossil.FslID, uuid string, data []byte, cache *content.Cache, ) error { if r == nil { panic("verify: checkOneCheckin: nil repo") } if report == nil { panic("verify: checkOneCheckin: nil report") } d, err := deck.Parse(data) if err != nil { // Not a valid manifest - skip silently return nil } if d.Type != deck.Checkin { return nil } // A check-in whose tree cannot yet be walked is deferred, not damaged: it // has no derived rows by design until the sub-manifest it waits on // arrives (draft-fossil-submanifests-00 §5.2, §7.3). Report the gap as // what it is. if missing, gap := treeGap(r, d, rid, cache); gap { report.MissingRefs++ report.addIssue(Issue{ Kind: IssueMissingReference, RID: rid, UUID: uuid, Table: "blob", Message: fmt.Sprintf("checkin rid=%d uuid=%s waits on sub-manifest %s", rid, uuid, missing), }) return nil } // Check event table if err := checkEvent(r.DB(), report, rid, uuid); err != nil { return err } // Check plink table for _, parentUUID := range d.P { if err := checkPlink(r.DB(), report, rid, uuid, parentUUID); err != nil { return err } } return nil } // checkEvent verifies that a checkin has a corresponding event row. func checkEvent(q db.Querier, report *Report, rid libfossil.FslID, uuid string) error { if q == nil { panic("verify: checkEvent: nil querier") } if report == nil { panic("verify: checkEvent: nil report") } var count int err := q.QueryRow("SELECT COUNT(*) FROM event WHERE objid = ?", rid).Scan(&count) if err != nil { return fmt.Errorf("checkEvent query: %w", err) } if count == 0 { report.addIssue(Issue{ Kind: IssueEventMissing, RID: rid, UUID: uuid, Table: "event", Message: fmt.Sprintf("checkin rid=%d uuid=%s missing event row", rid, uuid), }) } return nil } // checkPlink verifies that a parent relationship has a corresponding plink row. func checkPlink(q db.Querier, report *Report, cid libfossil.FslID, childUUID string, parentUUID string) error { if q == nil { panic("verify: checkPlink: nil querier") } if report == nil { panic("verify: checkPlink: nil report") } pid, ok := blob.Exists(q, parentUUID) if !ok { // Parent doesn't exist in blob table - might be phantom return nil } var count int err := q.QueryRow("SELECT COUNT(*) FROM plink WHERE pid = ? AND cid = ?", pid, cid).Scan(&count) if err != nil { return fmt.Errorf("checkPlink query: %w", err) } if count == 0 { report.addIssue(Issue{ Kind: IssuePlinkMissing, RID: cid, UUID: childUUID, Table: "plink", Message: fmt.Sprintf("checkin rid=%d uuid=%s missing plink to parent %s", cid, childUUID, parentUUID), }) } return nil } // checkLeaves verifies that the leaf table matches actual leaves in the DAG. func checkLeaves(r *repo.Repo, report *Report) error { if r == nil { panic("verify: checkLeaves: nil repo") } if report == nil { panic("verify: checkLeaves: nil report") } expected, err := computeExpectedLeaves(r.DB()) if err != nil { return err } actual, err := getActualLeaves(r.DB()) if err != nil { return err } if !leafSetsEqual(expected, actual) { report.addIssue(Issue{ Kind: IssueLeafIncorrect, Table: "leaf", Message: fmt.Sprintf("leaf table incorrect: expected %d leaves, got %d", len(expected), len(actual)), }) } return nil } // computeExpectedLeaves finds all checkins with no children. func computeExpectedLeaves(q db.Querier) (map[libfossil.FslID]bool, error) { if q == nil { panic("verify: computeExpectedLeaves: nil querier") } leaves := make(map[libfossil.FslID]bool) query := ` SELECT e.objid FROM event e WHERE e.type='ci' AND NOT EXISTS (SELECT 1 FROM plink WHERE pid=e.objid) ` rows, err := q.Query(query) if err != nil { return nil, fmt.Errorf("computeExpectedLeaves: %w", err) } defer rows.Close() for rows.Next() { var rid int64 if err := rows.Scan(&rid); err != nil { return nil, fmt.Errorf("computeExpectedLeaves scan: %w", err) } leaves[libfossil.FslID(rid)] = true } return leaves, rows.Err() } // getActualLeaves reads the current leaf table. func getActualLeaves(q db.Querier) (map[libfossil.FslID]bool, error) { if q == nil { panic("verify: getActualLeaves: nil querier") } leaves := make(map[libfossil.FslID]bool) rows, err := q.Query("SELECT rid FROM leaf") if err == sql.ErrNoRows { return leaves, nil } if err != nil { return nil, fmt.Errorf("getActualLeaves: %w", err) } defer rows.Close() for rows.Next() { var rid int64 if err := rows.Scan(&rid); err != nil { return nil, fmt.Errorf("getActualLeaves scan: %w", err) } leaves[libfossil.FslID(rid)] = true } return leaves, rows.Err() } // leafSetsEqual compares two sets of leaves. func leafSetsEqual(a, b map[libfossil.FslID]bool) bool { if len(a) != len(b) { return false } for rid := range a { if !b[rid] { return false } } return true } // treeGap reports the sub-manifest a check-in's tree -- its own, or its // baseline's -- is waiting on, when that is why its file set cannot be // listed. Only a tree can be waiting on one, so a flat manifest is answered // without listing it. func treeGap(r *repo.Repo, d *deck.Deck, rid libfossil.FslID, cache *content.Cache) (string, bool) { if len(d.S) == 0 && d.B == "" { return "", false } _, err := manifest.ListFilesCached(r, rid, cache) return manifest.MissingSubmanifest(err) }