BUGFIX: Asset usage prevent orphaned asset usage entries in case of a rebase with conflicts #5406
+57
−1
Conversation
This file contains 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
dlubitz
reviewed
Dec 19, 2024
Neos.Neos/Classes/AssetUsage/CatchUpHook/AssetUsageCatchUpHook.php
Outdated
Show resolved
Hide resolved
....ContentRepository.Core/Classes/Feature/WorkspacePublication/Event/WorkspaceWasPublished.php
Outdated
Show resolved
Hide resolved
mhsdesign
commented
Dec 20, 2024
Neos.ContentRepository.Core/Classes/Feature/WorkspaceRebase/Event/WorkspaceWasRebased.php
Outdated
Show resolved
Hide resolved
… rebase with conflicts
…equence numbers in force-rebase event Storing the skipped sequence numbers should ease debugging rather than having 'just' a boolean indicator. The public api does not need to know about that thus the getter.
mhsdesign
force-pushed
the
bugfix/orphaned-asset-usage-entries
branch
from
8d5bc2c to
19cb5c2
Compare
dlubitz
approved these changes
Jan 9, 2025
|
@mhsdesign Can we merge this? |
kitsunet
approved these changes
Jan 27, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Some projections / catchup hooks attempt to optimise to make
WorkspaceWasRebaseda no-op under the idea that all changes in the user workspace are still existent as known previously.This is mostly true except for the case of a force rebase. Here changes in the user workspace might be discarded. To signal that to the consumer instead of a new even we introduce
WorkspaceWasRebased::hasSkippedEvents().The asset usage was adjusted to flush all entries on force rebase so the state is rebuild from scratch without any orphaned entries that would only be deleted on a discard at some point.
Upgrade instructions
Review instructions
Checklist
FEATURE|TASK|BUGFIX!!!and have upgrade-instructions