Skip to content
Snippets Groups Projects
Commit 91247936 authored by catch's avatar catch
Browse files

Issue #2662844 by gapple, yogeshmpawar, penyaskito, dawehner, catch,...

Issue #2662844 by gapple, yogeshmpawar, penyaskito, dawehner, catch, smustgrave, alexpott, chx: cache.backend.chainedfast misbehaves when both fast and consistent backends point to the same storage
parent 9857cab4
No related branches found
No related tags found
29 merge requests!12227Issue #3181946 by jonmcl, mglaman,!54479.5.x SF update,!5014Issue #3071143: Table Render Array Example Is Incorrect,!4868Issue #1428520: Improve menu parent link selection,!4289Issue #1344552 by marcingy, Niklas Fiekas, Ravi.J, aleevas, Eduardo Morales...,!4114Issue #2707291: Disable body-level scrolling when a dialog is open as a modal,!4100Issue #3249600: Add support for PHP 8.1 Enums as allowed values for list_* data types,!3630Issue #2815301 by Chi, DanielVeza, kostyashupenko, smustgrave: Allow to create...,!3600Issue #3344629: Passing null to parameter #1 ($haystack) of type string is deprecated,!2378Issue #2875033: Optimize joins and table selection in SQL entity query implementation,!2334Issue #3228209: Add hasRole() method to AccountInterface,!2062Issue #3246454: Add weekly granularity to views date sort,!1591Issue #3199697: Add JSON:API Translation experimental module,!1484Exposed filters get values from URL when Ajax is on,!1255Issue #3238922: Refactor (if feasible) uses of the jQuery serialize function to use vanillaJS,!1162Issue #3100350: Unable to save '/' root path alias,!1105Issue #3025039: New non translatable field on translatable content throws error,!1073issue #3191727: Focus states on mobile second level navigation items fixed,!10223132456: Fix issue where views instances are emptied before an ajax request is complete,!925Issue #2339235: Remove taxonomy hard dependency on node module,!877Issue #2708101: Default value for link text is not saved,!872Draft: Issue #3221319: Race condition when creating menu links and editing content deletes menu links,!844Resolve #3036010 "Updaters",!579Issue #2230909: Simple decimals fail to pass validation,!560Move callback classRemove outside of the loop,!555Issue #3202493,!485Sets the autocomplete attribute for username/password input field on login form.,!213Issue #2906496: Give Media a menu item under Content,!30Issue #3182188: Updates composer usage to point at ./vendor/bin/composer
......@@ -76,9 +76,14 @@ public function __construct(Settings $settings = NULL, $consistent_service_name
* The cache backend object associated with the specified bin.
*/
public function get($bin) {
// Use the chained backend only if there is a fast backend available;
// otherwise, just return the consistent backend directly.
if (isset($this->fastServiceName)) {
// Use the chained backend only if there is a fast backend available and it
// is not the same as the consistent backend; otherwise, just return the
// consistent backend directly.
if (
isset($this->fastServiceName)
&&
$this->fastServiceName !== $this->consistentServiceName
) {
return new ChainedFastBackend(
$this->container->get($this->consistentServiceName)->get($bin),
$this->container->get($this->fastServiceName)->get($bin),
......
<?php
namespace Drupal\Tests\Core\Cache;
use Drupal\Component\DependencyInjection\ContainerInterface;
use Drupal\Core\Cache\CacheBackendInterface;
use Drupal\Core\Cache\CacheFactoryInterface;
use Drupal\Core\Cache\ChainedFastBackend;
use Drupal\Core\Cache\ChainedFastBackendFactory;
use Drupal\Tests\UnitTestCase;
/**
* @coversDefaultClass \Drupal\Core\Cache\ChainedFastBackendFactory
* @group Cache
*/
class ChainedFastBackendFactoryTest extends UnitTestCase {
/**
* Test if the same name is provided for consistent and fast services.
*/
public function testIdenticalService() {
$container = $this->createMock(ContainerInterface::class);
$testCacheFactory = $this->createMock(CacheFactoryInterface::class);
$testCacheBackend = $this->createMock(CacheBackendInterface::class);
$container->expects($this->once())
->method('get')
->with('cache.backend.test')
->willReturn($testCacheFactory);
$testCacheFactory->expects($this->once())
->method('get')
->with('test_bin')
->willReturn($testCacheBackend);
$cacheFactory = new ChainedFastBackendFactory(NULL, 'cache.backend.test', 'cache.backend.test');
$cacheFactory->setContainer($container);
$cacheBackend = $cacheFactory->get('test_bin');
// The test backend should be returned directly.
$this->assertSame($testCacheBackend, $cacheBackend);
}
/**
* Test if different names are provided for consistent and fast services.
*/
public function testDifferentServices() {
$container = $this->createMock(ContainerInterface::class);
$testConsistentCacheFactory = $this->createMock(CacheFactoryInterface::class);
$testFastCacheFactory = $this->createMock(CacheFactoryInterface::class);
$testConsistentCacheBackend = $this->createMock(CacheBackendInterface::class);
$testFastCacheBackend = $this->createMock(CacheBackendInterface::class);
$container->expects($this->exactly(2))
->method('get')
->will(
$this->returnCallback(function ($service) use ($testFastCacheFactory, $testConsistentCacheFactory) {
return match ($service) {
'cache.backend.test_consistent' => $testConsistentCacheFactory,
'cache.backend.test_fast' => $testFastCacheFactory,
};
})
);
// The same bin should be retrieved from both backends.
$testConsistentCacheFactory->expects($this->once())
->method('get')
->with('test_bin')
->willReturn($testConsistentCacheBackend);
$testFastCacheFactory->expects($this->once())
->method('get')
->with('test_bin')
->willReturn($testFastCacheBackend);
$cacheFactory = new ChainedFastBackendFactory(NULL, 'cache.backend.test_consistent', 'cache.backend.test_fast');
$cacheFactory->setContainer($container);
// A wrapping ChainedFastBackend should be returned.
$cacheBackend = $cacheFactory->get('test_bin');
$this->assertInstanceOf(ChainedFastBackend::class, $cacheBackend);
}
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment