- Correct stale references and headline-path wording in READMEs and Lean docstrings - Document build steps, comparator requirements, sweep scope, and coverage - Unify Apache headers across Lean and C++ sources - Add a bwrap-free axiom audit for the headline theorems - Add a Gitea workflow running lake build, the axiom audit, C++ tests, and coverage - Match LLVM coverage tool versions to the compiler and recreate stale build dirs
83 lines
4.4 KiB
Markdown
83 lines
4.4 KiB
Markdown
# conflict-range
|
|
|
|
A formalised **closed form** for the minimal conflict range of a read/result
|
|
pair, together with a C++20 translation and its test harness.
|
|
|
|
Given a database, a range read (two selectors plus offsets, either traversal
|
|
direction), and the keys a transaction observed, `Statement.closedForm` computes
|
|
a minimal sound conflict range: a set of keys that is sufficient to detect every
|
|
conflicting write, and none of whose proper subranges is sufficient.
|
|
|
|
## Layout
|
|
|
|
| Path | Purpose |
|
|
| --- | --- |
|
|
| `Statement.lean` | The statement: keys, selectors, reads, results, conflict ranges, soundness, minimality, and the closed form itself. It imports only Mathlib and states the definitions and headlines without using `theorem`, `axiom`, or `sorry`. |
|
|
| `FormalConflictRange/` | The reference development that proves the closed form minimal. |
|
|
| `Bridge.lean` | Definitional bridge from `Statement`'s types to the reference development, plus the transport lemmas. |
|
|
| `Proof.lean` | Proves `Statement.ClosedFormMinimal` and `Statement.MinimalUnique` by transporting the reference theorems across the bridge. |
|
|
| `Challenge.lean` | The same two headline statements with placeholder proofs (`sorry`). This is the trusted statement side of the comparator check. |
|
|
| `Solution.lean` | The solution side of the comparator check; it imports `Proof`. |
|
|
| `comparator.json` | Comparator configuration: challenge/solution modules, theorem names, and permitted axioms. |
|
|
| `cpp/` | A C++20 translation of `closedForm`, an equivalent summarised implementation, golden-vector and fuzz tests, and a benchmark. See `cpp/README.md`. |
|
|
|
|
## Build and check
|
|
|
|
```sh
|
|
lake exe cache get # clean checkout: download Mathlib's prebuilt oleans
|
|
lake build
|
|
./scripts/check-axioms.sh
|
|
lake comparator
|
|
```
|
|
|
|
This repository pins Lean `v4.35.0` and Mathlib `v4.35.0`
|
|
(`lean-toolchain`, `lakefile.toml`). `lake exe cache get` downloads Mathlib's
|
|
prebuilt `.olean` files; without it a fresh clone compiles Mathlib from source.
|
|
`lake build` then compiles the default targets (`Statement` and `Proof`, which
|
|
pull in the reference development); run it before the checks so that a manifest
|
|
is present and dependencies are resolved.
|
|
|
|
`./scripts/check-axioms.sh` prints the axiom dependencies of
|
|
`Statement.closedFormMinimal` and `Statement.minimalUnique` and fails unless
|
|
both are exactly `[propext, Classical.choice, Quot.sound]`. This catches `sorry`
|
|
(`sorryAx`) and newly introduced axioms without needing the comparator sandbox.
|
|
|
|
`lake comparator` then builds `Challenge` and `Solution` independently and
|
|
checks that the solution proves the challenge's statements and uses only
|
|
`propext`, `Quot.sound`, and `Classical.choice`. It requires `bubblewrap` and
|
|
either unprivileged user namespaces or a setuid-root `bwrap`; on systems where
|
|
user namespaces are restricted, `lake comparator` will fail before checking the
|
|
proof.
|
|
|
|
## Status and scope
|
|
|
|
* `Statement.ClosedFormMinimal` and `Statement.MinimalUnique` are proved, and no
|
|
proof in `Proof.lean`, `Bridge.lean`, or `FormalConflictRange/` uses `sorry`.
|
|
* `Challenge.lean` deliberately contains `sorry`: it is the statement side of
|
|
the comparator check, not part of the proof.
|
|
* The headline argument is the closed-form development under `FormalConflictRange/`.
|
|
`FormalConflictRange/Algorithm.lean` and `FormalConflictRange/Prototype.lean`
|
|
also supply shared ingredients used by that development: the empty-result
|
|
theory (`emptyValue`, `EmptyInferenceWitness`,
|
|
`minimal_emptyValue_of_emptyInference`) and the ascending-key list and
|
|
constraint collectors (`ascendingKeys`, `emptyConstraints`), respectively.
|
|
Their partial-algorithm and prototype sections are earlier case-analysis and
|
|
search material; those sections are not the route taken by the final
|
|
closed-form proof.
|
|
* The C++ tree is validated against Lean-generated golden vectors, by
|
|
differential fuzzing, and by a deterministic exhaustive sweep of small
|
|
readable instances; `cpp/README.md` describes the model, the tests, the
|
|
coverage check, and the benchmark. The summarised implementation has 100%
|
|
line and branch coverage via `cpp/run-coverage.sh`.
|
|
|
|
## Continuous integration
|
|
|
|
`.gitea/workflows/ci.yml` runs the Lean build, the axiom audit, and the C++ test
|
|
suite (including the coverage gate) on pushes to `main` and on pull requests. It
|
|
is written for Gitea Actions; a GitHub mirror would need an equivalent workflow
|
|
under `.github/workflows/`.
|
|
|
|
## License
|
|
|
|
Apache License 2.0; see `LICENSE`.
|