BUGFIX 4508 mark dependands of live outdated after direct change #5274
+212
−127
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
mhsdesign
commented
Oct 3, 2024
Neos.ContentGraph.DoctrineDbalAdapter/src/DoctrineDbalContentGraphProjection.php
Show resolved
Hide resolved
| @@ -56,11 +55,13 @@ public function findWorkspaceByName(WorkspaceName $workspaceName): ?Workspace | |||
| { | |||
| $workspaceByNameStatement = <<<SQL | |||
| SELECT | |||
There was a problem hiding this comment.
should we deduplicate this logic using a querybuilder?
Comment on lines
60
to
62
| {$this->tableNames->workspace()} ws | ||
| JOIN {$this->tableNames->contentStream()} cs ON cs.id = ws.currentcontentstreamid | ||
| LEFT JOIN {$this->tableNames->contentStream()} scs ON cs.sourceContentStreamId = scs.id |
There was a problem hiding this comment.
so the performance trait is this: we still have the status in the workspace, but we have to calculate it slightly more expensive with these two joins.
I cannot say if this is better performance than having on the write side a similar complex update logic for each event. But as findWorkspaceByName (and implicitly getContentGraph) trigger this query and are also part of the write side for constraint checks we have to carefully evaluate.
....ContentRepository.BehavioralTests/Tests/Behavior/Features/Workspaces/WorkspaceState.feature
Show resolved
Hide resolved
mhsdesign
force-pushed
the
task/add-workspace-contentstream-mapping-to-contentgraph
branch
from
c374314
to
db7861f
Compare
6 tasks
Base automatically changed from
task/add-workspace-contentstream-mapping-to-contentgraph
to
9.0
October 17, 2024 11:11
…known source version
... and refactor status calculation logic. By leveraging `isSatisfiedBy` i found out the `>` comparison was not quite correct. We should use `===`.
mhsdesign
force-pushed
the
bugfix/4508-mark-dependands-of-live-outdated-after-direct-change
branch
from
f928255
to
26e2de7
Compare
bwaidelich
reviewed
Oct 18, 2024
....ContentRepository.BehavioralTests/Tests/Behavior/Features/Workspaces/WorkspaceState.feature
Show resolved
Hide resolved
Comment on lines
151
to
155
| $expectedSourceVersion = ExpectedVersion::fromVersion(Version::fromInteger($row['expectedSourceVersion'])); | ||
|
|
||
| if (!$expectedSourceVersion->isSatisfiedBy($sourceVersion)) { | ||
| $status = WorkspaceStatus::OUTDATED; | ||
| } |
There was a problem hiding this comment.
Mostly a naming thing, but the "expected version" is something for the write side, i.e. I trigger a command and I expect the model to be of a given version.
In this case it is just two versions of content streams.
mhsdesign
commented
Oct 18, 2024
Neos.ContentGraph.DoctrineDbalAdapter/src/ContentRepositoryReadModelAdapter.php
Outdated
Show resolved
Hide resolved
bwaidelich
reviewed
Oct 18, 2024
| @@ -55,11 +57,13 @@ public function findWorkspaceByName(WorkspaceName $workspaceName): ?Workspace | |||
| { | |||
| $workspaceByNameStatement = <<<SQL | |||
| SELECT | |||
| name, baseWorkspaceName, currentContentStreamId, status | |||
| ws.name, ws.baseWorkspaceName, ws.currentContentStreamId, cs.sourceContentStreamVersion as expectedSourceVersion, scs.version as sourceVersion | |||
There was a problem hiding this comment.
As discussed: Maybe we can simplify this to sth like:
Suggested change
| ws.name, ws.baseWorkspaceName, ws.currentContentStreamId, cs.sourceContentStreamVersion as expectedSourceVersion, scs.version as sourceVersion | |
| ws.name, ws.baseWorkspaceName, ws.currentContentStreamId, cs.sourceContentStreamVersion = scs.version as isUpToDate |
…dands-of-live-outdated-after-direct-change
…oid fetching full workspace model with the extra joins in the workspace model it is just easier to just select the current content stream id directly
nezaniel
approved these changes
Oct 23, 2024
Neos.ContentGraph.DoctrineDbalAdapter/src/DoctrineDbalContentGraphProjection.php
Show resolved
Hide resolved
....ContentRepository.BehavioralTests/Tests/Behavior/Features/Workspaces/WorkspaceState.feature
Show resolved
Hide resolved
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.
FIXES: #4508
Upgrade instructions
Review instructions
Checklist
FEATURE|TASK|BUGFIX!!!and have upgrade-instructions