mirrors/salsa
1
0
Fork 0
mirror of https://github.com/salsa-rs/salsa.git synced 2025-01-12 16:35:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #144 from matklad/gc-all-the-things

Browse source 
just clear the table if we are goining to collect everything
This commit is contained in:
Niko Matsakis 2019-01-29 15:17:27 -05:00 committed by GitHub
commit fc60346e23
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/derived.rs
View file

@ -942,6 +942,15 @@ where
fn sweep(&self, db: &DB, strategy: SweepStrategy) {
let mut map_write = self.map.write();
let revision_now = db.salsa_runtime().current_revision();
match (strategy.discard_if, strategy.discard_what) {
(DiscardIf::Always, DiscardWhat::Everything) => {
debug!("sweep({:?}): clearing the table", Q::default());
map_write.clear();
return;
},
(DiscardIf::Never, _) | (_, DiscardWhat::Nothing) => return,
_ => {}
}
map_write.retain(|key, query_state| {
match query_state {
// Leave stuff that is currently being computed -- the
@ -972,10 +981,10 @@ where
// when we read `revision_now`.
assert!(memo.verified_at <= revision_now);
match strategy.discard_if {
DiscardIf::Never => true,
DiscardIf::Never => unreachable!(),
DiscardIf::Outdated if memo.verified_at == revision_now => true,
DiscardIf::Outdated | DiscardIf::Always => match strategy.discard_what {
DiscardWhat::Nothing => true,
DiscardWhat::Nothing => unreachable!(),
DiscardWhat::Values => {
memo.value = None;
true