Skip to content

fix: chunk storage ids when preload storage info #59902

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
Altahrim merged 2 commits into from
May 4, 2026
+17 −14
Merged

fix: chunk storage ids when preload storage info #59902

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6a316b2
fix: chunk storage ids when preload storage info
icewind1991 Apr 24, 2026
5c1a72a
chore: psalm fixes
icewind1991 May 1, 2026
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
1 change: 1 addition & 0 deletions apps/dav/lib/Migration/Version1039Date20260408000000.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
#[AddColumn(table: 'calendars', name: 'default_alarm_pday', type: ColumnType::INTEGER)]
#[AddColumn(table: 'calendars', name: 'default_alarm_fday', type: ColumnType::INTEGER)]
class Version1039Date20260408000000 extends SimpleMigrationStep {
#[\Override]
public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper {
/** @var ISchemaWrapper $schema */
$schema = $schemaClosure();
Expand Down
30 changes: 16 additions & 14 deletions lib/private/Files/Cache/StorageGlobal.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,21 +42,23 @@ public function loadForStorageIds(array $storageIds): void {
$builder = $this->connection->getQueryBuilder();
$query = $builder->select(['id', 'numeric_id', 'available', 'last_checked'])
->from('storages')
->where($builder->expr()->in('id', $builder->createNamedParameter(array_values($storageIds), IQueryBuilder::PARAM_STR_ARRAY)));

$result = $query->executeQuery();
while (($row = $result->fetch()) !== false) {
$normalizedRow = [
'id' => (string)$row['id'],
'numeric_id' => (int)$row['numeric_id'],
'available' => (bool)$row['available'],
'last_checked' => (int)$row['last_checked'],
];

$this->cache[$normalizedRow['id']] = $normalizedRow;
}
->where($builder->expr()->in('id', $builder->createParameter('ids'), IQueryBuilder::PARAM_STR_ARRAY));

foreach (array_chunk($storageIds, 1000) as $chunk) {
$query->setParameter('ids', $chunk, IQueryBuilder::PARAM_STR_ARRAY);

$result->closeCursor();
$result = $query->executeQuery();
while (($row = $result->fetch()) !== false) {
$normalizedRow = [
'id' => (string)$row['id'],
'numeric_id' => (int)$row['numeric_id'],
'available' => (bool)$row['available'],
'last_checked' => (int)$row['last_checked'],
];

$this->cache[$normalizedRow['id']] = $normalizedRow;
}
}
}

/**
Expand Down
Loading