Merge pull request #24 from swooletw/fix/redis-zscan

fix redis zscan
swooletw · Jan 8, 2024 · b60a3ae · b60a3ae
2 parents cc361bd + e0e9ce2
commit b60a3ae
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 7 deletions.
diff --git a/src/cache/src/RedisTaggedCacheChunkedEntries.php b/src/cache/src/RedisTaggedCacheChunkedEntries.php
@@ -52,6 +52,10 @@ public function next(): void
             $this->nextScanCursor = '0';
         }
 
+        if ($this->nextScanCursor === $this->scanCursor) {
+            $this->nextScanCursor = '0';
+        }
+
         $this->scanCursor = $this->nextScanCursor;
 
         if ($this->scanCursor === '0') {
@@ -83,16 +87,17 @@ protected function tagId(): ?string
 
     protected function scan(string $tagId, string $cursor): array
     {
-        [$nextCursor, $entries] = $this->store->connection()->zscan(
+        $entries = $this->store->connection()->zscan(
             $this->store->getPrefix() . $tagId,
             $cursor,
-            ['match' => '*', 'count' => $this->chunkSize]
+            '*',
+            $this->chunkSize
         );
 
         if (! is_array($entries)) {
             throw new RuntimeException('Entries is not an array.');
         }
 
-        return [$nextCursor, $entries];
+        return ["{$cursor}", $entries];
     }
 }
diff --git a/tests/Cache/CacheRedisTaggedCacheTest.php b/tests/Cache/CacheRedisTaggedCacheTest.php
@@ -49,13 +49,13 @@ public function testTagEntriesCanBeStoredForever()
         $this->redisProxy
             ->shouldReceive('zScan')
             ->once()
-            ->with('prefix:tag:people:entries', '0', ['match' => '*', 'count' => 1000])
-            ->andReturn(['0', ['tag:people:entries:name' => 0, 'tag:people:entries:age' => 0]]);
+            ->with('prefix:tag:people:entries', '0', '*', 1000)
+            ->andReturn(['tag:people:entries:name' => 0, 'tag:people:entries:age' => 0]);
         $this->redisProxy
             ->shouldReceive('zScan')
             ->once()
-            ->with('prefix:tag:author:entries', '0', ['match' => '*', 'count' => 1000])
-            ->andReturn(['0', ['tag:author:entries:name' => 0, 'tag:author:entries:age' => 0]]);
+            ->with('prefix:tag:author:entries', '0', '*', 1000)
+            ->andReturn(['tag:author:entries:name' => 0, 'tag:author:entries:age' => 0]);
         $this->redisProxy->shouldReceive('del')->once()->with(
             'prefix:tag:people:entries:name',
             'prefix:tag:people:entries:age'