Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump revision in db.synthetic_write #534

Merged
merged 1 commit into from
Jul 27, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion src/database.rs
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,9 @@ pub trait Database: DatabaseGen {
/// will block until that snapshot is dropped -- if that snapshot
/// is owned by the current thread, this could trigger deadlock.
fn synthetic_write(&mut self, durability: Durability) {
self.runtime_mut().report_tracked_write(durability);
let runtime = self.runtime_mut();
runtime.new_revision();
runtime.report_tracked_write(durability);
}

/// Reports that the query depends on some state unknown to salsa.
Expand Down
73 changes: 73 additions & 0 deletions tests/synthetic_write.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
//! Test that a constant `tracked` fn (has no inputs)
//! compiles and executes successfully.
#![allow(warnings)]

mod common;

use common::{HasLogger, Logger};
use expect_test::expect;
use salsa::{Database as _, Durability, Event, EventKind};

#[salsa::db]
trait Db: salsa::Database + HasLogger {}

#[salsa::input]
struct MyInput {
field: u32,
}

#[salsa::tracked]
fn tracked_fn(db: &dyn Db, input: MyInput) -> u32 {
input.field(db) * 2
}

#[salsa::db]
#[derive(Default)]
struct Database {
storage: salsa::Storage<Self>,
logger: Logger,
}

#[salsa::db]
impl salsa::Database for Database {
fn salsa_event(&self, event: Event) {
if let EventKind::WillExecute { .. } | EventKind::DidValidateMemoizedValue { .. } =
event.kind
{
self.push_log(format!("{:?}", event.kind));
}
}
}

impl HasLogger for Database {
fn logger(&self) -> &Logger {
&self.logger
}
}

#[salsa::db]
impl Db for Database {}

#[test]
fn execute() {
let mut db = Database::default();

let input = MyInput::new(&db, 22);
assert_eq!(tracked_fn(&db, input), 44);

db.assert_logs(expect![[r#"
[
"WillExecute { database_key: tracked_fn(0) }",
]"#]]);

// Bumps the revision
db.synthetic_write(Durability::LOW);

// Query should re-run
assert_eq!(tracked_fn(&db, input), 44);

db.assert_logs(expect![[r#"
[
"DidValidateMemoizedValue { database_key: tracked_fn(0) }",
]"#]]);
}
Loading