upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-15 19:49:38 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 53

Merge pull request #31776 from nextcloud/storage-id-cache-bi-directional

Browse source 
cache storage id mapping both ways
This commit is contained in:
Robin Appelman 2022-04-04 14:50:23 +00:00 committed by GitHub
commit cc5e26bb14
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 32 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
lib/private/Files/Cache/Storage.php
View file

@ -126,19 +126,9 @@ class Storage {
* @param int $numericId
* @return string|null either the storage id string or null if the numeric id is not known
*/
public static function getStorageId($numericId) {
$query = \OC::$server->getDatabaseConnection()->getQueryBuilder();
$query->select('id')
->from('storages')
->where($query->expr()->eq('numeric_id', $query->createNamedParameter($numericId)));
$result = $query->execute();
$row = $result->fetch();
$result->closeCursor();
if ($row) {
return $row['id'];
} else {
return null;
}
public static function getStorageId(int $numericId): ?string {
$storage = self::getGlobalCache()->getStorageInfoByNumericId($numericId);
return $storage['id'] ?? null;
}
/**

32
lib/private/Files/Cache/StorageGlobal.php
View file

@ -41,8 +41,10 @@ class StorageGlobal {
/** @var IDBConnection */
private $connection;
/** @var array[] */
/** @var array<string, array> */
private $cache = [];
/** @var array<int, array> */
private $numericIdCache = [];
public function __construct(IDBConnection $connection) {
$this->connection = $connection;
@ -68,7 +70,7 @@ class StorageGlobal {
* @param string $storageId
* @return array|null
*/
public function getStorageInfo($storageId) {
public function getStorageInfo(string $storageId): ?array {
if (!isset($this->cache[$storageId])) {
$builder = $this->connection->getQueryBuilder();
$query = $builder->select(['id', 'numeric_id', 'available', 'last_checked'])
@ -81,9 +83,33 @@ class StorageGlobal {
if ($row) {
$this->cache[$storageId] = $row;
$this->numericIdCache[(int)$row['numeric_id']] = $row;
}
}
return isset($this->cache[$storageId]) ? $this->cache[$storageId] : null;
return $this->cache[$storageId] ?? null;
}
/**
* @param int $numericId
* @return array|null
*/
public function getStorageInfoByNumericId(int $numericId): ?array {
if (!isset($this->numericIdCache[$numericId])) {
$builder = $this->connection->getQueryBuilder();
$query = $builder->select(['id', 'numeric_id', 'available', 'last_checked'])
->from('storages')
->where($builder->expr()->eq('numeric_id', $builder->createNamedParameter($numericId)));
$result = $query->execute();
$row = $result->fetch();
$result->closeCursor();
if ($row) {
$this->numericIdCache[$numericId] = $row;
$this->cache[$row['id']] = $row;
}
}
return $this->numericIdCache[$numericId] ?? null;
}
public function clearCache() {