Commit c00e950f authored by catch's avatar catch
Browse files

Issue #3164428 by DonAtt, longwave, sahil.goyal, Anchal_gupta, alexpott: Use... 

Issue #3164428 by DonAtt, longwave, sahil.goyal, Anchal_gupta, alexpott: Use cacheBackend->setMultiple in ContentEntityStorageBase::setPersistentCache
parent c62e7d1c

core/lib/Drupal/Core/Entity/ContentEntityStorageBase.php

+6 −1
Original line number Diff line number Diff line
@@ -1113,9 +1113,14 @@ protected function setPersistentCache($entities) { 
      $this->entityTypeId . '_values',

      'entity_field_info',

    ];

    $items = [];

    foreach ($entities as $id => $entity) {

      $this->cacheBackend->set($this->buildCacheId($id), $entity, CacheBackendInterface::CACHE_PERMANENT, $cache_tags);

      $items[$this->buildCacheId($id)] = [

        'data' => $entity,

        'tags' => $cache_tags,

      ];

    }

    $this->cacheBackend->setMultiple($items);

  }



  /**

core/tests/Drupal/Tests/Core/Entity/Sql/SqlContentEntityStorageTest.php

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


namespace Drupal\Tests\Core\Entity\Sql;



use Drupal\Core\Cache\CacheBackendInterface;

use Drupal\Core\Cache\MemoryCache\MemoryCache;

use Drupal\Core\DependencyInjection\ContainerBuilder;

use Drupal\Core\Entity\EntityFieldManager;
@@ -1296,8 +1295,13 @@ public function testLoadMultiplePersistentCacheMiss() { 
      ->with([$key])

      ->will($this->returnValue([]));

    $this->cache->expects($this->once())

      ->method('set')

      ->with($key, $entity, CacheBackendInterface::CACHE_PERMANENT, [$this->entityTypeId . '_values', 'entity_field_info']);

      ->method('setMultiple')

      ->with([

        $key => [

          'data' => $entity,

          'tags' => [$this->entityTypeId . '_values', 'entity_field_info'],

        ],

      ]);



    $this->entityTypeManager->expects($this->any())

      ->method('getActiveDefinition')