From 2a9f0f71402579a76cec01ed0aac80f4d34d2bf1 Mon Sep 17 00:00:00 2001 From: Niko Matsakis Date: Mon, 15 Aug 2022 13:38:30 +0300 Subject: [PATCH] add accumulation test I can't seem to get it to perform incorrectly lol, what am I missing. --- .../tests/accumulate-and-reuse.rs | 180 ++++++++++++++++++ 1 file changed, 180 insertions(+) create mode 100644 salsa-2022-tests/tests/accumulate-and-reuse.rs diff --git a/salsa-2022-tests/tests/accumulate-and-reuse.rs b/salsa-2022-tests/tests/accumulate-and-reuse.rs new file mode 100644 index 00000000..3eb4171f --- /dev/null +++ b/salsa-2022-tests/tests/accumulate-and-reuse.rs @@ -0,0 +1,180 @@ +//! Basic deletion test: +//! +//! * entities not created in a revision are deleted, as is any memoized data keyed on them. + +use salsa::DebugWithDb; +use salsa_2022_tests::{HasLogger, Logger}; + +use expect_test::expect; +use test_log::test; + +#[salsa::jar(db = Db)] +struct Jar(MyInput, Logs, push_logs, push_a_logs, push_b_logs); + +trait Db: salsa::DbWithJar + HasLogger {} + +#[salsa::input] +struct MyInput { + field_a: u32, + field_b: u32, +} + +#[salsa::accumulator] +struct Logs(String); + +#[salsa::tracked] +#[allow(dead_code)] +fn push_logs(db: &dyn Db, input: MyInput) { + db.push_log(format!( + "push_logs(a = {}, b = {})", + input.field_a(db), + input.field_b(db) + )); + + // We don't invoke `push_a_logs` (or `push_b_logs`) with a value of 1 or less. + // This allows us to test what happens a change in inputs causes a function not to be called at all. + if input.field_a(db) > 1 { + push_a_logs(db, input); + } + + if input.field_b(db) > 1 { + push_b_logs(db, input); + } +} + +#[salsa::tracked] +fn push_a_logs(db: &dyn Db, input: MyInput) { + let field_a = input.field_a(db); + db.push_log(format!("push_a_logs({})", field_a)); + + for i in 0..field_a { + Logs::push(db, format!("log_a({} of {})", i, field_a)); + } +} + +#[salsa::tracked] +fn push_b_logs(db: &dyn Db, input: MyInput) { + let field_a = input.field_b(db); + db.push_log(format!("push_b_logs({})", field_a)); + + for i in 0..field_a { + Logs::push(db, format!("log_b({} of {})", i, field_a)); + } +} + +#[salsa::db(Jar)] +#[derive(Default)] +struct Database { + storage: salsa::Storage, + logger: Logger, +} + +impl salsa::Database for Database { + fn salsa_event(&self, event: salsa::Event) {} + + fn salsa_runtime(&self) -> &salsa::Runtime { + self.storage.runtime() + } +} + +impl Db for Database {} + +impl HasLogger for Database { + fn logger(&self) -> &Logger { + &self.logger + } +} + +#[test] +fn accumulate_once() { + let mut db = Database::default(); + + // Just call accumulate on a base input to see what happens. + let input = MyInput::new(&mut db, 2, 3); + let logs = push_logs::accumulated::(&db, input); + expect![[r#" + [ + "log_b(0 of 3)", + "log_b(1 of 3)", + "log_b(2 of 3)", + "log_a(0 of 2)", + "log_a(1 of 2)", + ]"#]] + .assert_eq(&format!("{:#?}", logs)); + db.assert_logs(expect![[r#" + [ + "push_logs(a = 2, b = 3)", + "push_a_logs(2)", + "push_b_logs(3)", + ]"#]]) +} + +#[test] +fn change_a_and_reaccumulate() { + let mut db = Database::default(); + + // Accumulate logs for `a = 2` and `b = 3` + let input = MyInput::new(&mut db, 2, 3); + let logs = push_logs::accumulated::(&db, input); + expect![[r#" + [ + "log_b(0 of 3)", + "log_b(1 of 3)", + "log_b(2 of 3)", + "log_a(0 of 2)", + "log_a(1 of 2)", + ]"#]] + .assert_eq(&format!("{:#?}", logs)); + db.assert_logs(expect![[r#" + [ + "push_logs(a = 2, b = 3)", + "push_a_logs(2)", + "push_b_logs(3)", + ]"#]]); + + // Change to `a = 1`, which means `push_logs` does not call `push_a_logs` at all + input.set_field_a(&mut db, 1); + let logs = push_logs::accumulated::(&db, input); + expect![[r#" + [ + "log_b(0 of 3)", + "log_b(1 of 3)", + "log_b(2 of 3)", + ]"#]] + .assert_eq(&format!("{:#?}", logs)); + db.assert_logs(expect![[r#" + [ + "push_logs(a = 1, b = 3)", + ]"#]]); +} + +#[test] +fn get_a_logs_after_changing_b() { + let mut db = Database::default(); + + // Invoke `push_a_logs` with `a = 2` and `b = 3` (but `b` doesn't matter) + let input = MyInput::new(&mut db, 2, 3); + let logs = push_a_logs::accumulated::(&db, input); + expect![[r#" + [ + "log_a(0 of 2)", + "log_a(1 of 2)", + ]"#]] + .assert_eq(&format!("{:#?}", logs)); + db.assert_logs(expect![[r#" + [ + "push_a_logs(2)", + ]"#]]); + + // Changing `b` does not cause `push_a_logs` to re-execute + // and we still get the same result + input.set_field_b(&mut db, 5); + let logs = push_a_logs::accumulated::(&db, input); + expect![[r#" + [ + "log_a(0 of 2)", + "log_a(1 of 2)", + ]"#]] + .assert_eq(&format!("{:#?}", logs)); + db.assert_logs(expect!["[]"]); +}