Compare commits

..
Author SHA1 Message Date
BaaRai 30c787d690 perf(db): batch coverage-graph lookups and index icp scope probes
BuildCoverageGraph issued one QueryRow per connector root domain and one per company: 221 statements for a task scoped by 800 subdomains over 200 roots and 20 companies. Fetch them with one ANY() query each. The coverage target join probes task_scope once per asset, and the icp branch fell back to uq_task_scope_v2 with only kind as index condition; migration 0003 adds a partial index on task_scope(value) for icp rows. Large-fixture invariants test and benchmark included.
2026-11-14 21:16:49 +01:00
4 changed files with 274 additions and 22 deletions
+198
View File
@@ -0,0 +1,198 @@
package db
import (
"fmt"
"strings"
"testing"
)
// largeCoverageFixture is a task scoped by 800 subdomains spread over 200 root
// domains and 20 companies, with 1,000 services, 1,200 endpoints and 2,000
// anchored facts. Every tenth root has no asset row, so the graph needs both
// real and synthetic ("r:<domain>") connector roots.
type largeCoverageFixture struct {
taskID, expID int64
suffix string
}
const (
lcRoots = 200
lcCompanies = 20
lcSubs = 800
lcServices = 1000
lcEndpoints = 1200
lcFacts = 2000
)
func seedLargeCoverageFixture(tb testing.TB, d *DB) largeCoverageFixture {
tb.Helper()
task, err := d.CreateTask("large coverage graph", "large coverage graph", nil, 0, 0)
if err != nil {
tb.Fatal(err)
}
f := largeCoverageFixture{taskID: task.ID, expID: task.ExplorationID, suffix: fmt.Sprintf("lc%d", task.ID)}
tb.Cleanup(func() {
_, _ = d.Exec(`DELETE FROM explorations WHERE id=$1`, f.expID)
_ = d.DeleteTask(f.taskID)
_, _ = d.Exec(`DELETE FROM assets WHERE root_domain LIKE '%-'||$1||'.cov.test'`, f.suffix)
_, _ = d.Exec(`DELETE FROM companies WHERE nkey LIKE 'lcco-'||$1||'-%'`, f.suffix)
})
exec := func(q string, args ...any) {
tb.Helper()
if _, err := d.Exec(q, args...); err != nil {
tb.Fatalf("%v\n%s", err, q)
}
}
// root g: r<g>-<suffix>.cov.test, company 1+(g-1)%lcCompanies.
// subdomain i: s<i>.<root 1+(i-1)%lcRoots>.
exec(`INSERT INTO companies(name,nkey)
SELECT 'large co '||g||' '||$1, 'lcco-'||$1||'-'||g FROM generate_series(1,$2) g`, f.suffix, lcCompanies)
exec(`INSERT INTO assets(type,domain,root_domain,company_id)
SELECT 'root_domain', 'r'||g||'-'||$1||'.cov.test', 'r'||g||'-'||$1||'.cov.test',
(SELECT id FROM companies WHERE nkey='lcco-'||$1||'-'||(1+(g-1)%$3))
FROM generate_series(1,$2) g WHERE g%10<>0`, f.suffix, lcRoots, lcCompanies)
exec(`INSERT INTO assets(type,domain,root_domain,company_id)
SELECT 'subdomain', 's'||i||'.r'||r||'-'||$1||'.cov.test', 'r'||r||'-'||$1||'.cov.test',
(SELECT id FROM companies WHERE nkey='lcco-'||$1||'-'||(1+(r-1)%$4))
FROM generate_series(1,$3) i, LATERAL (SELECT 1+(i-1)%$2 AS r) x`, f.suffix, lcRoots, lcSubs, lcCompanies)
// service j hangs off subdomain 1+(j-1)%lcSubs: port 443 for the first
// lcSubs services, 8443 for the rest.
exec(`INSERT INTO assets(type,service_type,url,domain,root_domain,port,company_id)
SELECT 'service','http', 'https://'||s.domain||':'||p||'/', s.domain, s.root_domain, p, s.company_id
FROM generate_series(1,$2) j
CROSS JOIN LATERAL (SELECT CASE WHEN j<=$3 THEN 443 ELSE 8443 END AS p) port
JOIN assets s ON s.type='subdomain' AND s.root_domain LIKE '%-'||$1||'.cov.test'
AND s.domain LIKE 's'||(1+(j-1)%$3)||'.%'`, f.suffix, lcServices, lcSubs)
exec(`INSERT INTO assets(type,url,method,domain,root_domain,port,company_id)
SELECT 'endpoint', 'https://'||s.domain||'/p/'||k, 'GET', s.domain, s.root_domain, 443, s.company_id
FROM generate_series(1,$2) k
JOIN assets s ON s.type='subdomain' AND s.root_domain LIKE '%-'||$1||'.cov.test'
AND s.domain LIKE 's'||(1+(k-1)%$3)||'.%'`, f.suffix, lcEndpoints, lcSubs)
exec(`INSERT INTO task_scope(task_id,kind,domain,source)
SELECT $1,'subdomain',domain,'manual' FROM assets
WHERE type='subdomain' AND root_domain LIKE '%-'||$2||'.cov.test'`, f.taskID, f.suffix)
exec(`INSERT INTO exploration_nodes(exploration_id,kind,state,payload)
SELECT $1,'fact','confirmed',jsonb_build_object('summary','large coverage fact '||g) FROM generate_series(1,$2) g`, f.expID, lcFacts)
exec(`WITH fn AS (
SELECT id, row_number() OVER (ORDER BY id) rn FROM exploration_nodes
WHERE exploration_id=$1 AND kind='fact' AND payload->>'summary' LIKE 'large coverage fact %'),
an AS (
SELECT id, row_number() OVER (ORDER BY id) rn FROM assets
WHERE type<>'root_domain' AND root_domain LIKE '%-'||$2||'.cov.test')
INSERT INTO exploration_anchors(node_id,asset_id) SELECT fn.id, an.id FROM fn JOIN an USING (rn)`, f.expID, f.suffix)
exec(`ANALYZE assets, task_scope, exploration_nodes, exploration_anchors, companies`)
return f
}
func TestBuildCoverageGraphLargeInvariants(t *testing.T) {
d, err := Open(testDSN(t))
if err != nil {
t.Skipf("postgres unavailable (%v) - skipping", err)
}
t.Cleanup(func() { d.Close() })
f := seedLargeCoverageFixture(t, d)
g, err := d.Assets().BuildCoverageGraph(f.taskID, f.expID)
if err != nil {
t.Fatal(err)
}
const (
syntheticRoots = lcRoots / 10
realRoots = lcRoots - syntheticRoots
inScope = lcSubs + lcServices + lcEndpoints
wantNodes = inScope + lcRoots + lcCompanies
// subdomain→root, service→subdomain, endpoint→service (port 443), and
// real root→company; a synthetic root has no company.
wantEdges = lcSubs + lcServices + lcEndpoints + realRoots
)
if len(g.Nodes) != wantNodes || len(g.Edges) != wantEdges {
t.Fatalf("graph size: nodes=%d edges=%d, want %d/%d", len(g.Nodes), len(g.Edges), wantNodes, wantEdges)
}
byKey := make(map[string]CoverageGraphNode, len(g.Nodes))
kinds := map[string]int{}
var tested, scoped, synthetic, realConnector int
for _, n := range g.Nodes {
if _, dup := byKey[n.Key]; dup {
t.Fatalf("duplicate node key %q", n.Key)
}
byKey[n.Key] = n
kinds[n.Kind]++
if n.Tested {
tested++
}
if n.InScope {
scoped++
}
switch {
case strings.HasPrefix(n.Key, "r:"):
synthetic++
if n.Kind != "root_domain" || n.InScope || n.AssetID != 0 || n.Key != "r:"+n.Domain {
t.Fatalf("synthetic root: %+v", n)
}
case n.Kind == "root_domain":
realConnector++
if n.InScope || n.AssetID == 0 || n.CompanyID == 0 {
t.Fatalf("connector root: %+v", n)
}
case n.Kind == "company":
if n.InScope || n.Label == "" || n.Key != companyKey(n.CompanyID) {
t.Fatalf("company node: %+v", n)
}
}
}
if kinds["subdomain"] != lcSubs || kinds["service"] != lcServices || kinds["endpoint"] != lcEndpoints ||
kinds["root_domain"] != lcRoots || kinds["company"] != lcCompanies {
t.Fatalf("node kinds: %v", kinds)
}
if synthetic != syntheticRoots || realConnector != realRoots {
t.Fatalf("connector roots: synthetic=%d real=%d, want %d/%d", synthetic, realConnector, syntheticRoots, realRoots)
}
if scoped != inScope || tested != lcFacts {
t.Fatalf("in_scope=%d tested=%d, want %d/%d", scoped, tested, inScope, lcFacts)
}
seenEdge := map[CoverageGraphEdge]bool{}
for _, e := range g.Edges {
src, okSrc := byKey[e.Src]
dst, okDst := byKey[e.Dst]
if !okSrc || !okDst || e.Src == e.Dst {
t.Fatalf("edge %+v points to a missing node", e)
}
if seenEdge[e] {
t.Fatalf("duplicate edge %+v", e)
}
seenEdge[e] = true
want := map[string]string{"subdomain": "root_domain", "service": "subdomain", "endpoint": "service", "root_domain": "company"}[src.Kind]
if dst.Kind != want {
t.Fatalf("edge %s(%s) -> %s(%s), want parent kind %s", e.Src, src.Kind, e.Dst, dst.Kind, want)
}
}
}
// BenchmarkBuildCoverageGraphLarge locks in the cost of the coverage graph on
// the large fixture (statement count and query plan). No time assertion.
func BenchmarkBuildCoverageGraphLarge(b *testing.B) {
dsn, _, err := DSN()
if err != nil {
b.Skipf("no database config (%v) - skipping", err)
}
d, err := Open(dsn)
if err != nil {
b.Skipf("postgres unavailable (%v) - skipping", err)
}
b.Cleanup(func() { d.Close() })
f := seedLargeCoverageFixture(b, d)
store := d.Assets()
b.ResetTimer()
for i := 0; i < b.N; i++ {
g, err := store.BuildCoverageGraph(f.taskID, f.expID)
if err != nil {
b.Fatal(err)
}
if len(g.Nodes) == 0 {
b.Fatal("empty graph")
}
}
}
+5 -5
View File
@@ -119,8 +119,8 @@ func readApplied(t *testing.T, d *DB) []appliedMigration {
return out return out
} }
// assertEmbeddedApplied checks that both LLM tables exist and that 0001 and // assertEmbeddedApplied checks that both LLM tables exist and that every
// 0002 are recorded with the SHA-256 of their embedded files. // embedded migration is recorded with the SHA-256 of its file.
func assertEmbeddedApplied(t *testing.T, d *DB) []appliedMigration { func assertEmbeddedApplied(t *testing.T, d *DB) []appliedMigration {
t.Helper() t.Helper()
for _, table := range []string{"llm_records", "llm_usage"} { for _, table := range []string{"llm_records", "llm_usage"} {
@@ -136,9 +136,9 @@ func assertEmbeddedApplied(t *testing.T, d *DB) []appliedMigration {
want := []struct { want := []struct {
version int version int
name string name string
}{{1, llmRecordsMigration}, {2, llmUsageMigration}} }{{1, llmRecordsMigration}, {2, llmUsageMigration}, {3, "0003_task_scope_icp_index.sql"}}
if len(applied) != len(want) { if len(applied) != len(want) {
t.Fatalf("schema_migrations = %+v, want versions 1 and 2", applied) t.Fatalf("schema_migrations = %+v, want versions 1 to 3", applied)
} }
for i, w := range want { for i, w := range want {
content, err := fs.ReadFile(migrationsFS(), w.name) content, err := fs.ReadFile(migrationsFS(), w.name)
@@ -301,7 +301,7 @@ func TestMigrationsFailClosed(t *testing.T) {
}{ }{
{"checksum changed", withEmbedded(t, fstest.MapFS{"0003_probe.sql": {Data: append([]byte("-- edited\n"), probeMigration.Data...)}}), {"checksum changed", withEmbedded(t, fstest.MapFS{"0003_probe.sql": {Data: append([]byte("-- edited\n"), probeMigration.Data...)}}),
[]string{"0003", "0003_probe.sql", "checksum"}}, []string{"0003", "0003_probe.sql", "checksum"}},
{"version missing from binary", migrationsFS(), {"version missing from binary", withEmbedded(t, fstest.MapFS{}),
[]string{"0003", "0003_probe.sql", "missing from this binary"}}, []string{"0003", "0003_probe.sql", "missing from this binary"}},
{"name changed", withEmbedded(t, fstest.MapFS{"0003_renamed.sql": probeMigration}), {"name changed", withEmbedded(t, fstest.MapFS{"0003_renamed.sql": probeMigration}),
[]string{"0003", "0003_probe.sql", "0003_renamed.sql"}}, []string{"0003", "0003_probe.sql", "0003_renamed.sql"}},
@@ -0,0 +1,9 @@
-- The coverage target CTE (contextCoverageCTE / covTargetCTE / scopeTargetCTE)
-- joins assets to task_scope on an OR of per-kind predicates. PostgreSQL plans it
-- as one BitmapOr probe of task_scope per asset. Every branch had an index except
-- kind='icp', which fell back to uq_task_scope_v2 with only "kind = 'icp'" as the
-- index condition (task_id is the leading column), so each probe walked the
-- whole unique index: about 70% of the buffer hits of the coverage-graph query on
-- a 3,000-asset task scoped by 800 subdomains. This partial index makes the icp
-- probe an equality lookup on value.
CREATE INDEX IF NOT EXISTS idx_ts_icp ON task_scope(value) WHERE kind = 'icp';
+62 -17
View File
@@ -4,6 +4,7 @@ import (
"database/sql" "database/sql"
"fmt" "fmt"
"net" "net"
"sort"
"strconv" "strconv"
"strings" "strings"
) )
@@ -534,16 +535,44 @@ ORDER BY a.id`, taskID)
} }
} }
} }
// One query for every missing root instead of one per root.
roots := make([]string, 0, len(missingRoots))
for root := range missingRoots { for root := range missingRoots {
var id, companyID int64 roots = append(roots, root)
err := s.db.QueryRow(`SELECT id, COALESCE(company_id,0) FROM assets }
WHERE type='root_domain' AND domain=$1 LIMIT 1`, root).Scan(&id, &companyID) sort.Strings(roots)
type rootRow struct{ id, companyID int64 }
rootRows := map[string]rootRow{}
if len(roots) > 0 {
rrows, err := s.db.Query(`SELECT domain, id, COALESCE(company_id,0) FROM assets
WHERE type='root_domain' AND domain=ANY($1::text[]) ORDER BY id`, roots)
if err != nil {
return nil, err
}
for rrows.Next() {
var domain string
var r rootRow
if err := rrows.Scan(&domain, &r.id, &r.companyID); err != nil {
rrows.Close()
return nil, err
}
if _, ok := rootRows[domain]; !ok {
rootRows[domain] = r
}
}
err = rrows.Err()
rrows.Close()
if err != nil {
return nil, err
}
}
for _, root := range roots {
var node CoverageGraphNode var node CoverageGraphNode
if err == nil && id > 0 { if r, ok := rootRows[root]; ok && r.id > 0 {
node = CoverageGraphNode{Key: assetKey(id), Kind: "root_domain", AssetID: id, node = CoverageGraphNode{Key: assetKey(r.id), Kind: "root_domain", AssetID: r.id,
CompanyID: companyID, Domain: root, Label: root} CompanyID: r.companyID, Domain: root, Label: root}
if companyID > 0 { if r.companyID > 0 {
companyIDs[companyID] = true companyIDs[r.companyID] = true
} }
} else { } else {
node = CoverageGraphNode{Key: "r:" + root, Kind: "root_domain", Domain: root, Label: root} node = CoverageGraphNode{Key: "r:" + root, Kind: "root_domain", Domain: root, Label: root}
@@ -552,18 +581,34 @@ WHERE type='root_domain' AND domain=$1 LIMIT 1`, root).Scan(&id, &companyID)
rootByDomain[root] = node.Key rootByDomain[root] = node.Key
} }
// Company nodes for every referenced company id — always gray context. // Company nodes for every referenced company id — always gray context. One
// query for all of them; an id with no company row gets no node.
ids := make([]int64, 0, len(companyIDs))
for id := range companyIDs { for id := range companyIDs {
key := companyKey(id) if _, ok := byKey[companyKey(id)]; !ok {
if _, ok := byKey[key]; ok { ids = append(ids, id)
continue
} }
var name string }
if err := s.db.QueryRow(`SELECT name FROM companies WHERE id=$1`, id).Scan(&name); err != nil { if len(ids) > 0 {
continue crows, err := s.db.Query(`SELECT id, name FROM companies WHERE id=ANY($1::bigint[]) ORDER BY id`, ids)
if err != nil {
return nil, err
}
for crows.Next() {
var id int64
var name string
if err := crows.Scan(&id, &name); err != nil {
crows.Close()
return nil, err
}
add(CoverageGraphNode{Key: companyKey(id), Kind: "company", CompanyID: id,
Label: name, AssetID: 0})
}
err = crows.Err()
crows.Close()
if err != nil {
return nil, err
} }
add(CoverageGraphNode{Key: key, Kind: "company", CompanyID: id,
Label: name, AssetID: 0})
} }
// Derived containment edges (only when the parent node exists). // Derived containment edges (only when the parent node exists).