Skip to content

[12.x] Fixing RedisTaggedCache::flushValues with PredisClusterConnection #57848

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Nov 21, 2025
Merged

[12.x] Fixing RedisTaggedCache::flushValues with PredisClusterConnection #57848

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
71e9464
[12.x] unskip tests
vadimonus Nov 21, 2025
377a62f
[12.x] flushValues for PredisCluster in RedisTaggedCache
vadimonus Nov 8, 2025
b938286
formatting
taylorotwell Nov 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion src/Illuminate/Cache/RedisTaggedCache.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,8 +193,18 @@ protected function flushValues()
->map(fn (string $key) => $this->store->getPrefix().$key)
->chunk(1000);

$connection = $this->store->connection();

foreach ($entries as $cacheKeys) {
$this->store->connection()->del(...$cacheKeys);
if ($connection instanceof PredisClusterConnection) {
$connection->pipeline(function ($connection) use ($cacheKeys) {
foreach ($cacheKeys as $cacheKey) {
$connection->del($cacheKey);
}
});
} else {
$connection->del(...$cacheKeys);
}
}
}

Expand Down
15 changes: 0 additions & 15 deletions tests/Integration/Cache/RedisStoreTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
use Illuminate\Cache\RedisStore;
use Illuminate\Foundation\Testing\Concerns\InteractsWithRedis;
use Illuminate\Redis\Connections\PhpRedisClusterConnection;
use Illuminate\Redis\Connections\PredisClusterConnection;
use Illuminate\Support\Facades\Cache;
use Illuminate\Support\Sleep;
use Mockery as m;
Expand Down Expand Up @@ -96,8 +95,6 @@ public function testItCanExpireWithZeroTTL()

public function testTagsCanBeAccessed()
{
$this->markTestSkippedWithPredisClusterConnection();

Cache::store('redis')->clear();

Cache::store('redis')->tags(['people', 'author'])->put('name', 'Sally', 5);
Expand All @@ -114,8 +111,6 @@ public function testTagsCanBeAccessed()

public function testTagEntriesCanBeStoredForever()
{
$this->markTestSkippedWithPredisClusterConnection();

Cache::store('redis')->clear();

Cache::store('redis')->tags(['people', 'author'])->forever('name', 'Sally');
Expand Down Expand Up @@ -274,8 +269,6 @@ public function testIncrementWithSerializationEnabled()

public function testTagsCanBeFlushedWithLargeNumberOfKeys()
{
$this->markTestSkippedWithPredisClusterConnection();

Cache::store('redis')->clear();

$tags = ['large-test-'.time()];
Expand All @@ -297,12 +290,4 @@ public function testTagsCanBeFlushedWithLargeNumberOfKeys()
$keyCount = Cache::store('redis')->connection()->keys('*');
$this->assertCount(0, $keyCount);
}

protected function markTestSkippedWithPredisClusterConnection()
{
$this->markTestSkippedWhen(
$this->app['redis']->connection() instanceof PredisClusterConnection,
'This test currently fails on Predis Cluster connection',
);
}
}
Loading