Skip to content
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

Jump to bottom

cache mimetype mappings in local cache #30972

Closed
wants to merge 1 commit into from
Closed

cache mimetype mappings in local cache #30972

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
18 changes: 17 additions & 1 deletion lib/private/Files/Type/Loader.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@
namespace OC\Files\Type;

use OCP\Files\IMimeTypeLoader;
use OCP\ICache;
use OCP\ICacheFactory;
use OCP\IDBConnection;

/**
Expand All @@ -43,13 +45,17 @@ class Loader implements IMimeTypeLoader {
/** @var array [mimetype => id] */
protected $mimetypeIds;

/** @var ICache */
private $cache;

/**
* @param IDBConnection $dbConnection
*/
public function __construct(IDBConnection $dbConnection) {
public function __construct(IDBConnection $dbConnection, ICacheFactory $cacheFactory) {
$this->dbConnection = $dbConnection;
$this->mimetypes = [];
$this->mimetypeIds = [];
$this->cache = $cacheFactory->createLocal('mimetype::');
}

/**
Expand Down Expand Up @@ -140,6 +146,13 @@ protected function store($mimetype) {
* Load all mimetypes from DB
*/
private function loadMimetypes() {
$cachedTypes = $this->cache->get('mimetypes');
$cachedIds = $this->cache->get('mimeids');
if ($cachedTypes && $cachedIds) {
$this->mimetypes = json_decode($cachedTypes, true);
$this->mimetypeIds = json_decode($cachedIds, true);
return;
}
$qb = $this->dbConnection->getQueryBuilder();
$qb->select('id', 'mimetype')
->from('mimetypes');
Expand All @@ -152,6 +165,9 @@ private function loadMimetypes() {
$this->mimetypes[$row['id']] = $row['mimetype'];
$this->mimetypeIds[$row['mimetype']] = $row['id'];
}

$this->cache->set('mimetypes', json_encode($this->mimetypes));
$this->cache->set('mimeids', json_encode($this->mimetypeIds));
Comment on lines +169 to +170
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since it has no TTL, we need to document that people need to clear the cache when they add a new mimetype manually?
E.g. in

server/lib/private/Repair/RepairMimeTypes.php

Line 42 in 0d2e05a

class RepairMimeTypes implements IRepairStep {

}

/**
Expand Down