1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
|
package main
import (
"database/sql"
"fmt"
"os"
"path/filepath"
"sync"
"sync/atomic"
"time"
"github.com/nixos/lix/gonix/eval"
)
type compareRow struct {
path string
nixJSON []byte
}
type compareResult struct {
path string
status string // "pass", "diff", "go_fail", "nix_fail", "both_fail"
goErr string
diffDetail string
}
func cmdCompare(db *sql.DB, parallel int, recheckFailures bool) error {
// If --recheck-failures, reset go_done for non-pass files.
if recheckFailures {
res, err := db.Exec("UPDATE files SET go_done = 0 WHERE status != 'pass' AND nix_done = 1")
if err != nil {
return fmt.Errorf("reset failures: %w", err)
}
n, _ := res.RowsAffected()
fmt.Fprintf(os.Stderr, "reset %d files for re-check\n", n)
}
// Query files needing Go comparison.
rows, err := db.Query(`
SELECT path, nix_json, nix_err
FROM files
WHERE nix_done = 1 AND go_done = 0
`)
if err != nil {
return fmt.Errorf("query: %w", err)
}
var todo []compareRow
var nixFailPaths []string
for rows.Next() {
var path string
var nixJSON []byte
var nixErr sql.NullString
if err := rows.Scan(&path, &nixJSON, &nixErr); err != nil {
rows.Close()
return fmt.Errorf("scan: %w", err)
}
if nixErr.Valid && nixErr.String != "" {
// nix-instantiate failed — we still need to test Go parser.
nixFailPaths = append(nixFailPaths, path)
continue
}
todo = append(todo, compareRow{path: path, nixJSON: nixJSON})
}
rows.Close()
fmt.Fprintf(os.Stderr, "%d files to compare, %d nix-failed to check\n", len(todo), len(nixFailPaths))
// First: handle nix-fail cases — check if Go parser also fails.
if len(nixFailPaths) > 0 {
if err := handleNixFailures(db, nixFailPaths); err != nil {
return err
}
}
if len(todo) == 0 {
return nil
}
// Process comparisons in parallel.
builtinNames := eval.DefaultBuiltinNames
workCh := make(chan compareRow, parallel*2)
resultCh := make(chan compareResult, parallel*2)
var wg sync.WaitGroup
for i := 0; i < parallel; i++ {
wg.Add(1)
go func() {
defer wg.Done()
symbols := eval.NewSymbolTable()
for row := range workCh {
resultCh <- doCompareWithTimeout(row, symbols, builtinNames)
}
}()
}
go func() {
for _, r := range todo {
workCh <- r
}
close(workCh)
wg.Wait()
close(resultCh)
}()
// Collect and batch-write.
var processed atomic.Int64
batch := make([]compareResult, 0, 200)
flushBatch := func() error {
if len(batch) == 0 {
return nil
}
tx, err := db.Begin()
if err != nil {
return err
}
for _, r := range batch {
if err := updateGoResult(tx, r.path, r.status, r.goErr, r.diffDetail); err != nil {
tx.Rollback()
return fmt.Errorf("update %s: %w", r.path, err)
}
}
if err := tx.Commit(); err != nil {
return err
}
batch = batch[:0]
return nil
}
for r := range resultCh {
batch = append(batch, r)
n := processed.Add(1)
if n%1000 == 0 {
fmt.Fprintf(os.Stderr, "\r[%d/%d] %.1f%%", n, len(todo), float64(n)/float64(len(todo))*100)
}
if len(batch) >= 200 {
if err := flushBatch(); err != nil {
return err
}
}
}
if err := flushBatch(); err != nil {
return err
}
fmt.Fprintf(os.Stderr, "\r[%d/%d] done\n", len(todo), len(todo))
return nil
}
func doCompareWithTimeout(row compareRow, symbols *eval.SymbolTable, builtinNames []string) compareResult {
ch := make(chan compareResult, 1)
go func() {
ch <- doCompare(row, symbols, builtinNames)
}()
select {
case r := <-ch:
return r
case <-time.After(10 * time.Second):
return compareResult{
path: row.path,
status: "go_fail",
goErr: "timeout: parser took >10s",
}
}
}
func doCompare(row compareRow, symbols *eval.SymbolTable, builtinNames []string) compareResult {
// Parse nix JSON.
nixNode, err := eval.ParseNixJSON(row.nixJSON)
if err != nil {
return compareResult{
path: row.path,
status: "diff",
goErr: fmt.Sprintf("json parse: %v", err),
}
}
// Read source from disk.
src, err := os.ReadFile(row.path)
if err != nil {
return compareResult{
path: row.path,
status: "go_fail",
goErr: fmt.Sprintf("read: %v", err),
}
}
// Parse with Go native parser.
basePath := filepath.Dir(row.path) + "/"
goExpr, err := eval.NativeParseExpr(src, basePath, row.path, symbols, builtinNames)
if err != nil {
return compareResult{
path: row.path,
status: "go_fail",
goErr: err.Error(),
}
}
// Convert and compare.
goNode := eval.ExprToNode(goExpr, symbols)
diffs := eval.CompareAST(nixNode, goNode)
if len(diffs) == 0 {
return compareResult{path: row.path, status: "pass"}
}
// Format first N diffs.
detail := eval.FormatDiffs(truncDiffs(diffs, 10))
return compareResult{
path: row.path,
status: "diff",
diffDetail: detail,
}
}
func handleNixFailures(db *sql.DB, paths []string) error {
builtinNames := eval.DefaultBuiltinNames
symbols := eval.NewSymbolTable()
tx, err := db.Begin()
if err != nil {
return err
}
for _, path := range paths {
src, readErr := os.ReadFile(path)
if readErr != nil {
updateGoResult(tx, path, "both_fail", readErr.Error(), "")
continue
}
basePath := filepath.Dir(path) + "/"
_, goErr := eval.NativeParseExpr(src, basePath, path, symbols, builtinNames)
if goErr != nil {
// Both failed — expected.
updateGoResult(tx, path, "both_fail", goErr.Error(), "")
} else {
// Nix rejected but Go accepted — we're more permissive.
updateGoResult(tx, path, "nix_fail", "", "")
}
}
return tx.Commit()
}
func truncDiffs(diffs []eval.Diff, max int) []eval.Diff {
if len(diffs) <= max {
return diffs
}
return diffs[:max]
}
|