Merged
Conversation
d7288c2 to
8705ddc
Compare
| $versionEntity->getTimestamp(), | ||
| $versionEntity->getTimestamp(), | ||
| $version = new Version( | ||
| $versions['db']->getTimestamp(), |
Check notice
Code scanning / Psalm
PossiblyNullReference
| $versionEntity->getSize(), | ||
| $this->mimeTypeLoader->getMimetypeById($versionEntity->getMimetype()), | ||
| $versions['db']->getSize(), | ||
| $this->mimeTypeLoader->getMimetypeById($versions['db']->getMimetype()), |
Check notice
Code scanning / Psalm
PossiblyNullArgument
cfebdee to
e2b7774
Compare
e2b7774 to
866b56c
Compare
| 'mimetype' => $file->getMimetype(), | ||
| ]; | ||
|
|
||
| $versionsInDB = $this->versionsMapper->findAllVersionsForFileId($file->getId()); |
Check notice
Code scanning / Psalm
PossiblyNullArgument
Signed-off-by: Louis Chemineau <[email protected]>
866b56c to
8705727
Compare
come-nc
approved these changes
Mar 4, 2024
skjnldsv
approved these changes
Mar 4, 2024
Contributor
Author
|
/backport to stable28 |
Contributor
Author
|
/backport to stable27 |
|
The backport to # Switch to the target branch and update it
git checkout stable28
git pull origin stable28
# Create the new backport branch
git checkout -b backport/43898/stable28
# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts, resolve them
git cherry-pick 87057278
# Push the cherry pick commit to the remote repository and open a pull request
git push origin backport/43898/stable28Error: Failed to push branch backport/43898/stable28: fatal: could not read Username for 'https://github.com': No such device or address Learn more about backports at https://docs.nextcloud.com/server/stable/go.php?to=developer-backports. |
Contributor
Author
|
/backport to stable28 |
Merged
|
/backport to stable26 |
1 similar comment
Contributor
Author
|
/backport to stable26 |
2 tasks
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.
In too many cases, the list of version in the DB failed to match the list of version in the FS.
This PR changes the listing approach
from: "return DB listing unless it is empty, if it is empty, then populate DB based on FS and return DB listing"
to: "return a merge of DB and FS listing, while doing the merge, prune DB entries if no counterpart FS entries exist, and create DB entries if it is missing".
This trades a bit of performance, against DB integrity, code simplification, and reliability.
Possible followups: