Call cycle_fn for every iteration#1021
Merged
MichaReiser merged 4 commits intosalsa-rs:masterfrom Nov 5, 2025
Merged
Conversation
✅ Deploy Preview for salsa-rs canceled.
|
CodSpeed Performance ReportMerging #1021 will not alter performanceComparing Summary
|
MichaReiser
requested review from
carljm and
ibraheemdev
and removed request for
ibraheemdev
MichaReiser
force-pushed
the
always-call-cycle-fn
branch
from
e05d3ce to
61bdac4
Compare
MichaReiser
force-pushed
the
always-call-cycle-fn
branch
from
d4d155c to
e266736
Compare
MichaReiser
force-pushed
the
always-call-cycle-fn
branch
from
e266736 to
86aa28f
Compare
Contributor
Author
|
I'd appreciate a thumbs up from @mtshiba on this change before merging, considering that it's a breaking change. I, unfortunately, can't request review from you |
ibraheemdev
approved these changes
Nov 4, 2025
Contributor
|
LGTM! |
Merged
mtshiba
added a commit
to mtshiba/ruff
that referenced
this pull request
Nov 5, 2025
mtshiba
added a commit
to mtshiba/salsa
that referenced
this pull request
Nov 11, 2025
There was actually no need to run `recover_from_cycle` if the query is converged
github-merge-queue bot
pushed a commit
that referenced
this pull request
Nov 21, 2025
* pass `CycleHeads` to the cycle recovery function * remove the second parameter `Id` of `cycle_fn` * Update cycle.rs * Revert "Update cycle.rs" This reverts commit cc35b82. * partially revert changes in #1021 There was actually no need to run `recover_from_cycle` if the query is converged * Expose `Cycle` instead of `CycleHeads` * add `Cycle::map` * Separate `previous_value` from `Cycle` This is more ergonomic when sharing `Cycle` * `Cycle` should be passed by ref * add `Cycle::id` * Update execute.rs * Update memo.rs * defer `head_ids` creation * Revert "defer `head_ids` creation" This reverts commit 23b4ba7. * make all `Cycle` fields private and provide public accessor methods
This was referenced Dec 16, 2025
Merged
Merged
Merged
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This PR changes when salsa calls
cycle_fn.Before: Salsa only called
cycle_fnwhen the last provisional and current value were different (this cycle head hasn't converged)Now: Salsa will call
cycle_fnfor every iterationThis feels more consistent for a cycle with nested cycles because, before, a query could have converged but kept being executed
because one of the other heads in this cycle hasn't converged yet.
Always calling the
cycle_fnalso has the benefit that users can use it to finalize the query result.This also makes
CycleRecoveryActionredundant because there's no real difference betweenIterateandFallback. That's why this PR changes thecycle_fnsignature to take an ownedvalueand returnSelf::Output.