mirror of
https://github.com/salsa-rs/salsa.git
synced 2024-10-24 05:09:52 +00:00
93c30a953d
Switch to a procedural implementation of the `query_group!` macro,
residing in the `components/salsa_macros` subcrate.
Allow the user to override the invoked function via `salsa::invoke(...)`
and the name of the generated query type via `salsa::query_type(...)`.
In all tests, replace the `salsa::query_group! { ... }` invocations with
the new attribute-style `#[salsa::query_group]` macro, and change them
to the new naming scheme for query types (`...Query`).
Update README, examples, and documentation.
78 lines
2.3 KiB
Rust
78 lines
2.3 KiB
Rust
use crate::implementation::{TestContext, TestContextImpl};
|
|
use salsa::Database;
|
|
|
|
#[salsa::query_group]
|
|
pub(crate) trait MemoizedVolatileContext: TestContext {
|
|
// Queries for testing a "volatile" value wrapped by
|
|
// memoization.
|
|
fn memoized2(&self) -> usize;
|
|
fn memoized1(&self) -> usize;
|
|
#[salsa::volatile]
|
|
fn volatile(&self) -> usize;
|
|
}
|
|
|
|
fn memoized2(db: &impl MemoizedVolatileContext) -> usize {
|
|
db.log().add("Memoized2 invoked");
|
|
db.memoized1()
|
|
}
|
|
|
|
fn memoized1(db: &impl MemoizedVolatileContext) -> usize {
|
|
db.log().add("Memoized1 invoked");
|
|
let v = db.volatile();
|
|
v / 2
|
|
}
|
|
|
|
fn volatile(db: &impl MemoizedVolatileContext) -> usize {
|
|
db.log().add("Volatile invoked");
|
|
db.clock().increment()
|
|
}
|
|
|
|
#[test]
|
|
fn volatile_x2() {
|
|
let query = TestContextImpl::default();
|
|
|
|
// Invoking volatile twice doesn't execute twice, because volatile
|
|
// queries are memoized by default.
|
|
query.volatile();
|
|
query.volatile();
|
|
query.assert_log(&["Volatile invoked"]);
|
|
}
|
|
|
|
/// Test that:
|
|
///
|
|
/// - On the first run of R0, we recompute everything.
|
|
/// - On the second run of R1, we recompute nothing.
|
|
/// - On the first run of R1, we recompute Memoized1 but not Memoized2 (since Memoized1 result
|
|
/// did not change).
|
|
/// - On the second run of R1, we recompute nothing.
|
|
/// - On the first run of R2, we recompute everything (since Memoized1 result *did* change).
|
|
#[test]
|
|
fn revalidate() {
|
|
let query = TestContextImpl::default();
|
|
|
|
query.memoized2();
|
|
query.assert_log(&["Memoized2 invoked", "Memoized1 invoked", "Volatile invoked"]);
|
|
|
|
query.memoized2();
|
|
query.assert_log(&[]);
|
|
|
|
// Second generation: volatile will change (to 1) but memoized1
|
|
// will not (still 0, as 1/2 = 0)
|
|
query.salsa_runtime().next_revision();
|
|
query.memoized2();
|
|
query.assert_log(&["Memoized1 invoked", "Volatile invoked"]);
|
|
query.memoized2();
|
|
query.assert_log(&[]);
|
|
|
|
// Third generation: volatile will change (to 2) and memoized1
|
|
// will too (to 1). Therefore, after validating that Memoized1
|
|
// changed, we now invoke Memoized2.
|
|
query.salsa_runtime().next_revision();
|
|
|
|
query.memoized2();
|
|
query.assert_log(&["Memoized1 invoked", "Volatile invoked", "Memoized2 invoked"]);
|
|
|
|
query.memoized2();
|
|
query.assert_log(&[]);
|
|
}
|