hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-18 07:23:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

reduce fetchAndSave complexity

Browse Source
This commit is contained in:
Benoît Burnichon
2016-04-14 15:09:20 +02:00
parent 753ab55992
commit 6801b8a5fa
1 changed files with 36 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
lib/Alchemy/Phrasea/Databox/Subdef/CachedMediaSubdefDataRepository.php
View File

@@ -181,21 +181,11 @@ class CachedMediaSubdefDataRepository implements MediaSubdefDataRepository
{ {
$retrieved = $this->decorated->findByRecordIdsAndNames($recordIds, $names); $retrieved = $this->decorated->findByRecordIdsAndNames($recordIds, $names);
if (null === $names) { $data = $this->normalizeRetrievedData($retrieved, $keys);
$extra = array_fill_keys($this->generateAllCacheKeys($recordIds), []);
foreach ($retrieved as $item) { $toCache = null === $names ? $this->appendCacheExtraData($data, $retrieved, $recordIds) : $data;
$extra[$this->getCacheKey($item['record_id'])][] = $this->getCacheKey($item['record_id'], $item['name']);
}
}
$data = array_fill_keys($keys, null); $this->cache->saveMultiple($toCache, $this->lifeTime);
foreach ($retrieved as $item) {
$data[$this->dataToKey($item)] = $item;
}
$this->cache->saveMultiple(isset($extra) ? array_merge($data, $extra) : $data, $this->lifeTime);
return $this->filterNonNull($data); return $this->filterNonNull($data);
} }
@@ -218,4 +208,37 @@ class CachedMediaSubdefDataRepository implements MediaSubdefDataRepository
return count($keys) === count($data) ? call_user_func_array('array_merge', $data) : []; return count($keys) === count($data) ? call_user_func_array('array_merge', $data) : [];
} }
/**
* @param array $retrieved
* @param array $keys
* @return array
*/
private function normalizeRetrievedData(array $retrieved, array $keys)
{
$data = array_fill_keys($keys, null);
foreach ($retrieved as $item) {
$data[$this->dataToKey($item)] = $item;
}
return $data;
}
/**
* @param array $data
* @param array $retrieved
* @param array $recordIds
* @return array
*/
private function appendCacheExtraData(array $data, array $retrieved, array $recordIds)
{
$extra = array_fill_keys($this->generateAllCacheKeys($recordIds), []);
foreach ($retrieved as $item) {
$extra[$this->getCacheKey($item['record_id'])][] = $this->getCacheKey($item['record_id'], $item['name']);
}
return array_merge($data, $extra);
}
} }