Skip to content

Only use provisional values from the same revision #1019

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Oct 29, 2025
Merged

Only use provisional values from the same revision #1019

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
32 changes: 15 additions & 17 deletions src/function/fetch.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,26 +195,24 @@ where
// existing provisional memo if it exists
let memo_guard = self.get_memo_from_table_for(zalsa, id, memo_ingredient_index);
if let Some(memo) = memo_guard {
if memo.value.is_some() && memo.revisions.cycle_heads().contains(&database_key_index) {
let can_shallow_update = self.shallow_verify_memo(zalsa, database_key_index, memo);
if can_shallow_update.yes() {
self.update_shallow(zalsa, database_key_index, memo, can_shallow_update);

if C::CYCLE_STRATEGY == CycleRecoveryStrategy::Fixpoint {
memo.revisions
.cycle_heads()
.remove_all_except(database_key_index);
}
if memo.verified_at.load() == zalsa.current_revision()
&& memo.value.is_some()
&& memo.revisions.cycle_heads().contains(&database_key_index)
{
if C::CYCLE_STRATEGY == CycleRecoveryStrategy::Fixpoint {
memo.revisions
.cycle_heads()
.remove_all_except(database_key_index);
}

crate::tracing::debug!(
"hit cycle at {database_key_index:#?}, \
crate::tracing::debug!(
"hit cycle at {database_key_index:#?}, \
returning last provisional value: {:#?}",
memo.revisions
);
memo.revisions
);

// SAFETY: memo is present in memo_map.
return unsafe { self.extend_memo_lifetime(memo) };
}
// SAFETY: memo is present in memo_map.
return unsafe { self.extend_memo_lifetime(memo) };
}
}

Expand Down