diff --git a/CHANGELOG.md b/CHANGELOG.md index a30a2c97e9..d1a804a62c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -58,6 +58,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Fixed +- **A recursive rule query no longer joins a rule's new facts with every magic-set fact** (#694). On the engine (#548), each round after the first runs a recursive rule from the facts the last round derived, then joins the rest of its body. The rest kept the order the planner chose for the whole body, so the next clause could share no variable with the new facts: after the magic-set rewrite of `(reach :n0 ?to)`, the body `(magic ?from) [?from :next ?mid] (reach ?mid ?to)` joined each new `reach` fact with every `magic` fact, then probed `:next` once per pair. The rest of the body is now planned with the new facts' variables bound, each next pattern sharing a variable with those bound before it when one can. Answers are unchanged. Nightly `recursion` benchmarks (bench profile): `fanout/w10_d3` 4.94 s → 22.6 ms (it was about 94 ms on the executor before #548), `chain/depth_100` 699 ms → 41.5 ms, `chain/depth_10` 1.15 ms → 0.68 ms. + - **`BrowserDb` errors carry their error code** (#673). The browser API (`@minigraf/browser`) rejected with the error's top-level message only, such as `Unknown command: nosuchcommand`, while every other API reports `[PRS-001] Unknown command: nosuchcommand`. Every `BrowserDb` rejection now goes through `MinigrafError`, so it starts with its code. Host errors that have no code yet (no IndexedDB, an import blob whose length is not a multiple of the page size) are unchanged. - **Prepared queries use the database's rule limit** (#549). `PreparedQuery::execute` and `query` ran a rule query with the default `max_derived_facts` of 1,000,000 whatever `OpenOptions` set; they now use the database's limit, as `execute` does, and its `query_memory_limit`. - **An `or` branch in a rule body knows the registered predicates** (#548). A rule with `or`/`or-join` evaluated its branches with the built-in functions only, so a predicate registered with `register_predicate` in a branch (`(or [(big? ?v)] [?x :special true])`) was unknown there. Branches now get the database's functions, as the rest of the rule body does. diff --git a/CLAUDE.md b/CLAUDE.md index a03a572eec..e464cb1d26 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -143,7 +143,7 @@ cargo run < demos/demo_negation.txt - `stratification.rs`: `DependencyGraph`, `stratify()` — negative edges + cycle detection; a positive edge to a rule with `not`/`not-join`/`or`/`or-join` also raises the caller, off a cycle (#628) - `rules.rs`: `RuleRegistry` — thread-safe rule management - `types.rs`: `EdnValue`, `Pattern`, `DatalogQuery`, `AsOf`, `ValidAt`, `WhereClause` (incl. `Not`, `NotJoin`); `PseudoAttr` enum, `AttributeSpec` wrapper - - `optimizer.rs`: Selectivity-based join reordering on every build (the `wasm` feature is a deprecated no-op). `reorder()` gates every reordering site; tests turn it off per thread (`set_reorder`, `minigraf::__reorder` under `test-oracle`, #596); `plan_seeded` orders a body with its imported variables counted as bound, and `subplans()` lets tests force the engine's negation bodies and `or` branches hashed or correlated (`set_subplans`, `minigraf::__subplans`, #546) + - `optimizer.rs`: Selectivity-based join reordering on every build (the `wasm` feature is a deprecated no-op). `reorder()` gates every reordering site; tests turn it off per thread (`set_reorder`, `minigraf::__reorder` under `test-oracle`, #596); `plan_seeded` orders a body with its imported variables counted as bound, `plan_after` orders a rule body's clauses after its delta, each joining on a variable bound before it where one can (#694), and `subplans()` lets tests force the engine's negation bodies and `or` branches hashed or correlated (`set_subplans`, `minigraf::__subplans`, #546) - `prepared.rs`: `BindValue`, `PreparedQuery` — parse-once/execute-many with named `$slot` bind slots; `prepare_query`, `substitute` - `magic_sets.rs`: Magic-sets rewriting for demand-driven recursive rule evaluation (not applied to rules with `not`/`not-join`) @@ -212,7 +212,7 @@ Auto-migrates v7 → v8 on open (spec §9, with a backup meta page). v1–v6 are ## Test Coverage -**1767 tests** (1753 passing, 14 ignored; unit + integration + doc). +**1769 tests** (1755 passing, 14 ignored; unit + integration + doc). See `docs/TEST_COVERAGE.md` for the full per-file breakdown. **Testing conventions** — see the Testing Conventions section below before writing any tests. diff --git a/docs/TEST_COVERAGE.md b/docs/TEST_COVERAGE.md index ab4f0eced0..5130f115fe 100644 --- a/docs/TEST_COVERAGE.md +++ b/docs/TEST_COVERAGE.md @@ -4,7 +4,7 @@ **Verified**: 2026-10-22 with `cargo test --quiet` -**Result**: 1,753 passing tests and 14 ignored tests (1,767 total) +**Result**: 1,755 passing tests and 14 ignored tests (1,769 total) This covers the unreleased file-format-v8 work (#287, #371): the index-key value-collision fix, the v7→v8 migration, and the drop of formats v1–v6. It otherwise still covers the public database API, the Datalog engine, storage and recovery paths, v2.0.0's locking and structured-error-code changes, and v2.0.1's regression test for rebuilding indexes on open after several checkpoints (#370). Merged from the v2.x line: `tests/point_query_history_test.rs` and new storage unit tests check that attribute-narrowed bound-entity lookups return exactly what a full scan returns, and that `net_asserted_facts` matches its previous implementation on randomized histories (#323). Attribute-scan tests check that the AEVT range covers exactly the queried attribute, including non-ASCII names such as `:丿` and prefix siblings such as `:ab` for `:a` (#381). Incremental B+tree rebuild tests check that checkpoints which copy untouched index leaves produce exactly the entries and file checksum a full rebuild would, including over repeated checkpoints, that single-fact checkpoints do not fragment the index, and that a damaged slot directory is rejected rather than copied (#315). B+tree cursor tests check that every scan walks the tree, not the leaf `next_leaf` chain: full scans and start positions match the input, `seek` from the current position lands where a fresh descent from the root would (randomized, plus within a leaf, to a sibling, across subtrees, past the end, into the gap after a leaf, and backwards as a no-op), a seek to the sibling leaf reads exactly one page, reads are unchanged with every `next_leaf` zeroed, a child pointer into a non-B+tree page is STG-013, and a cycle in child pointers is an error, not a hang (v8 storage format PR 1, #374). Directory-sync unit tests check that creating the `.graph` file or the WAL, and deleting the WAL, fsync the parent directory after the file operation, and that reopening an existing file does not (#389). Disjunction tests check that `or-join` returns an empty result, not INT-031, when no rows reach it: on an empty database, after a pattern that matches nothing, after a `not` that removes every row, and in a rule body (#405). A stratification unit test builds the same two-rule negative cycle 64 times and checks that the INT-054 message names the same predicate pair every time (#410). Magic-sets tests check that a recursive rule with a literal start that recurses through another rule returns the same results as without the literal (#297). API tests check that `execute()` and `WriteTransaction::execute()` reject `$slot` bind tokens in every position with API-010 (#407). The REPL `run()` test now runs in a child process with null stdin, so it no longer hangs when the test runner's stdin is an open non-TTY stream (#415). v8 page-format tests (PR 2, #374, #388) check the 24-byte page header (a flipped bit, a wrong page id and a future generation each give their own STG code, legacy page types fail before the CRC, and a failed page is never cached), meta-page encoding, the free-list chain, WAL v2's base generation, and every row of the meta-selection table: both slots valid, a torn newest slot with the WAL's base generation (opens at the older one), a WAL newer than the valid meta, pages of the next generation on the free list or past `page_count` with no WAL (all STG-033, with the file unmodified), an unknown feature bit (STG-034), and a pre-release v8 single header (STG-032). Fault-injection tests crash `save()` at every page write (cleanly and with torn pages, including the meta write) and every sync, and crash a v7 migration at every write; each reopen finds exactly the old or the new checkpoint, and every reachable page plus the free list covers the file exactly. Twenty-five consecutive saves never write a page the previous meta references. Covering-key tests (PR 3, #433) check that byte order equals logical order for every key component and value type on random tuples (negative, zero and large integers, NaN and ±0.0, strings with 0x00, 64- and 65-byte strings, FOREVER, newest-transaction-first) and that every component round-trips; that prefix-compressed leaves and shortest-separator internal nodes round-trip, agree with a linear scan, keep `max(left) < s ≤ min(right)`, and reject an overflow; that the byte-key B+tree's builds, incremental rebuilds, cursor and `seek` match their expected sets; that dictionary ids are assigned once, never reused, shared between a keyword attribute and value, and deterministic; that a re-asserted or retracted long value writes no new value page and a forced hash collision still finds the right value; that one transaction with two timestamps is STG-037 and a missing dictionary entry STG-036; that committed reads by entity, entity and attribute, attribute, and in full equal an in-memory model across eight checkpoints and a reopen; that short-valued reads touch no value page; that a v7 file with every value type, long strings, refs and retractions migrates to exactly the same facts; that a pre-covering-key v8 file is STG-032; and that string values over 4,068 bytes and attributes or keywords over 1,024 bytes are WAL-003. A WAL test checks that reopening next to a fully checkpointed WAL does not reuse transaction numbers (#447). Copy-on-write checkpoint tests (PR 4, #434) check that lazy free-list pops and pushes conserve every page across page boundaries, partial head pages and chain exhaustion, never hand out a page freed in the same generation, and share unread chain pages unchanged; that a copy-on-write insert equals a sorted merge for random batches (including keys below the first and above the last, many into one leaf, root growth to depth 3, and 1 KB separators that split internal nodes), leaves the old tree readable and unchanged, frees exactly the replaced nodes, writes only new pages, writes exactly one leaf and two internal nodes for one entry in a depth-3 tree, and does not fragment leaves under single inserts; that a checkpoint after 1 or 100 right-edge facts writes at most the tree-depth difference more pages at 100,000 facts than at 10,000, and at most one path per new entry per tree for random keys; and that four reader threads querying throughout 40 checkpoints never fail and never see the fact count go backwards. Hardening tests (PR 5) damage an index leaf, an internal node, a dictionary leaf, a value page and a free-list page in turn. Every committed read or checkpoint that reaches the damaged page fails with STG-029, never with wrong or fewer rows. A query through `Minigraf` on a file with damaged leaves fails with STG-029, and the file still opens at its last checkpoint. A size test measures at most 200 bytes per fact (142 measured) on 144k facts in #433's shape; its 1.15M-fact variant is ignored locally and runs in the nightly smoke workflow. A shared dictionary-cache test checks that cached ident and timestamp lookups return the same facts and that the cache stays bounded. Merged from the v2.x line: storage and `edge_cases_test.rs` tests check that more than 65,535 uncheckpointed facts each resolve to their own fact through entity lookups and attribute scans, in memory and file-backed (#445). Merged from the v2.x line: `tests/golden_corpus_test.rs` opens a copy of each committed golden file in `tests/golden/` (v7 files written by minigraf 2.0.3: one checkpoint, several checkpoints, indexes rebuilt on open, a crash-left WAL, an already-checkpointed WAL, same-transaction multi-values) and checks its manifest's CRC32, `tx_count` and query results after open, after a checkpoint and reopen, and after one more write; a second test checks that every golden file has a manifest (#391). On `v3` the same test checks that each v7 file has a v8 meta page after its first open and gives the same results after reopening the migrated file, and adds seven v8 golden files (one checkpoint, seven copy-on-write checkpoints, a crash-left v2 WAL, an already-checkpointed v2 WAL, same-transaction multi-values, a v7 file migrated in place, and long values at the size limits); the #371 queries, skipped on v2.x, run and pass. `tests/model_based_test.rs` runs random sequences of transacts, retracts, write transactions, checkpoints, reopens and simulated crashes against a file and, after every step, compares the transaction counter, `verify`, full rows with windows and tx counts, and six query shapes under `:as-of N` and `:valid-at T` with a reference model (#385). `tests/property_test.rs` writes random histories (batched transacts, retracts, write transactions, checkpoints) in memory and to a file, and compares random queries (one to three joined patterns, `not` or `not-join`, a comparison predicate, `:as-of`, `:valid-at` or `:any-valid-time`) with a reference evaluator, on the open file and after a reopen; a query error fails the test (#386). `tests/crash_kill_test.rs` kills a child process running a seeded workload (multi-valued batches, batched retracts, five checkpoint modes) at a random point and checks that the reopened file holds exactly the transactions the child logged as committed, or those plus the one in flight, through full-scan, AEVT, AVET, EAVT and `:as-of` queries and `verify`, again after a second reopen and after a checkpoint plus reopen (#384). Integrity tests (#373) check that intact files verify with no problems and an exact fact and page count, and that `verify` reports each kind of damage with its code: an EAVT, AEVT, AVET or VAET leaf missing an entry (STG-038), keys out of order and a page reached from two trees (STG-039), a rotted index leaf (STG-029), a free page still in use and a leaked page (STG-035), a missing transaction entry (STG-036), and an entity id whose UUID maps to another id (STG-040). After each index or free-list damage, `rebuild_indexes` leaves a file that verifies clean, reads back every fact and accounts for every page. The source is an index that agrees with another one, or the only intact one; three intact indexes that all disagree, or a damaged dictionary, give STG-041 with the file unchanged. A rebuild commits pending facts, including new ids and long values. A crash at every write (clean and torn) and every sync of a rebuild reopens either at the old generation with only its old damage or at the new one with none, never losing a fact. Through `Minigraf` (`tests/integrity_test.rs`), a rebuild commits WAL entries and deletes the WAL, and flipping a byte in each leaf of a file in turn is always reported, then either repaired (index leaves) or refused with STG-041 and the file unchanged (dictionary leaves). Page-count tests (#497) check that a CRC-valid meta whose `page_count` is past the end of the file (one page past, 2^50, `u64::MAX`; with the other slot valid or damaged; with or without a WAL) and a file cut short by one page, three pages or down to three pages are `STG-044` at open, with the file unchanged and not grown, while a `page_count` exactly at the end opens; that a checkpoint whose pages did not all reach the backend fails with `INT-049` before writing its meta, and the file reopens at the previous generation; and that `verify` at a meta counting pages past the end reports `STG-044` without scanning to that count. Through `Minigraf` (`tests/integrity_test.rs`), a file truncated by one or three pages and a file whose meta was rewritten with `page_count` 2^50 and a valid CRC are `STG-044` read-write and read-only, with no WAL created and the file length unchanged. The `file_header` fuzz input from #497 is a corpus seed. A sub-page test (#506, `tests/integrity_test.rs`) checks that a file of 1 to 4,095 bytes is `STG-045` read-write and read-only, unchanged and with no WAL, when it is a database cut below one page or foreign bytes, and opens as a new database that takes writes when it is a prefix of the first meta page or all zeros; a file-backend unit test checks that `partial_page` returns the bytes past the last whole page. The `corrupt_file` fuzzer no longer skips files under one page: they must fail to open or open empty, and the #506 input is a corpus seed. Damaged v7 fact page tests (#496) check that a page in the counted fact range whose type byte is anything but the fact-page type (zero, `0x01`, the v2.x B+tree types, `0xFF`, a zeroed page; first and last page) is `STG-014` rather than skipped, while a range derived from the first index root skips only v2.x B+tree pages; that opening such a v7 file read-write or read-only fails with `STG-014` and writes nothing; and, in `tests/migration_matrix_test.rs`, that the golden `v7_basic.graph` with page 1's type byte changed or page 1 overwritten with noise fails both opens with the file unchanged and no WAL created. Both inputs are `fact_page` corpus seeds. Merged from the v2.x line: `tests/edge_cases_test.rs` checks the same refusal and acceptance through `Minigraf::open` on a database checkpointed twice (#506). Torn-WAL-tail tests (#513) check that opening a WAL writer cuts off a partial last entry (cut in the checksum, the header or the payload) or an entry with a bad checksum and everything after it, then appends where replay reaches, and leaves an intact WAL byte for byte; that an append that fails part-way makes every later append `WAL-007` while a rejected oversize fact (`WAL-003`, nothing written) does not; through `Minigraf`, that the failed transaction is not applied, later `transact` and `commit` are `WAL-007`, and a `checkpoint()` makes writes work again; and, in `tests/wal_test.rs`, that a commit made after reopening a crash-left WAL with each kind of torn tail survives a second crash. The fault matrix (#390, `src/fault_matrix.rs`) drives a test-only fault plan through the real file backend, WAL and directory fsync: an EIO, a short or torn write (1, 40 and 4,095 bytes), a full disk that keeps failing every later write, a failed fsync, and a failed fsync that also loses the writes since the last good one ("fsyncgate"), each at every write or sync call of a transact, a transact that creates the WAL, an automatic checkpoint, `checkpoint()`, the close-time checkpoint and `rebuild_indexes()`, on a database committed over two checkpoints with multi-valued, retracted and long values and entries pending in the WAL. After each fault, the handle holds the old facts or those plus the whole transaction, never part of one; after a failed checkpoint another is `STG-046`; a later write succeeds or is `WAL-007`/`STG-046`; a kill and reopen gives exactly the handle's facts, plus the failed transaction whole or not at all, and `verify` finds nothing; and a commit after recovery survives another kill. Two more tests fill the disk halfway through a checkpoint (`STG-046`, reads unchanged, reopen intact), and fail the fsync after a checkpoint's meta write and then retry the checkpoint, crashing at each of its writes: the retry is refused and every reopen is intact (without the refusal, a reopen hits `STG-029`). Unit tests check the fault plan's counting, and that a `rebuild_indexes` refused with `STG-041` leaves the handle usable. Live-read tests (#379) check that `triple_len` ends exactly where `tx↓` begins for every value type and index; that on random histories (several valid-time windows, retractions, re-assertions, several values per attribute, long values, 12 transactions per checkpoint) the committed live read for every scan kind and `:as-of` point is exactly the net-asserted set, that it stays equivalent with pending facts on top, and after reopen; and that a point read on a triple asserted and retracted 2,000 times reads under a third of the pages a history read does, with or without `:as-of`. `tests/live_reads_test.rs` runs the same history in a checkpointed file database and in memory and checks that point, attribute, full-scan, join, valid-time, `:as-of` and rule queries return the same rows, before and after reopen. One-window tests (#435) check that `net_asserted_facts` keeps each triple's newest transaction only (a later window replaces an earlier one, closing an open window, a retraction in the newest transaction hides it, records with two windows in one transaction keep both, once each) against a per-triple model on random histories; that the on-disk key walk agrees at every `:as-of` before and after reopen; and that `API-011` rejects two windows of one fact in one transaction without taking a `tx_count`. `tests/valid_time_window_test.rs` checks replacing, closing, extending, reopening and retract-then-reassert through entity-bound and attribute queries in memory, on a checkpointed file and after reopen, `API-011` from `transact` and from `WriteTransaction::execute`, and a later statement's window committed when two statements of a `WriteTransaction` give one fact different windows. Window-validation tests (#436) check that `check_valid_windows` rejects an empty window, an inverted one, and a `:valid-to` at or before the transaction time when `:valid-from` is left out, but not retractions; that `execute` rejects each such `transact` (both bounds, equal bounds, `:valid-to` only, a per-fact bound inverting the transaction's window) with `API-019` without writing or taking a `tx_count`, in memory, checkpointed and after reopen; that `tx.execute()` rejects them and the transaction still commits its other statements; that `commit()` rejects a default `valid_from` that has passed the `:valid-to` by commit time; and that `FactStorage::transact_batch` takes no `tx_count` on rejection. Statement-order tests (#477, `tests/statement_order_test.rs`) run every mix of two statements on one fact inside a `WriteTransaction` (retract then assert, assert then retract, two retracts, two windows, after a committed assertion and on an empty database) and check that reads inside the transaction and the committed rows agree, in memory, checkpointed and after reopen; that other facts of an overridden statement survive; that the commit is one transaction without the overridden records; and that two windows in one statement are `API-011` from `tx.execute()` while the rest commits. A unit test checks the commit collapse keeps each fact's newest statement in order. A log-writer test checks that an inverted window is `API-019`, a second window of a fact in one transaction `API-011`, and an assertion and a retraction of one fact in one transaction `API-020` in either order, each leaving the writer usable and the output exact, while duplicate retractions, identical repeats and the same fact in the next transaction are accepted. Cursor tests (#432, `tests/cursor_test.rs`) check that `query()` batches partition the `execute()` answer for several batch sizes (never empty, never over `max_rows`, `max_rows == 0` still progresses, `None` stays `None`), that the iterator and aggregates, rules, `:as-of` and `:any-valid-time` match `execute()`, that a cursor opened before a `transact`, a `WriteTransaction` commit, a retract or a checkpoint returns the pre-write answer to the end (in memory and file-backed), that `transact`/`retract`/`rule` are `API-012` and bind slots `API-010`, that a `WriteTransaction` thread gets `INT-001`, that rule limits give `INT-020` as from `execute()`, that `PreparedQuery::query` matches `PreparedQuery::execute`, and that a cursor is `Send` and outlives its database handle. Fact-log tests (#430, `tests/fact_log_test.rs`) check that `fact_log()` returns exactly the records written (assertions and retractions, with `tx_count` and `tx_id`) in memory, with everything pending, half checkpointed, fully checkpointed and after reopen, in both orders, with windows of 1 to 1,000 records and batch sizes of 1 to 1,000, in non-decreasing `tx_count` in Tx order; that every layout gives identical records, including valid-time windows and long string values; that a transaction larger than the window is split with no loss or duplicate; that attribute, attribute-prefix, entity and tx-range filters and their combinations match a model, and unknown names match nothing; that writes after open are not in the log; that `checkpoint()` and `rebuild_indexes()` are `API-013` while a log is open (a checkpoint with nothing to write is allowed), that automatic checkpoints from `execute()` and `WriteTransaction::commit` wait for the log, and that closing, dropping or finishing the log releases the database; that a `WriteTransaction` thread gets `INT-001`; and that a log is `Send`, outlives its database handle, and the deferred writes replay on the next open. Read-only open tests (#429, `tests/read_only_open_test.rs`) check that a read-only handle on a file with checkpointed facts and a pending WAL returns the same query results, `tx_count` and fact log as a read-write open; that queries, a cursor, a fact log, `verify`, `prepare`, rules and a UDF leave the `.graph` and WAL bytes and the `.graph` mtime unchanged, and no WAL is created; that `transact`, `retract`, `begin_write`, `checkpoint` and `rebuild_indexes` are `API-014` without taking a `tx_count`, also on a read-only in-memory database and through the builder path; that a missing file is `STG-042` and nothing is created; that an empty file is an empty database and stays 0 bytes; that read-only handles share a file while a read-write one is refused with `STG-025`, both ways; that a file without write permission opens read-only; and that small and whole-file page caches work. File-backend unit tests check that a shared-mode backend refuses page writes and syncs with `INT-056`, that the in-process registry counts readers and admits readers or one writer (also without kernel locks), and that a reader in another process shares the file with a reader here and refuses a writer here with `STG-026`. Storage unit tests check that a read-only open of a v7 file at every point of an interrupted migration (clean and torn writes) sees every fact and writes nothing, and that an empty backend stays empty. `tests/golden_corpus_test.rs` opens a copy of every golden file read-only first and checks its `tx_count` and queries, and that neither the file nor its WAL changes. Log-writer tests (#431, `tests/log_writer_test.rs`) copy a source's fact log (assertions, retractions, an explicit valid-time window, long strings, refs, keywords, checkpointed and pending facts) through `LogWriter` and check that the new file has no `.partial` or WAL, verifies clean, and gives the source's `tx_count`, fact log and query results (current, `:valid-at`, `:any-valid-time`, every `:as-of`, and entity-, attribute- and value-bound lookups) read-write, read-only and after reopen (#370); that it takes new writes at the source's next `tx_count`; that 90,000 facts over two batch commits verify clean and count correctly at `:as-of`; that a purged middle transaction is a hole whose `:as-of` equals the one before, and trailing holes keep the counter through `advance_tx_count`; that an empty log is an empty database with the counter; that `tx_count` 0, a lower or closed transaction and a backwards advance are `API-015`, a second `tx_id` `API-016`, a second window `API-011`, a retraction of an asserted fact in one transaction `API-020`, an empty window `API-019` and oversize values or idents `WAL-003`, each leaving the writer usable and the output exact, with repeats written once; that an existing target or WAL is `STG-043`, a second writer `STG-025` and `read_only` `API-014`; that a stale `.partial` is reused; that dropping an unfinished writer leaves nothing; that `finish` refuses a target created during the build and leaves it untouched; and that `LogWriter` is `Send`. Unit tests check that a batch commits only when a transaction opens past the batch size, never splitting one, and that `FileBackend::truncate` empties a file. A unit test in `error.rs` checks that `MinigrafError::invalid_argument` and `MinigrafError::closed`, the constructors for language bindings, give API-017 and API-018 with their text. Query-validation tests (#406, #414) check that a plain `:find` variable or a window function's argument, `:partition-by` or `:order-by` variable that no `:where` clause binds (including `?_` wildcards) is `PRS-080` from both `execute()` and `prepare()`, naming the variable, while variables bound by a pattern, an attribute position, a rule call, an expression binding, an `or-join`, every branch of an `or`, a pseudo-attribute or a window spec are accepted, and bind slots are not mistaken for `:find` variables; and that an unknown aggregate is `QRY-010` and an unknown window function `QRY-011` on an empty database, when no row matches, when rows match, through a rule query and through a prepared query, while a registered UDF in either position returns an empty result on an empty database. Coverage-gate tests (#396) check that replay stops at a WAL entry whose first fact is longer than 10 MB or that claims more than 1M facts, that a WAL writer cannot be opened in a missing directory, and that a failed cut of a torn WAL tail fails the open and leaves the file as it was; that a short v7 page and a slot past the record count are `INT-024`; that a migration backup meta of another generation or file length is not used (`STG-032`, file unchanged), and a torn first meta with data in page 1 is `STG-032`, not a new file; that `save` with nothing pending writes nothing, `into_backend` saves pending facts, and `rebuild_indexes` with nothing checkpointed commits the pending facts; and that unsorted or repeated B+tree input and a stored key inserted with another value are `INT-049`, a tree pointer to a free-list page is `STG-013` from `get`, a leaf walk and a copy-on-write insert, and the read-only `MutexStorageBackend` refuses writes, syncs and close. A page-cache test holds two threads in the backend read so both miss the same page, and checks that both get the one cached copy; before it, that path ran only when the scheduler happened to race the threads, and the gate flapped. Three `BrowserDb` tests (wasm32, run with `wasm-bindgen-test` in a browser, not counted above) check that `query()` batches of 1, 7 and 1,000 give the rows of `execute()`, that a cursor keeps the answer from when it opened and returns the end after `close()`, and that a `transact` is API-012. The wasm32 targets run in CI (`.github/workflows/wasm.yml`). In a browser (`wasm-pack test --headless`, Firefox and Chrome): 32 `wasm_bindgen_test` tests: nineteen for `BrowserDb` (including IndexedDB persistence, the cursor, and the flush returning every dirty page and failing on one it cannot read, from #470), eleven for `BrowserBufferBackend` (which used `#[test]` and never ran before), and two checking that IndexedDB page keys accept only whole numbers from 0 to 2^53. Five of the `BrowserDb` tests (#411, #440) check that opening a v7 store written straight into IndexedDB stores a v8 meta page and only the live pages, with nothing written on the next open; that after each of 60 transacts memory, and at the end IndexedDB, hold exactly the pages not on the free list while the file grows by under one page per transact; that a commit applied in memory but never flushed reopens at the previous one and keeps working; that an export after churn is as long as the meta says and imports back with its free pages dropped; and that `importGraph()` deletes the replaced database's IndexedDB keys. Two buffer tests check that releasing a page drops its bytes and any unflushed write, and that export writes a released page as zeros. A native storage test checks that a file whose free pages are all zeros (as the browser exports them), both just migrated from v7 and after 20 saves, opens, verifies clean and keeps committing, and the free-list test checks that a checkpoint reports exactly the ids it newly lists. On `wasm32-wasip1` under Wasmtime: the unit and integration tests that do not use a file run, 956 passing; ten that spawn threads or a child process are ignored on WASI. These are not counted above. A WAL test checks that a checkpoint with no facts to flush still removes a WAL whose entries are all already in the file, and the golden-corpus test now requires the WAL to be gone after a checkpoint for the `stale_wal` fixtures too (#457). A WAL test checks that closing a handle opened with `wal_checkpoint_threshold(usize::MAX)`, in both sync modes, leaves the `.graph` file byte for byte as it was and keeps the WAL, whose entries replay on the next open, and a unit test closes an in-memory handle under the same setting (#476). A recursive-rule test checks that a rule query on a database with more live facts than `max_results` returns its answer, with a bound and with a free first argument, and that a query deriving more facts than its `:max-results` is still `INT-020` (#528). A log-writer test runs the online backup from `docs/DURABILITY.md`: it copies a read-write handle with an uncheckpointed transaction through `fact_log` and `LogWriter` while another thread writes past the automatic checkpoint threshold, and checks that the copy verifies clean, holds exactly the records the log returned and the counter read after the log opened, and that every concurrent write reaches the source's file once the log is dropped (#398). Rule-body tests in `tests/recursive_rules_test.rs` check that a `:db/valid-at` pattern in a rule definition, in its `not` and `not-join` bodies and in its `or` branches binds the query's valid time, on the semi-naive, stratified and magic-sets paths (#617). Tests in `tests/not_join_test.rs` check that a rule calling a rule with `not-join`, `not` or `or` returns that rule's rows, with a free and a literal argument and through a forwarding rule, and that a rule with its own `not-join` calling one gets the same rows whether or not the query asks for the callee first; stratification unit tests check that such a caller, a rule forwarding to it and a caller of a recursive one sit above the callee, and that recursion through a rule with a `not` still stratifies (#628). Tests in `tests/not_join_test.rs` check that recursion through a rule with `not`, `not-join` or `or`, directly or through another rule, returns every row along a chain, and that the `not` still removes the rows it should; evaluator unit tests check that such recursion stops at its fixpoint that `max_iterations` and `max_results` end one that does not with INT-020, and that `max_results` counts the facts every pass derives, not only the mixed rule's (#633). @@ -18,7 +18,7 @@ This covers the unreleased file-format-v8 work (#287, #371): the index-key value - **Magic-sets demand** (#608): `tests/magic_sets_test.rs` checks rule queries with a literal argument where some call site cannot carry the demand — a rule-body call with an argument nothing binds yet, the same rule called with free arguments, a call from a rule called with free arguments, calls inside `or` and `not`, a fully literal call, and a call bound only by a variable; `magic_sets.rs` unit tests check the adornment each shape solves to. - **`or` with no shared variable** (#610): `tests/disjunction_test.rs` checks that an `or` sharing no variable with the earlier clauses joins as a cross product, before or after them, through the seeded path (a branch with `not`) and in a rule body, keeps the earlier clauses' variables and fact metadata (a pseudo-attribute), and gives no rows when no branch matches. - **Prepared time travel** (#603): `tests/prepared_statements_test.rs` runs literal `:as-of` (counter and timestamp), `:valid-at`, `:any-valid-time` and a per-fact pseudo-attribute query through `execute`, a prepared `execute` and a prepared cursor, which must agree; a `prepared.rs` unit test checks that `substitute` keeps non-slot `:as-of` and `:valid-at`. -- **Rule queries on the engine** (`tests/recursive_engine_test.rs`, 10 tests; #548): linear and non-linear transitive closure, mutual recursion, strata whose `not` and `or` rules recurse (#633's cases), naive rules (a same-stratum read in an `or` branch, through a `:p` pattern, through `[?y ?a ?z]`), derived facts visible to every pattern and the magic-set predicate's attribute, identity of derived facts (keyword vs ref, `-0.0` vs `0.0`, long strings, a head equal to a stored fact), `nil` metadata and `:db/valid-at` over derived facts, one-argument heads, `QRY-013` and `INT-022` heads, both `INT-020` limits, and rule queries with aggregates, expressions, `not-join`, `or` and windows; each in memory, on a file with pending facts and after a checkpoint, and under `test-oracle` against the executor. Engine unit tests check routing (`:as-of` timestamp, an unplannable rule body, a three-argument call and a write transaction stay on the executor) and derived rows read across batches before and after a checkpoint; `relation.rs` unit tests check row identity and the `Old` / `Delta` / `Full` ranges. +- **Rule queries on the engine** (`tests/recursive_engine_test.rs`, 10 tests; #548): linear and non-linear transitive closure, mutual recursion, strata whose `not` and `or` rules recurse (#633's cases), naive rules (a same-stratum read in an `or` branch, through a `:p` pattern, through `[?y ?a ?z]`), derived facts visible to every pattern and the magic-set predicate's attribute, identity of derived facts (keyword vs ref, `-0.0` vs `0.0`, long strings, a head equal to a stored fact), `nil` metadata and `:db/valid-at` over derived facts, one-argument heads, `QRY-013` and `INT-022` heads, both `INT-020` limits, and rule queries with aggregates, expressions, `not-join`, `or` and windows; each in memory, on a file with pending facts and after a checkpoint, and under `test-oracle` against the executor. Engine unit tests check routing (`:as-of` timestamp, an unplannable rule body, a three-argument call and a write transaction stay on the executor) and derived rows read across batches before and after a checkpoint; `relation.rs` unit tests check row identity and the `Old` / `Delta` / `Full` ranges. Every delta run of the magic-set rewrite of a recursive rule joins each clause on a variable bound before it, with no keyless join (`rule_delta_runs_join_on_a_bound_variable`, #694), and an optimizer unit test checks `plan_after`'s connected order. - **Query memory limit** (`tests/memory_limit_test.rs`, 7 tests; #549): `OpenOptions::query_memory_limit` is off by default and set by its builder; `QRY-012` through `execute`, a cursor's first pull, a prepared query and a rule query (from `execute`, and from `query` when the rules run at open); the database answers after a query fails; a write transaction's query is counted until it stages a write, then runs uncounted on the executor; a prepared rule query uses the database's `max_derived_facts`. Engine unit tests (`src/query/engine/tests.rs`, 7 more): `HashJoin`, `AntiJoin`, `Union`, `Aggregate` and `Window` charge while they hold state and the meter is back at 0 after a drain and after an early drop; `QRY-012` names the holder over the limit (each operator, `IdSpace`, `Recursive`, `Distinct` and `Relations`), and its allocator form through the `try_reserve` test hook; a cursor returns rows, then `QRY-012`, then nothing; `rewind` and `close` release; the planner builds a keyless join on the side with the smaller product estimate (#575's shape, a selective outer side, a tie, reordering off). `meter.rs` (4 unit tests) checks charge, release, drop, peak and the allocator form. `Aggregate` charges its sorted map of groups until every row is built, and lets its hash table and group rows go first, with `sum-distinct` members charged once (`aggregate_finish_charges_its_sorted_groups`, `aggregate_finish_keeps_sum_distinct_members_charged_once`). - **Join rules** (`tests/join_rules_test.rs`, 10 tests; #545): a join on a float value pairs `0.0` with `-0.0`, through the hash key and as a shared variable, and a float constant still matches within epsilon; a variable bound to a keyword by one pattern and to the ref of the same entity by another returns the kind from the first pattern in `:where` text order, when the planner runs the patterns in another order, through the attribute position, before and after a rule call, and with a repeated pattern; an expression binding unifies with a pattern binding the same variable, and the first binder in the text, pattern or expression, gives the value (#596); a pseudo-attribute pattern never gives a variable its value, even when it runs first (#606; the plan-independence matrix checks it with reordering off). Under the `test-oracle` feature the joins among them also run on the streaming engine. A unit test checks that `-0.0` and `0.0` hash alike. - **Pseudo-attribute sources** (`tests/pseudo_source_test.rs`, 12 tests; #594): a per-fact pseudo-attribute reads the nearest earlier pattern in the text with the same entity term (#594's example in both text orders), two pseudo-attributes share a source, `[:alice ?a _]` gives one row per fact, constant and bound value terms check, `:alice` and its UUID are one term while `?e` and `:alice` are not, PRS-081 for a pattern after it, alone, `_`/`?_x` entities, another entity's pattern and a rule call; a `not` body reads the outer fact (and a source inside the body), `not-join` crosses for a listed variable only, `or` branches read the outer fact and never a sibling, `or-join`, closed rule bodies, `$slot`s by name at prepare time, and `:db/valid-at` once per fact. Parser unit tests check the hidden variables (`?#.`), the join variable a crossed `not-join` gains, and the PRS-081 text; an optimizer test places a pseudo-attribute pattern after its source and the pattern binding its value; matcher tests read the hidden variable, a substituted integer, and nothing without a source; the engine tests run the sourced shapes and check PRS-081 for the old fallback shapes. The plan-independence matrix gains eleven pseudo-attribute shapes. diff --git a/src/query/datalog/optimizer.rs b/src/query/datalog/optimizer.rs index 7e630f5540..ee5564b3dd 100644 --- a/src/query/datalog/optimizer.rs +++ b/src/query/datalog/optimizer.rs @@ -282,6 +282,26 @@ pub fn plan( pub(crate) fn plan_seeded( clauses: Vec, seeded: &std::collections::HashSet, +) -> (Vec<(WhereClause, Option)>, Vec) { + plan_ordered(clauses, seeded, false) +} + +/// [`plan_seeded`] for the clauses after a pattern that runs first, binding +/// `seeded` (a rule body's delta, #694): each next pattern shares a variable +/// with those bound before it when one does, the most selective of those as +/// the bound variables stand, so no pattern joins as a product while one +/// could join on a key. Cost only: no answer depends on the order. +pub(crate) fn plan_after( + clauses: Vec, + seeded: &std::collections::HashSet, +) -> (Vec<(WhereClause, Option)>, Vec) { + plan_ordered(clauses, seeded, true) +} + +fn plan_ordered( + clauses: Vec, + seeded: &std::collections::HashSet, + connected: bool, ) -> (Vec<(WhereClause, Option)>, Vec) { // Separate into patterns (with hints), exprs, and not/not-join clauses. let mut patterns: Vec<(WhereClause, IndexHint)> = Vec::new(); @@ -317,6 +337,10 @@ pub(crate) fn plan_seeded( }); } + if connected && reorder() { + patterns = connect(patterns, seeded); + } + // Start with sorted patterns only. let mut result: Vec<(WhereClause, Option)> = patterns .into_iter() @@ -471,6 +495,43 @@ pub(crate) fn plan_seeded( (result, deferred) } +/// Reorder `patterns` (sorted by selectivity) so that each shares a variable +/// with `seeded` or a pattern before it, when any remaining one does: the +/// highest [`selectivity_score`] given the variables bound so far, the +/// earliest on a tie. A pattern sharing none comes next only when no +/// remaining pattern shares one. `?_` wildcards join nothing. +fn connect( + mut patterns: Vec<(WhereClause, IndexHint)>, + seeded: &std::collections::HashSet, +) -> Vec<(WhereClause, IndexHint)> { + let vars = |c: &WhereClause| match c { + WhereClause::Pattern(p) => pattern_bound_vars(p) + .into_iter() + .filter(|v| !v.starts_with("?_")) + .collect(), + _ => Vec::new(), + }; + let mut bound = seeded.clone(); + let mut out = Vec::with_capacity(patterns.len()); + while !patterns.is_empty() { + let mut best: Option<(usize, u8)> = None; + for (i, (c, _)) in patterns.iter().enumerate() { + let WhereClause::Pattern(p) = c else { continue }; + if !vars(c).iter().any(|v| bound.contains(v)) { + continue; + } + let score = selectivity_score(p, &bound); + if best.is_none_or(|(_, b)| score > b) { + best = Some((i, score)); + } + } + let next = patterns.remove(best.map_or(0, |(i, _)| i)); + bound.extend(vars(&next.0)); + out.push(next); + } + out +} + /// Static 4-tier cardinality estimate for a single pattern. /// /// Derived from selectivity_score but returns u64 cost (lower = cheaper) rather @@ -606,6 +667,59 @@ mod tests { assert_eq!(first(&planned)[1], "?x", "text order"); } + /// #694: after a first pattern binding `seeded`, each next pattern + /// shares a variable with those bound before it when any does. + #[test] + fn plan_after_joins_each_pattern_on_a_bound_variable() { + // The magic-sets body of `reach` after its `(reach ?mid ?to)` delta: + // `magic` alone is the more selective, but shares nothing yet. + let body = vec![ + WhereClause::Pattern(make_pattern( + var("from"), + kw(":magic"), + EdnValue::Boolean(true), + )), + WhereClause::Pattern(make_pattern(var("from"), kw(":next"), var("mid"))), + ]; + let attrs = |planned: &[(WhereClause, Option)]| -> Vec { + planned + .iter() + .map(|(c, _)| match c { + WhereClause::Pattern(p) => format!("{:?}", p.attribute), + _ => "other".to_string(), + }) + .collect() + }; + let seeded: std::collections::HashSet = + ["?mid".to_string(), "?to".to_string()].into(); + let (before, _) = plan_seeded(body.clone(), &seeded); + assert!(attrs(&before)[0].contains(":magic"), "selectivity alone"); + let (after, _) = plan_after(body.clone(), &seeded); + assert!(attrs(&after)[0].contains(":next")); + assert!(attrs(&after)[1].contains(":magic")); + + // A chain: each step joins the one before it, not the selective + // `:root` that shares nothing until `?w` is bound. + let chain = vec![ + WhereClause::Pattern(make_pattern(var("w"), kw(":root"), EdnValue::Boolean(true))), + WhereClause::Pattern(make_pattern(var("w"), kw(":b"), var("x"))), + WhereClause::Pattern(make_pattern(var("x"), kw(":c"), var("z"))), + ]; + let seeded: std::collections::HashSet = ["?z".to_string()].into(); + let (after, _) = plan_after(chain.clone(), &seeded); + let order = attrs(&after); + assert!(order[0].contains(":c") && order[1].contains(":b") && order[2].contains(":root")); + + // No pattern shares a variable: selectivity order. + let seeded: std::collections::HashSet = ["?q".to_string()].into(); + let (after, _) = plan_after(chain.clone(), &seeded); + assert!(attrs(&after)[0].contains(":root")); + + let _off = set_reorder(false); + let (after, _) = plan_after(body, &["?mid".to_string()].into()); + assert!(attrs(&after)[0].contains(":magic"), "text order"); + } + #[test] fn subplans_switch_is_per_thread_and_restored() { assert_eq!(subplans(), Subplans::Choose); diff --git a/src/query/engine/plan.rs b/src/query/engine/plan.rs index fb9b60c6c9..11b2966219 100644 --- a/src/query/engine/plan.rs +++ b/src/query/engine/plan.rs @@ -334,15 +334,27 @@ fn clauses(b: &mut Builder, clauses: &[WhereClause], first: Option<&Pattern>) -> }) { return None; } - let (mut planned, deferred) = optimizer::plan(clauses.to_vec()); - if let Some(p) = first.filter(|_| optimizer::reorder()) - && let Some(i) = planned + // With `first`, the rest are ordered after it, its variables bound, each + // joining on a variable bound before it where one can (#694). + let at = first.filter(|_| optimizer::reorder()).and_then(|p| { + clauses .iter() - .position(|(c, _)| matches!(c, WhereClause::Pattern(q) if q == p)) - { - let c = planned.remove(i); - planned.insert(0, c); - } + .position(|c| matches!(c, WhereClause::Pattern(q) if q == p)) + }); + let (planned, deferred) = match at { + Some(i) => { + let mut rest = clauses.to_vec(); + let head = rest.remove(i); + let seeded: HashSet = match &head { + WhereClause::Pattern(p) => optimizer::pattern_bound_vars(p).into_iter().collect(), + _ => HashSet::new(), + }; + let (mut planned, deferred) = optimizer::plan_after(rest, &seeded); + planned.insert(0, (head, None)); + (planned, deferred) + } + None => optimizer::plan(clauses.to_vec()), + }; for (c, _) in planned { b.clause(c)?; } @@ -669,7 +681,7 @@ fn rule_plan( let mut deltas = Vec::new(); if !naive { for (i, delta) in own.iter().enumerate() { - let ranges = own + let mut ranges: Vec<(Pattern, Range)> = own .iter() .enumerate() .map(|(j, p)| { @@ -681,6 +693,10 @@ fn rule_plan( (p.clone(), range) }) .collect(); + // The delta's range first: the pattern planned first takes it + // even when an equal invocation comes before it (#694). + let d = ranges.remove(i); + ranges.insert(0, d); deltas.push(run(ranges, Some(delta))?); } } diff --git a/src/query/engine/tests.rs b/src/query/engine/tests.rs index 77f2ba5a2e..9f5d1ce76a 100644 --- a/src/query/engine/tests.rs +++ b/src/query/engine/tests.rs @@ -1856,6 +1856,72 @@ fn rule_queries_read_derived_rows_in_batches() { } } +/// A rule body's delta run joins each later clause on a variable bound +/// before it where one can (#694). Magic sets turn `(reach :n0 ?to)` into +/// `(magic ?from) [?from :next ?mid] (reach ?mid ?to)`; the run from the +/// `reach` delta took `magic` next, sharing nothing with it, and joined +/// every delta row with every magic row. +#[test] +fn rule_delta_runs_join_on_a_bound_variable() { + use super::plan::{JoinKind, Step}; + use crate::query::datalog::parser::parse_datalog_command; + use crate::query::datalog::rules::RuleRegistry; + use crate::query::datalog::types::DatalogCommand; + let mut registry = RuleRegistry::new(); + for rule in [ + "(rule [(reach ?from ?to) [?from :next ?to]])", + "(rule [(reach ?from ?to) [?from :next ?mid] (reach ?mid ?to)])", + ] { + let DatalogCommand::Rule(r) = parse_datalog_command(rule).unwrap() else { + panic!("expected a rule"); + }; + registry.register_rule("reach".to_string(), r).unwrap(); + } + let DatalogCommand::Query(query) = + parse_datalog_command("(query [:find ?to :where (reach :n0 ?to)])").unwrap() + else { + panic!("expected a query"); + }; + let (rewritten, seeds) = + crate::query::datalog::magic_sets::rewrite(&query, ®istry).expect("magic sets apply"); + let attrs: Vec<&str> = seeds.iter().map(|(_, a, _)| a.as_str()).collect(); + let plan = super::plan_rules(&query, &rewritten, &attrs).expect("the engine plans it"); + let mut runs = 0; + for (_, rules) in &plan.strata { + for rule in rules { + for run in &rule.deltas { + runs += 1; + for step in &run.plan.steps { + if let Step::Join(j) = step { + assert!( + !(matches!(j.kind, JoinKind::Hash { .. }) && j.keys.is_empty()), + "a delta run of {} joins as a product", + rule.predicate + ); + } + } + } + } + } + assert!(runs >= 2, "the recursive rules have delta runs"); + + // The answers on a fan-out tree, engine and executor agreeing. + let db = Minigraf::in_memory().unwrap(); + let mut edges = String::new(); + for p in 0..11 { + for c in 0..10 { + edges.push_str(&format!("[:n{p} :next :n{}]", 1 + p * 10 + c)); + } + } + db.execute(&format!("(transact [{edges}])")).unwrap(); + db.execute("(rule [(reach ?from ?to) [?from :next ?to]])") + .unwrap(); + db.execute("(rule [(reach ?from ?to) [?from :next ?mid] (reach ?mid ?to)])") + .unwrap(); + assert_eq!(rows(&db, "(query [:find ?to :where (reach :n0 ?to)])"), 110); + assert_eq!(rows(&db, "(query [:find ?to :where (reach :n1 ?to)])"), 10); +} + // ── #549: query memory accounting ────────────────────────────────────────── /// A checkpointed database of `n` entities, each with integers `:a` and