larvit/fejkdata
3
0
Fork 0
Code Pull Requests 1 Actions Activity

Close the row set over ancestors only where the render pins the row

Browse Source
This commit is contained in:
Lilleman auf Larv
2026-09-21 16:39:19 +02:00
committed by Lillem4n
parent 42fd728156
commit 4d45e3ebdc
4 changed files with 70 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
table_test.go
+45 -38
View File
@@ -964,9 +964,9 @@ func TestAmbiguousNameNamesARunnablePath(t *testing.T) {
}
}
// TestRowSetSimulatesPinning proves the load-time walk's rowSet answers what
// (*draws).pin and pinned answer at render time: the rows one entry brings with it,
// the cells that entry rules out, and which two entries are alternatives.
// TestRowSetSimulatesPinning proves the walk's row set answers what the render's pinning
// answers: a path read pins a row and the ancestors it links to, a whole read draws a row
// and pins none.
func TestRowSetSimulatesPinning(t *testing.T) {
f := newGenerator(t, writeFiles(t, geo()), WithSeed(1))
var tables []*table
@@ -979,54 +979,61 @@ func TestRowSetSimulatesPinning(t *testing.T) {
}
for _, entered := range tables {
for row := 0; row < entered.rows(); row++ {
s := rowSet(nil).enter(entered, row)
if drawn := rowSet(nil).enter(entered, row, false); len(drawn) != 1 || drawn[0] != (tablePin{entered, row}) {
t.Errorf("a drawn %s enters %v, want its own row alone", entered.selectorSpelling(row), drawn)
}
s := rowSet(nil).enter(entered, row, true)
var pinned draws
held := 0
pinned.pin(entered, row)
assertRowSetAgrees(t, s, pinned, entered, row, tables)
}
}
}
// assertRowSetAgrees compares the set entered with row of entered against the same
// row pinned, over every row of tables.
func assertRowSetAgrees(t *testing.T, s rowSet, pinned draws, entered *table, row int, tables []*table) {
t.Helper()
pinned.each(func(tbl *table, r int) {
got, in := s.rowOf(tbl)
if !in || got != r {
t.Errorf("entering %s leaves %s unset in the row set, though pinning it pins %s", entered.selectorSpelling(row), tbl.path, tbl.selectorSpelling(r))
}
})
for _, cand := range tables {
for cr := 0; cr < cand.rows(); cr++ {
var beside draws
beside.pin(entered, row)
refused := beside.pinRow(cand, cr) != nil
if got := s.excludes(&template{cellOf: cand, cellRow: cr}); got != refused {
t.Errorf("excludes(%s) = %v beside %s, but pinRow refuses it = %v", cand.selectorSpelling(cr), got, entered.selectorSpelling(row), refused)
pinned.each(func(tbl *table, r int) {
held++
if got, in := s.rowOf(tbl); !in || got != r {
t.Errorf("entering %s leaves %s unset, though pinning it pins %s", entered.selectorSpelling(row), tbl.path, tbl.selectorSpelling(r))
}
})
if held != len(s) {
t.Errorf("entering %s holds %d rows, though pinning it pins %d", entered.selectorSpelling(row), len(s), held)
}
a := drawAt{alt: s}
b := drawAt{alt: rowSet(nil).enter(cand, cr)}
if got := alternatives(a, b); got != refused {
t.Errorf("alternatives(%s, %s) = %v, but pinning both refuses = %v", entered.selectorSpelling(row), cand.selectorSpelling(cr), got, refused)
for _, cand := range tables {
for cr := 0; cr < cand.rows(); cr++ {
var beside draws
beside.pin(entered, row)
refused := beside.pinRow(cand, cr) != nil
if got := s.excludes(&template{cellOf: cand, cellRow: cr}); got != refused {
t.Errorf("excludes(%s) = %v beside %s, but pinRow refuses it = %v", cand.selectorSpelling(cr), got, entered.selectorSpelling(row), refused)
}
if got := alternatives(drawAt{alt: s}, drawAt{alt: rowSet(nil).enter(cand, cr, true)}); got != refused {
t.Errorf("alternatives(%s, %s) = %v, but pinning both refuses = %v", entered.selectorSpelling(row), cand.selectorSpelling(cr), got, refused)
}
}
}
}
}
}
// TestCellsOfRowsThatNeverMeetAreNotCompared pins what the entered ancestors buy: a
// cell of region 01 and a cell of a municipality of region 12 never render together,
// so the reads inside them are not one render's to reconcile.
func TestCellsOfRowsThatNeverMeetAreNotCompared(t *testing.T) {
files := with(geo(), map[string]string{
"addr.json": `{"format":"{city}","city":"Lund"}`,
// TestCellReadsMeetWhereTheRenderPairsTheRows pins which cells' reads are one render's to
// reconcile: a path read pins the row's ancestors, so a cell of region 01 and a cell of a
// municipality of region 12 never render together, while a whole read draws its row and pins
// no ancestor, so those same two cells do.
func TestCellReadsMeetWhereTheRenderPairsTheRows(t *testing.T) {
cells := with(geo(), map[string]string{
"addr.json": `{"format":"{city}","city":["Lund","Malmö"]}`,
"municipality.tsv": "code\tname\tregion\tpopulation\tnote\n0180\tStockholm\t01\t980000\t-\n0184\tSolna\t01\t85000\t-\n1280\tMalmö\t12\t360000\t{/addr.city}\n1281\tLund\t12\t130000\t-\n1480\tGöteborg\t14\t590000\t-\n",
"region.tsv": "code\tname\tpopulation\tnote\n01\tStockholms län\t2400000\t{/addr}\n12\tSkåne län\t1400000\t-\n14\tVästra Götalands län\t1750000\t-\n",
"x.json": `"{/region.note} {/municipality.note}"`,
})
f, err := New(WithoutShippedData(), WithDataPath(writeFiles(t, files)), WithSeed(1))
paths := with(cells, map[string]string{"x.json": `"{/region.note} {/municipality.note}"`})
f, err := New(WithoutShippedData(), WithDataPath(writeFiles(t, paths)), WithSeed(1))
if err != nil {
t.Fatalf("New = %v, want the two cells accepted", err)
}
fake(t, f, "x")
whole := with(cells, map[string]string{
"municipality.json": `{"format":"{name}={note}","rows":"municipality.tsv","key":"code","name":"name","parent":"region","weight":"population"}`,
"region.json": `{"format":"{name}={note}","rows":"region.tsv","key":"code","name":"name","weight":"population"}`,
"x.json": `"{/region}|{/municipality}"`,
})
if _, err := New(WithoutShippedData(), WithDataPath(writeFiles(t, whole)), WithSeed(1)); err == nil || !strings.Contains(err.Error(), "reads a path into") {
t.Fatalf("New = %v, want the two drawn rows held to one draw of addr", err)
}
}