FIxed BUG for incorrect result of Redis::HMget and Redis::HGetAll. (#…

…239)
swoft-cloud · Nov 14, 2018 · 8f3f5a5 · 8f3f5a5
1 parent b8d5dfa
commit 8f3f5a5
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 2 deletions.
diff --git a/src/Operator/Hashes/HashGetAll.php b/src/Operator/Hashes/HashGetAll.php
@@ -21,8 +21,11 @@ public function getId()
      */
     public function parseResponse($data)
     {
-        $result = array();
+        if ($data === false) {
+            return false;
+        }
 
+        $result = [];
         for ($i = 0; $i < count($data); ++$i) {
             $result[$data[$i]] = $data[++$i];
         }

diff --git a/src/Operator/Hashes/HashGetMultiple.php b/src/Operator/Hashes/HashGetMultiple.php
@@ -21,10 +21,14 @@ public function getId()
      */
     public function parseResponse($data)
     {
+        if ($data === false) {
+            return false;
+        }
+
         $result = [];
         $hashKeys = $this->getArgument(1);
         foreach ($data as $key => $value) {
-            if (! isset($hashKeys[$key])) {
+            if (!isset($hashKeys[$key])) {
                 continue;
             }
 

diff --git a/test/Cases/HashTest.php b/test/Cases/HashTest.php
@@ -26,6 +26,18 @@ public function testHmsetAndHmget()
         ];
         $values = $this->redis->hMGet($key, ['NotExistKey', 'NotExistKey2']);
         $this->assertEquals($data, $values);
+
+        $this->redis->set($key, 'xxxxx');
+        $result = $this->redis->hMGet($key,['key']);
+        $this->assertFalse($result);
+
+        $this->redis->delete($key);
+        $result = $this->redis->hMGet($key, ['key']);
+        $this->assertEquals(['key' => false], $result);
+
+        $this->redis->sAdd($key, 'xxxxx');
+        $result = $this->redis->hMGet($key, ['key']);
+        $this->assertFalse($result);
     }
 
     public function testHmsetAndHmgetByCo()
@@ -43,6 +55,18 @@ public function testHGetAll()
 
         $result = $this->redis->hGetAll($key);
         $this->assertEquals(['key' => 'value', 'key2' => 'value2', 'key3' => 'value3'], $result);
+
+        $this->redis->set($key, 'xxxxx');
+        $result = $this->redis->hGetAll($key);
+        $this->assertFalse($result);
+
+        $this->redis->delete($key);
+        $result = $this->redis->hGetAll($key);
+        $this->assertEquals([], $result);
+
+        $this->redis->sAdd($key, 'xxxxx');
+        $result = $this->redis->hGetAll($key);
+        $this->assertFalse($result);
     }
 
     public function testHGetAllByCo()