Skip to content

fix: Correctly filter out current version from expiration #4243

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
come-nc merged 1 commit into from
Jan 6, 2026
+14 −8
Merged

fix: Correctly filter out current version from expiration #4243

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 14 additions & 8 deletions lib/Versions/ExpireManager.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ public function __construct(
/**
* Get list of files we want to expire
*
* @param IVersion[] $versions
* @return IVersion[]
* @param GroupVersion[] $versions
* @return GroupVersion[]
*/
protected function getAutoExpireList(int $time, array $versions): array {
if (!$versions) {
Expand All @@ -49,14 +49,20 @@ protected function getAutoExpireList(int $time, array $versions): array {

$toDelete = []; // versions we want to delete

// ensure the versions are sorted newest first
usort($versions, fn (IVersion $a, IVersion $b): int => $b->getTimestamp() <=> $a->getTimestamp());
// Ensure the versions are sorted current first, then newest first
usort($versions, function (GroupVersion $a, GroupVersion $b): int {
if ($a->isCurrentVersion()) {
return 1;
} elseif ($b->isCurrentVersion()) {
return -1;
}
return $b->getTimestamp() <=> $a->getTimestamp();
});

$interval = 1;
$step = self::MAX_VERSIONS_PER_INTERVAL[$interval]['step'];
$nextInterval = $time - self::MAX_VERSIONS_PER_INTERVAL[$interval]['intervalEndsAfter'];

/** @var IVersion $firstVersion */
$firstVersion = array_shift($versions);
$prevTimestamp = $firstVersion->getTimestamp();
$nextVersion = $firstVersion->getTimestamp() - $step;
Expand All @@ -67,7 +73,7 @@ protected function getAutoExpireList(int $time, array $versions): array {
if ($nextInterval === -1 || $prevTimestamp > $nextInterval) {
if ($version->getTimestamp() > $nextVersion) {
// Do not expire versions with a label.
if (!($version instanceof IMetadataVersion) || $version->getMetadataValue('label') === null || $version->getMetadataValue('label') === '') {
if ((!($version instanceof IMetadataVersion) || $version->getMetadataValue('label') === null || $version->getMetadataValue('label') === '') && !$version->isCurrentVersion()) {
//distance between two version too small, mark to delete
$toDelete[] = $version;
}
Expand Down Expand Up @@ -110,9 +116,9 @@ public function getExpiredVersion(array $versions, int $time, bool $quotaExceede
$versionsLeft = array_udiff($versions, $autoExpire, fn (IVersion $a, IVersion $b): int => ($a->getRevisionId() <=> $b->getRevisionId())
* ($a->getSourceFile()->getId() <=> $b->getSourceFile()->getId()));

$expired = array_filter($versionsLeft, function (IVersion $version) use ($quotaExceeded): bool {
$expired = array_filter($versionsLeft, function (GroupVersion $version) use ($quotaExceeded): bool {
// Do not expire current version.
if ($version->getTimestamp() === $version->getSourceFile()->getMtime()) {
if ($version->isCurrentVersion()) {
return false;
}

Expand Down
Loading