mirrors/salsa
1
0
Fork 0
mirror of https://github.com/salsa-rs/salsa.git synced 2024-10-24 13:13:03 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

store an Option to fix tests

Browse source
This commit is contained in:
Niko Matsakis 2022-06-03 06:24:00 -04:00
parent 26e099eb12
commit 1cc649b5e4
1 changed files with 32 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
src/input.rs
View file

@ -33,7 +33,15 @@ where
{ {
key: Q::Key, key: Q::Key,
database_key_index: DatabaseKeyIndex, database_key_index: DatabaseKeyIndex,
stamped_value: RwLock<StampedValue<Q::Value>>,
/// Value for this input: initially, it is `Some`.
///
/// If it is `None`, then the value was removed
/// using `remove_input`.
///
/// Note that the slot is *never* removed, so as to preserve
/// the `DatabaseKeyIndex` values.
stamped_value: RwLock<StampedValue<Option<Q::Value>>>,
} }
impl<Q> std::panic::RefUnwindSafe for InputStorage<Q> impl<Q> std::panic::RefUnwindSafe for InputStorage<Q>
@ -98,14 +106,22 @@ where
changed_at, changed_at,
} = slot.stamped_value.read().clone(); } = slot.stamped_value.read().clone();
db.salsa_runtime() match value {
.report_query_read_and_unwind_if_cycle_resulted( Some(value) => {
slot.database_key_index, db.salsa_runtime()
durability, .report_query_read_and_unwind_if_cycle_resulted(
changed_at, slot.database_key_index,
); durability,
changed_at,
);
value value
}
None => {
panic!("value removed for {:?}({:?})", Q::default(), key)
}
}
} }
fn durability(&self, _db: &<Q as QueryDb<'_>>::DynDb, key: &Q::Key) -> Durability { fn durability(&self, _db: &<Q as QueryDb<'_>>::DynDb, key: &Q::Key) -> Durability {
@ -123,12 +139,7 @@ where
let slots = self.slots.read(); let slots = self.slots.read();
slots slots
.values() .values()
.map(|slot| { .map(|slot| TableEntry::new(slot.key.clone(), slot.stamped_value.read().value.clone()))
TableEntry::new(
slot.key.clone(),
Some(slot.stamped_value.read().value.clone()),
)
})
.collect() .collect()
} }
} }
@ -196,7 +207,7 @@ where
// (Otherwise, someone else might write a *newer* revision // (Otherwise, someone else might write a *newer* revision
// into the same cell while we block on the lock.) // into the same cell while we block on the lock.)
let stamped_value = StampedValue { let stamped_value = StampedValue {
value: value, value: Some(value),
durability, durability,
changed_at: next_revision, changed_at: next_revision,
}; };
@ -229,11 +240,12 @@ where
fn remove(&self, runtime: &mut Runtime, key: &<Q as Query>::Key) -> <Q as Query>::Value { fn remove(&self, runtime: &mut Runtime, key: &<Q as Query>::Key) -> <Q as Query>::Value {
let mut value = None; let mut value = None;
runtime.with_incremented_revision(&mut |_| { runtime.with_incremented_revision(&mut |r| {
let mut slots = self.slots.write(); let slots = self.slots.write();
let slot = slots.remove(key)?; let slot = slots.get(key)?;
let slot_stamped_value = slot.stamped_value.into_inner(); let mut slot_stamped_value = slot.stamped_value.write();
value = Some(slot_stamped_value.value); value = slot_stamped_value.value.take();
slot_stamped_value.changed_at = r;
Some(slot_stamped_value.durability) Some(slot_stamped_value.durability)
}); });