Unverified Commit 9972cbae authored by Alex Pott's avatar Alex Pott
Browse files

task: #3587707 Try to avoid extra cache sets/gets in ThemeRegistry 

By: catch
parent f542f294

core/lib/Drupal/Core/Utility/ThemeRegistry.php

+3 −37
Original line number Diff line number Diff line
@@ -2,7 +2,6 @@ 


namespace Drupal\Core\Utility;



use Drupal\Core\Cache\Cache;

use Drupal\Core\Cache\CacheBackendInterface;

use Drupal\Core\Cache\CacheCollector;

use Drupal\Core\DestructableInterface;
@@ -57,13 +56,9 @@ public function __construct($cid, CacheBackendInterface $cache, LockBackendInter 
    $this->tags = $tags;

    $this->persistable = $modules_loaded && \Drupal::hasRequest() && \Drupal::request()->isMethod('GET');



    // @todo Implement lazy-loading.

    $this->cacheLoaded = TRUE;

    $this->lazyLoadCache();



    if ($this->persistable && $cached = $this->cache->get($this->cid)) {

      $this->storage = $cached->data;

    }

    else {

    if (empty($this->storage)) {

      // If there is no runtime cache stored, fetch the full theme registry,

      // but then initialize each value to NULL. This allows offsetExists()

      // to function correctly on non-registered theme hooks without triggering
@@ -72,9 +67,6 @@ public function __construct($cid, CacheBackendInterface $cache, LockBackendInter 
      foreach (array_keys($this->storage) as $key) {

        $this->persist($key);

      }

      // RegistryTest::testRaceCondition() ensures that the cache entry is

      // written on the initial construction of the theme registry.

      $this->updateCache();

    }

  }
@@ -139,33 +131,7 @@ protected function updateCache($lock = TRUE) { 
    if (!$this->persistable) {

      return;

    }

    // @todo Is the custom implementation necessary?

    $data = [];

    foreach ($this->keysToPersist as $offset => $persist) {

      if ($persist) {

        $data[$offset] = $this->storage[$offset];

      }

    }

    if (empty($data)) {

      return;

    }



    $lock_name = $this->cid . ':' . __CLASS__;

    if (!$lock || $this->lock->acquire($lock_name)) {

      if ($cached = $this->cache->get($this->cid)) {

        // Use array merge instead of union so that filled in values in $data

        // overwrite empty values in the current cache.

        $data = array_merge($cached->data, $data);

      }

      else {

        $registry = $this->initializeRegistry();

        $data = array_merge($registry, $data);

      }

      $this->cache->set($this->cid, $data, Cache::PERMANENT, $this->tags);

      if ($lock) {

        $this->lock->release($lock_name);

      }

    }

    parent::updateCache($lock);

  }



  /**

core/profiles/demo_umami/tests/src/FunctionalJavascript/OpenTelemetryAuthenticatedPerformanceTest.php

+4 −4
Original line number Diff line number Diff line
@@ -126,11 +126,11 @@ protected function doTestNodePageAdministrator(): void { 
    }, 'administratorNodePage');



    $expected = [

      'QueryCount' => 261,

      'CacheGetCount' => 251,

      'QueryCount' => 259,

      'CacheGetCount' => 250,

      'CacheGetCountByBin' => [

        'config' => 60,

        'bootstrap' => 16,

        'bootstrap' => 15,

        'discovery' => 75,

        'data' => 20,

        'entity' => 24,
@@ -139,7 +139,7 @@ protected function doTestNodePageAdministrator(): void { 
        'render' => 13,

        'menu' => 22,

      ],

      'CacheSetCount' => 255,

      'CacheSetCount' => 254,

      'CacheDeleteCount' => 0,

      'CacheTagInvalidationCount' => 0,

      'CacheTagLookupQueryCount' => 28,

core/profiles/demo_umami/tests/src/FunctionalJavascript/OpenTelemetryFrontPagePerformanceTest.php

+3 −3
Original line number Diff line number Diff line
@@ -52,9 +52,9 @@ protected function testFrontPageColdCache(): void { 
    $this->assertSession()->pageTextContains('Umami');



    $expected = [

      'QueryCount' => 181,

      'CacheGetCount' => 225,

      'CacheSetCount' => 235,

      'QueryCount' => 179,

      'CacheGetCount' => 224,

      'CacheSetCount' => 234,

      'CacheDeleteCount' => 0,

      'CacheTagLookupQueryCount' => 24,

      'CacheTagInvalidationCount' => 0,

core/profiles/demo_umami/tests/src/FunctionalJavascript/OpenTelemetryNodePagePerformanceTest.php

+5 −5
Original line number Diff line number Diff line
@@ -55,9 +55,9 @@ protected function testNodePageColdCache(): void { 
    $this->assertSession()->pageTextContains('quiche');



    $expected = [

      'QueryCount' => 197,

      'CacheGetCount' => 216,

      'CacheSetCount' => 220,

      'QueryCount' => 195,

      'CacheGetCount' => 215,

      'CacheSetCount' => 219,

      'CacheDeleteCount' => 0,

      'CacheTagLookupQueryCount' => 23,

      'CacheTagInvalidationCount' => 0,
@@ -208,8 +208,8 @@ protected function testNodePageWarmCache(): void { 
      'SELECT "base_table"."revision_id" AS "revision_id", "base_table"."id" AS "id" FROM "content_moderation_state_revision" "base_table" INNER JOIN "content_moderation_state_field_revision" "content_moderation_state_field_revision" ON "content_moderation_state_field_revision"."revision_id" = "base_table"."revision_id" WHERE ("content_moderation_state_field_revision"."content_entity_type_id" LIKE "node" ESCAPE \'\\\\\') AND ("content_moderation_state_field_revision"."content_entity_id" = "1") AND ("content_moderation_state_field_revision"."content_entity_revision_id" = "76") AND ("content_moderation_state_field_revision"."workflow" = "editorial") AND ("content_moderation_state_field_revision"."langcode" = "en") ORDER BY "base_table"."revision_id" DESC',

      'SELECT "revision"."revision_id" AS "revision_id", "revision"."langcode" AS "langcode", "revision"."revision_default" AS "revision_default", "base"."id" AS "id", "base"."uuid" AS "uuid", CASE "base"."revision_id" WHEN "revision"."revision_id" THEN 1 ELSE 0 END AS "isDefaultRevision" FROM "content_moderation_state" "base" INNER JOIN "content_moderation_state_revision" "revision" ON "revision"."id" = "base"."id" AND "revision"."revision_id" IN (76)',

      'SELECT "content_moderation_state_field_revision".*, "content_moderation_state_field_revision"."langcode" AS "content_moderation_state_field_revision__langcode" FROM "content_moderation_state_field_revision" "content_moderation_state_field_revision" WHERE "content_moderation_state_field_revision"."revision_id" IN ("76")',

      'INSERT INTO "semaphore" ("name", "value", "expire") VALUES ("theme_registry:runtime:umami:Drupal\Core\Utility\ThemeRegistry", "LOCK_ID", "EXPIRE")',

      'DELETE FROM "semaphore"  WHERE ("name" = "theme_registry:runtime:umami:Drupal\Core\Utility\ThemeRegistry") AND ("value" = "LOCK_ID")',

      'INSERT INTO "semaphore" ("name", "value", "expire") VALUES ("theme_registry:runtime:umami:Drupal\Core\Cache\CacheCollector", "LOCK_ID", "EXPIRE")',

      'DELETE FROM "semaphore"  WHERE ("name" = "theme_registry:runtime:umami:Drupal\Core\Cache\CacheCollector") AND ("value" = "LOCK_ID")',

    ];

    $recorded_queries = $performance_data->getQueries();

    $this->assertSame($expected_queries, $recorded_queries);

core/profiles/standard/tests/src/FunctionalJavascript/StandardPerformanceTest.php

+2 −2
Original line number Diff line number Diff line
@@ -118,8 +118,8 @@ protected function testAnonymous(): void { 
      'SELECT "menu_tree"."menu_name" AS "menu_name", "menu_tree"."route_name" AS "route_name", "menu_tree"."route_parameters" AS "route_parameters", "menu_tree"."url" AS "url", "menu_tree"."title" AS "title", "menu_tree"."description" AS "description", "menu_tree"."parent" AS "parent", "menu_tree"."weight" AS "weight", "menu_tree"."options" AS "options", "menu_tree"."expanded" AS "expanded", "menu_tree"."enabled" AS "enabled", "menu_tree"."provider" AS "provider", "menu_tree"."metadata" AS "metadata", "menu_tree"."class" AS "class", "menu_tree"."form_class" AS "form_class", "menu_tree"."id" AS "id" FROM "menu_tree" "menu_tree" WHERE ("route_name" = "view.frontpage.page_1") AND ("route_param_key" = "view_id=frontpage&display_id=page_1") AND ("menu_name" = "account") ORDER BY "depth" ASC, "weight" ASC, "id" ASC',

      'SELECT "menu_tree"."menu_name" AS "menu_name", "menu_tree"."route_name" AS "route_name", "menu_tree"."route_parameters" AS "route_parameters", "menu_tree"."url" AS "url", "menu_tree"."title" AS "title", "menu_tree"."description" AS "description", "menu_tree"."parent" AS "parent", "menu_tree"."weight" AS "weight", "menu_tree"."options" AS "options", "menu_tree"."expanded" AS "expanded", "menu_tree"."enabled" AS "enabled", "menu_tree"."provider" AS "provider", "menu_tree"."metadata" AS "metadata", "menu_tree"."class" AS "class", "menu_tree"."form_class" AS "form_class", "menu_tree"."id" AS "id" FROM "menu_tree" "menu_tree" WHERE ("route_name" = "<front>") AND ("route_param_key" = "") AND ("menu_name" = "account") ORDER BY "depth" ASC, "weight" ASC, "id" ASC',

      'SELECT "menu_tree".* FROM "menu_tree" "menu_tree" WHERE ("menu_name" = "main") AND ("depth" <= 2) ORDER BY "p1" ASC, "p2" ASC, "p3" ASC, "p4" ASC, "p5" ASC, "p6" ASC, "p7" ASC, "p8" ASC, "p9" ASC',

      'INSERT INTO "semaphore" ("name", "value", "expire") VALUES ("theme_registry:runtime:stark:Drupal\Core\Utility\ThemeRegistry", "LOCK_ID", "EXPIRE")',

      'DELETE FROM "semaphore"  WHERE ("name" = "theme_registry:runtime:stark:Drupal\Core\Utility\ThemeRegistry") AND ("value" = "LOCK_ID")',

      'INSERT INTO "semaphore" ("name", "value", "expire") VALUES ("theme_registry:runtime:stark:Drupal\Core\Cache\CacheCollector", "LOCK_ID", "EXPIRE")',

      'DELETE FROM "semaphore"  WHERE ("name" = "theme_registry:runtime:stark:Drupal\Core\Cache\CacheCollector") AND ("value" = "LOCK_ID")',

      'INSERT INTO "semaphore" ("name", "value", "expire") VALUES ("library_info:stark:Drupal\Core\Cache\CacheCollector", "LOCK_ID", "EXPIRE")',

      'DELETE FROM "semaphore"  WHERE ("name" = "library_info:stark:Drupal\Core\Cache\CacheCollector") AND ("value" = "LOCK_ID")',

      'INSERT INTO "semaphore" ("name", "value", "expire") VALUES ("path_alias_prefix_list:Drupal\Core\Cache\CacheCollector", "LOCK_ID", "EXPIRE")',