Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Issue #3445909 by seanB, smustgrave, alexpott, catch: Add static caching to LayoutTempstoreRepository 

(cherry picked from commit 27c9bcca6f)
merge-requests/8642/head
Dave Long 2024-06-07 23:32:48 +01:00
parent f5ecdb8f72
commit 282aed1317
No known key found for this signature in database
GPG Key ID: ED52AE211E142771
1 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
core/modules/layout_builder/src/LayoutTempstoreRepository.php
View File

@ -16,6 +16,13 @@ class LayoutTempstoreRepository implements LayoutTempstoreRepositoryInterface {
*/ */
protected $tempStoreFactory; protected $tempStoreFactory;
/**
* The static cache of loaded values.
*
* @var \Drupal\layout_builder\SectionStorageInterface[]
*/
protected array $cache = [];
/** /**
* LayoutTempstoreRepository constructor. * LayoutTempstoreRepository constructor.
* *
@ -31,6 +38,12 @@ class LayoutTempstoreRepository implements LayoutTempstoreRepositoryInterface {
*/ */
public function get(SectionStorageInterface $section_storage) { public function get(SectionStorageInterface $section_storage) {
$key = $this->getKey($section_storage); $key = $this->getKey($section_storage);
// Check if the storage is present in the static cache.
if (isset($this->cache[$key])) {
return $this->cache[$key];
}
$tempstore = $this->getTempstore($section_storage)->get($key); $tempstore = $this->getTempstore($section_storage)->get($key);
if (!empty($tempstore['section_storage'])) { if (!empty($tempstore['section_storage'])) {
$storage_type = $section_storage->getStorageType(); $storage_type = $section_storage->getStorageType();
@ -39,6 +52,9 @@ class LayoutTempstoreRepository implements LayoutTempstoreRepositoryInterface {
if (!($section_storage instanceof SectionStorageInterface)) { if (!($section_storage instanceof SectionStorageInterface)) {
throw new \UnexpectedValueException(sprintf('The entry with storage type "%s" and ID "%s" is invalid', $storage_type, $key)); throw new \UnexpectedValueException(sprintf('The entry with storage type "%s" and ID "%s" is invalid', $storage_type, $key));
} }
// Set the storage in the static cache.
$this->cache[$key] = $section_storage;
} }
return $section_storage; return $section_storage;
} }
@ -48,6 +64,12 @@ class LayoutTempstoreRepository implements LayoutTempstoreRepositoryInterface {
*/ */
public function has(SectionStorageInterface $section_storage) { public function has(SectionStorageInterface $section_storage) {
$key = $this->getKey($section_storage); $key = $this->getKey($section_storage);
// Check if the storage is present in the static cache.
if (isset($this->cache[$key])) {
return TRUE;
}
$tempstore = $this->getTempstore($section_storage)->get($key); $tempstore = $this->getTempstore($section_storage)->get($key);
return !empty($tempstore['section_storage']); return !empty($tempstore['section_storage']);
} }
@ -58,6 +80,8 @@ class LayoutTempstoreRepository implements LayoutTempstoreRepositoryInterface {
public function set(SectionStorageInterface $section_storage) { public function set(SectionStorageInterface $section_storage) {
$key = $this->getKey($section_storage); $key = $this->getKey($section_storage);
$this->getTempstore($section_storage)->set($key, ['section_storage' => $section_storage]); $this->getTempstore($section_storage)->set($key, ['section_storage' => $section_storage]);
// Update the storage in the static cache.
$this->cache[$key] = $section_storage;
} }
/** /**
@ -66,6 +90,8 @@ class LayoutTempstoreRepository implements LayoutTempstoreRepositoryInterface {
public function delete(SectionStorageInterface $section_storage) { public function delete(SectionStorageInterface $section_storage) {
$key = $this->getKey($section_storage); $key = $this->getKey($section_storage);
$this->getTempstore($section_storage)->delete($key); $this->getTempstore($section_storage)->delete($key);
// Remove the storage from the static cache.
unset($this->cache[$key]);
} }
/** /**