mirrors/salsa
1
0
Fork 0
mirror of https://github.com/salsa-rs/salsa.git synced 2025-01-23 05:07:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

update diff output

Browse source
This commit is contained in:
XFFXFF 2022-09-23 23:58:53 +00:00
parent 961c4ce154
commit d71892c047
1 changed files with 12 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
components/salsa-2022/src/function/diff_outputs.rs
View file

@ -1,6 +1,6 @@
use crate::{ use crate::{
key::DependencyIndex, runtime::local_state::QueryRevisions, storage::HasJarsDyn, Database, hash::FxHashSet, key::DependencyIndex, runtime::local_state::QueryRevisions,
DatabaseKeyIndex, Event, EventKind, storage::HasJarsDyn, Database, DatabaseKeyIndex, Event, EventKind,
}; };
use super::{memo::Memo, Configuration, DynDb, FunctionIngredient}; use super::{memo::Memo, Configuration, DynDb, FunctionIngredient};
@ -18,25 +18,17 @@ where
old_memo: &Memo<C::Value>, old_memo: &Memo<C::Value>,
revisions: &QueryRevisions, revisions: &QueryRevisions,
) { ) {
let mut old_outputs = old_memo.revisions.origin.outputs().peekable(); // Iterate over the outputs of the `old_memo` and put them into a hashset
let mut new_outputs = revisions.origin.outputs().peekable(); let mut old_outputs = FxHashSet::default();
old_memo.revisions.origin.outputs().for_each(|i| {
old_outputs.insert(i);
});
// two list are in sorted order, we can merge them in linear time. // Iterate over the outputs of the current query
while let (Some(&old_output), Some(&new_output)) = (old_outputs.peek(), new_outputs.peek()) // and remove elements from `old_outputs` when we find them
{ for new_output in revisions.origin.outputs() {
#[allow(clippy::comparison_chain)] if old_outputs.contains(&new_output) {
if old_output < new_output { old_outputs.remove(&new_output);
// Output that was generated but is no longer.
Self::report_stale_output(db, key, old_output);
old_outputs.next();
} else if new_output < old_output {
// This is a new output that was not generated before.
// No action needed.
new_outputs.next();
} else {
// Output generated both times.
old_outputs.next();
new_outputs.next();
} }
} }