Skip to content
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

Refactor Redis driver to read all keys efficiently #913

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
+22 −22
Open

Refactor Redis driver to read all keys efficiently #913

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
76c75b8
Refactor Redis driver to read all keys efficiently
mapcentia Jun 7, 2024
1e7582b
Also rewrite of method driverReadAllKeys in Rediscluster driver.
mapcentia Sep 17, 2024
6f1bedb
Merge branch 'master' into redis_scan_fix
mapcentia Jan 29, 2025
ab51ff9
Set initial value of loop variable to zero in RedisCluster driver.
mapcentia Jan 29, 2025
ddb671b
Update test workflow to be fixed on ubuntu-22.04
mapcentia Jan 29, 2025
0bc448e
Multi-line function call not indented correctly
mapcentia Jan 29, 2025
bcbf5b8
Count of keys per iteration is set to default
mapcentia Jan 30, 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
2 changes: 1 addition & 1 deletion .github/workflows/testsv2.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
timeout-minutes: 60
strategy:
matrix:
operating-system: [ubuntu-latest]
mapcentia marked this conversation as resolved.
Show resolved Hide resolved
operating-system: [ubuntu-22.04]
php-versions: ['8.0', '8.1', '8.2', '8.3']
name: PHP ${{ matrix.php-versions }} quality/tests on ${{ matrix.operating-system }}
env:
Expand Down
16 changes: 9 additions & 7 deletions lib/Phpfastcache/Drivers/Redis/Driver.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,13 +125,15 @@ protected function driverConnect(): bool
*/
protected function driverReadAllKeys(string $pattern = '*'): iterable
{
$i = -1;
$keys = $this->instance->scan($i, $pattern === '' ? '*' : $pattern, ExtendedCacheItemPoolInterface::MAX_ALL_KEYS_COUNT);
if (is_iterable($keys)) {
return $keys;
} else {
return [];
}
$i = null;
$pattern = $pattern === '' ? '*' : $pattern;
do {
$keys[] = $this->instance->scan($i, $pattern);
if (\count($keys) > ExtendedCacheItemPoolInterface::MAX_ALL_KEYS_COUNT) {
break;
}
} while ($i > 0);
return \array_merge([], ...$keys);
}

/**
Expand Down
30 changes: 16 additions & 14 deletions lib/Phpfastcache/Drivers/Rediscluster/Driver.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,8 @@ public function getStats(): DriverStatistic
trim(<<<EOF
Redis Cluster version v%s, php-ext v%s with %d master nodes and %d slaves connected are up since %s.
For more information see RawData.
EOF),
EOF
),
implode(', ', array_unique(array_column($infos, 'redis_version'))),
\phpversion("redis"),
count($masters),
Expand Down Expand Up @@ -123,21 +124,22 @@ protected function driverConnect(): bool
*/
protected function driverReadAllKeys(string $pattern = '*'): iterable
{
$keys = [[]];
$result = [[]];
foreach ($this->instance->_masters() as $master) {
$i = -1;
$result = $this->instance->scan(
$i,
$master,
$pattern === '' ? '*' : $pattern,
ExtendedCacheItemPoolInterface::MAX_ALL_KEYS_COUNT
);
if (is_array($result)) {
$keys[] = $result;
}
$i = 0;
$pattern = $pattern === '' ? '*' : $pattern;
do {
$result[] = $this->instance->scan(
$i,
$master,
$pattern,
10);
if (\count($result) > ExtendedCacheItemPoolInterface::MAX_ALL_KEYS_COUNT) {
break;
}
} while ($i > 0);
}

return array_unique(array_merge(...$keys));
return array_unique(\array_merge(...$result));
}

/**
Expand Down