Skip to content

Commit 3a7e731

Browse files
committed
Remove provisional fallback
1 parent 9ab3486 commit 3a7e731

File tree

2 files changed

+2
-23
lines changed

2 files changed

+2
-23
lines changed

src/function/execute.rs

Lines changed: 1 addition & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -148,28 +148,7 @@ where
148148
// initial provisional value from there.
149149
let memo = self
150150
.get_memo_from_table_for(zalsa, id, memo_ingredient_index)
151-
.map(|memo| {
152-
if memo.may_be_provisional() {
153-
memo
154-
} else {
155-
// It's possible that we don't have a provisional value if we hit the cycle
156-
// in `maybe_changed_after`. There, we only return Changed/Unchanged but never insert
157-
// a memo.
158-
let revisions =
159-
QueryRevisions::fixpoint_initial(database_key_index);
160-
let initial_value = C::cycle_initial(db, C::id_to_input(zalsa, id));
161-
self.insert_memo(
162-
zalsa,
163-
id,
164-
Memo::new(
165-
Some(initial_value),
166-
zalsa.current_revision(),
167-
revisions,
168-
),
169-
memo_ingredient_index,
170-
)
171-
}
172-
})
151+
.filter(|memo| memo.verified_at.load() == zalsa.current_revision())
173152
.unwrap_or_else(|| {
174153
unreachable!(
175154
"{database_key_index:#?} is a cycle head, \

src/function/maybe_changed_after.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,6 @@ where
180180
return Some(VerifyResult::unchanged());
181181
}
182182

183-
// Check if the inputs are still valid. We can just compare `changed_at`.
184183
let deep_verify = self.deep_verify_memo(
185184
db,
186185
zalsa,
@@ -191,6 +190,7 @@ where
191190
);
192191

193192
if deep_verify.is_unchanged() {
193+
// Check if the inputs are still valid. We can just compare `changed_at`.
194194
return Some(if old_memo.revisions.changed_at > revision {
195195
VerifyResult::changed()
196196
} else {

0 commit comments

Comments
 (0)