v160rc1

cheprasov · cheprasov · commit ee57467029bd · 2017-01-07T12:00:44.000Z
diff --git a/src/RedisClient/Client/AbstractRedisClient.php b/src/RedisClient/Client/AbstractRedisClient.php
@@ -13,7 +13,9 @@
 use RedisClient\Cluster\ClusterMap;
 use RedisClient\Command\Response\ResponseParser;
 use RedisClient\Exception\AskResponseException;
+use RedisClient\Exception\CommandNotFoundException;
 use RedisClient\Exception\ErrorResponseException;
+use RedisClient\Exception\InvalidArgumentException;
 use RedisClient\Exception\MovedResponseException;
 use RedisClient\Exception\TryAgainResponseException;
 use RedisClient\Pipeline\Pipeline;
@@ -166,8 +168,8 @@ protected function executeProtocolCommand(ProtocolInterface $Protocol, array $co
                 } else {
                     $this->ClusterMap->addCluster($response->getSlot(), $response->getServer());
                 }
-                $Protocol = $this->ClusterMap->getProtocolByServer($response->getServer());
-                return $this->executeProtocolCommand($Protocol, $command, $params);
+                $this->Protocol = $this->ClusterMap->getProtocolByServer($response->getServer());
+                return $this->executeProtocolCommand($this->Protocol, $command, $params);
             }
             if ($response instanceof AskResponseException) {
                 $config = $this->getConfig();
@@ -251,7 +253,7 @@ protected function getStructure(array $command, array $params = null) {
     /**
      * @param null|Pipeline|\Closure $Pipeline
      * @return mixed|Pipeline
-     * @throws \InvalidArgumentException
+     * @throws InvalidArgumentException
      */
     public function pipeline($Pipeline = null) {
         if (!$Pipeline) {
@@ -263,7 +265,7 @@ public function pipeline($Pipeline = null) {
         if ($Pipeline instanceof PipelineInterface) {
             return $this->executePipeline($Pipeline);
         }
-        throw new \InvalidArgumentException();
+        throw new InvalidArgumentException();
     }
 
     /**
@@ -342,7 +344,7 @@ public function __call($name , array $arguments) {
         if ($method = $this->getMethodNameForReservedWord($name)) {
             return call_user_func_array([$this, $method], $arguments);
         }
-        throw new \Exception('Call to undefined method '. static::class. '::'. $name);
+        throw new CommandNotFoundException('Call to undefined method '. static::class. '::'. $name);
     }
 
 }
diff --git a/src/RedisClient/ClientFactory.php b/src/RedisClient/ClientFactory.php
@@ -84,6 +84,7 @@ public static function create($config = null) {
      * @param string $version
      * @param null|array $config
      * @return RedisClient2x6|RedisClient2x8|RedisClient3x0|RedisClient3x2|RedisClient4x0
+     * @throws InvalidArgumentException
      */
     public static function createClientByVersion($version, $config = null) {
         list($major, $minor, $patch) = explode('.', $version .'.0.0');
@@ -100,7 +101,7 @@ public static function createClientByVersion($version, $config = null) {
             }
         }
         if (empty($class)) {
-            throw new \InvalidArgumentException(
+            throw new InvalidArgumentException(
                 'RedisClient does not support Redis version '. $version .'. Please, use version '. end($versions)
             );
         }
diff --git a/src/RedisClient/Cluster/ClusterMap.php b/src/RedisClient/Cluster/ClusterMap.php
@@ -103,7 +103,7 @@ public function getServerBySlot($slot) {
                 return $server;
             }
         }
-        return null;
+        return isset($server) ? $server : null;
     }
 
     /**
diff --git a/src/RedisClient/Command/Parameter/Parameter.php b/src/RedisClient/Command/Parameter/Parameter.php
@@ -10,7 +10,7 @@
  */
 namespace RedisClient\Command\Parameter;
 
-use InvalidArgumentException;
+use RedisClient\Exception\InvalidArgumentException;
 
 class Parameter {
 
diff --git a/src/RedisClient/Command/Traits/Version2x6/PubSubCommandsTrait.php b/src/RedisClient/Command/Traits/Version2x6/PubSubCommandsTrait.php
@@ -10,6 +10,8 @@
  */
 namespace RedisClient\Command\Traits\Version2x6;
 
+use RedisClient\Exception\InvalidArgumentException;
+
 /**
  * PubSub Commands
  * @link http://redis.io/commands#pubsub
@@ -25,10 +27,11 @@ trait PubSubCommandsTrait {
      * @param string|string[] $patterns
      * @param \Closure|string|array $callback
      * @return string[]
+     * @throws InvalidArgumentException
      */
     public function psubscribe($patterns, $callback) {
         if (!is_callable($callback)) {
-            throw new \InvalidArgumentException('Function $callback is not callable');
+            throw new InvalidArgumentException('Function $callback is not callable');
         }
         return $this->subscribeCommand(['PSUBSCRIBE'], ['PUNSUBSCRIBE'], (array)$patterns, $callback);
     }
@@ -70,10 +73,11 @@ public function punsubscribe($patterns = null) {
      * @param string|string[] $channels
      * @param \Closure|string|array $callback
      * @return string[]
+     * @throws InvalidArgumentException
      */
     public function subscribe($channels, $callback) {
         if (!is_callable($callback)) {
-            throw new \InvalidArgumentException('Function $callback is not callable');
+            throw new InvalidArgumentException('Function $callback is not callable');
         }
         return $this->subscribeCommand(['SUBSCRIBE'], ['UNSUBSCRIBE'], (array)$channels, $callback);
     }
diff --git a/src/RedisClient/Command/Traits/Version2x6/StringsCommandsTrait.php b/src/RedisClient/Command/Traits/Version2x6/StringsCommandsTrait.php
@@ -10,8 +10,8 @@
  */
 namespace RedisClient\Command\Traits\Version2x6;
 
-use InvalidArgumentException;
 use RedisClient\Command\Parameter\Parameter;
+use RedisClient\Exception\InvalidArgumentException;
 
 /**
  * Strings Commands
diff --git a/src/RedisClient/Exception/CommandNotFoundException.php b/src/RedisClient/Exception/CommandNotFoundException.php
@@ -0,0 +1,15 @@
+<?php
+/**
+ * This file is part of RedisClient.
+ * git: https://github.com/cheprasov/php-redis-client
+ *
+ * (C) Alexander Cheprasov <cheprasov.84@ya.ru>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+namespace RedisClient\Exception;
+
+class CommandNotFoundException extends RedisException {
+
+}
diff --git a/src/RedisClient/Pipeline/AbstractPipeline.php b/src/RedisClient/Pipeline/AbstractPipeline.php
@@ -11,6 +11,7 @@
 namespace RedisClient\Pipeline;
 
 use RedisClient\Command\Response\ResponseParser;
+use RedisClient\Exception\CommandNotFoundException;
 use RedisClient\Exception\ErrorException;
 
 abstract class AbstractPipeline implements PipelineInterface {
@@ -121,7 +122,7 @@ public function __call($name , array $arguments) {
         if ($method = $this->getMethodNameForReservedWord($name)) {
             return call_user_func_array([$this, $method], $arguments);
         }
-        throw new \Exception('Call to undefined method '. static::class. '::'. $name);
+        throw new CommandNotFoundException('Call to undefined method '. static::class. '::'. $name);
     }
 
 }
diff --git a/src/RedisClient/Protocol/ProtocolInterface.php b/src/RedisClient/Protocol/ProtocolInterface.php
@@ -19,6 +19,11 @@ interface ProtocolInterface {
      */
     public function setConnection(ConnectionInterface $Connection);
 
+    /**
+     * @return ConnectionInterface $Connection
+     */
+    public function getConnection();
+
     /**
      * @param string $command
      * @return mixed
diff --git a/tests/Integration/Version3x0/ClusterTest.php b/tests/Integration/Version3x0/ClusterTest.php
@@ -141,12 +141,12 @@ public function test_addClusterSlotsOnError() {
         $Redis->set('foo', 'bar');
         $this->assertSame([12182 => '127.0.0.1:7003'], $ClusterMap->getClusters());
         $Redis->set('foo1', 'bar');
-        $this->assertSame([13431 => '127.0.0.1:7003'], $ClusterMap->getClusters());
+        $this->assertSame([12182 => '127.0.0.1:7003'], $ClusterMap->getClusters());
         $Redis->set('foo2', 'bar');
         $this->assertSame(
             [
                 1044  => '127.0.0.1:7001',
-                13431 => '127.0.0.1:7003'
+                12182 => '127.0.0.1:7003'
             ],
             $ClusterMap->getClusters()
         );
diff --git a/tests/Unit/Client/AbstractRedisClientIsolatedTest.php b/tests/Unit/Client/AbstractRedisClientIsolatedTest.php
@@ -13,6 +13,7 @@
 include_once(__DIR__ . '/../GlobalFunctionMock.php');
 
 use RedisClient\Client\AbstractRedisClient;
+use RedisClient\Cluster\ClusterMap;
 use RedisClient\Exception\MovedResponseException;
 use RedisClient\RedisClient;
 use Test\Unit\GlobalFunctionMock;
@@ -55,7 +56,7 @@ public function test_mockStream() {
     public function test_MovedErrorResponse() {
         GlobalFunctionMock::mockFunction('RedisClient\Connection::fwrite', function($h, $m, $c) {
             $this->assertSame('tcp://127.0.0.1:6379', $h);
-            $this->assertSame("*2\r\n$3\r\nGET\r\n$3\r\nkey\r\n", $m);
+            $this->assertSame("*2\r\n\$3\r\nGET\r\n\$3\r\nkey\r\n", $m);
             $this->assertSame(22, $c);
             return $c;
         });
@@ -83,26 +84,42 @@ public function test_MovedErrorResponse() {
 
     public function test_ClusterEmptyMovedErrorResponse() {
         GlobalFunctionMock::mockFunction('RedisClient\Connection::fwrite', function($h, $m, $c) {
-            static $servers = [
-                'tcp://127.0.0.1:7001',
-                'tcp://127.0.0.1:7003',
+            static $data = [
+                ['tcp://127.0.0.1:7001', "*2\r\n\$3\r\nGET\r\n\$3\r\nfoo\r\n"],
+                ['tcp://127.0.0.1:7003', "*2\r\n\$3\r\nGET\r\n\$3\r\nfoo\r\n"],
+                ['tcp://127.0.0.1:7003', "*2\r\n\$3\r\nGET\r\n\$4\r\nfoo1\r\n"],
+                ['tcp://127.0.0.1:7003', "*2\r\n\$3\r\nGET\r\n\$4\r\nfoo2\r\n"],
+                ['tcp://127.0.0.1:7001', "*2\r\n\$3\r\nGET\r\n\$4\r\nfoo2\r\n"],
+                ['tcp://127.0.0.1:7001', "*2\r\n\$3\r\nGET\r\n\$4\r\nfoo2\r\n"],
             ];
-            $this->assertSame(array_shift($servers), $h);
-            $this->assertSame("*2\r\n$3\r\nGET\r\n$3\r\nfoo\r\n", $m);
-            $this->assertSame(22, $c);
+            $datum = array_shift($data);
+            $this->assertSame($datum[0], $h);
+            $this->assertSame($datum[1], $m);
             return $c;
         });
 
         GlobalFunctionMock::mockFunction('RedisClient\Connection::fgets', function() {
             static $data = [
                 "-MOVED 12182 127.0.0.1:7003\r\n",
                 "\$3\r\n",
+                "\$4\r\n",
+                "-MOVED 1044 127.0.0.1:7001\r\n",
+                "\$4\r\n",
+                "\$4\r\n",
             ];
-            return array_shift($data);
+            $datum = array_shift($data);
+            return $datum;
         });
 
         GlobalFunctionMock::mockFunction('RedisClient\Connection::fread', function() {
-            return "bar\r\n";
+            static $data = [
+                "bar\r\n",
+                "bar1\r\n",
+                "bar2\r\n",
+                "bar3\r\n",
+            ];
+            $datum = array_shift($data);
+            return $datum;
         });
 
         $Redis = new RedisClient([
@@ -114,18 +131,21 @@ public function test_ClusterEmptyMovedErrorResponse() {
         ]);
 
         $this->assertSame('bar', $Redis->get('foo'));
+        $this->assertSame('bar1', $Redis->get('foo1'));
+        $this->assertSame('bar2', $Redis->get('foo2'));
+        $this->assertSame('bar3', $Redis->get('foo2'));
 
-        $this->assertSame(2, GlobalFunctionMock::getCountCalls('RedisClient\Connection::stream_socket_client'));
-        $this->assertSame(2, GlobalFunctionMock::getCountCalls('RedisClient\Connection::stream_set_timeout'));
-        $this->assertSame(2, GlobalFunctionMock::getCountCalls('RedisClient\Connection::fwrite'));
-        $this->assertSame(2, GlobalFunctionMock::getCountCalls('RedisClient\Connection::fgets'));
-        $this->assertSame(1, GlobalFunctionMock::getCountCalls('RedisClient\Connection::fread'));
+        $this->assertSame(3, GlobalFunctionMock::getCountCalls('RedisClient\Connection::stream_socket_client'));
+        $this->assertSame(3, GlobalFunctionMock::getCountCalls('RedisClient\Connection::stream_set_timeout'));
+        $this->assertSame(6, GlobalFunctionMock::getCountCalls('RedisClient\Connection::fwrite'));
+        $this->assertSame(6, GlobalFunctionMock::getCountCalls('RedisClient\Connection::fgets'));
+        $this->assertSame(4, GlobalFunctionMock::getCountCalls('RedisClient\Connection::fread'));
     }
 
     public function test_ClusterFullMovedErrorResponse() {
         GlobalFunctionMock::mockFunction('RedisClient\Connection::fwrite', function($h, $m, $c) {
             $this->assertSame('tcp://127.0.0.1:7003', $h);
-            $this->assertSame("*2\r\n$3\r\nGET\r\n$3\r\nfoo\r\n", $m);
+            $this->assertSame("*2\r\n\$3\r\nGET\r\n\$3\r\nfoo\r\n", $m);
             $this->assertSame(22, $c);
             return $c;
         });
@@ -164,19 +184,19 @@ public function test_ClusterFullAskErrorResponse() {
             static $data = [
                 [
                     'tcp://127.0.0.1:7003',
-                    "*2\r\n$3\r\nGET\r\n$3\r\nfoo\r\n",
+                    "*2\r\n\$3\r\nGET\r\n\$3\r\nfoo\r\n",
                 ],
                 [
                     'tcp://127.0.0.1:7002',
-                    "*1\r\n$6\r\nASKING\r\n",
+                    "*1\r\n\$6\r\nASKING\r\n",
                 ],
                 [
                     'tcp://127.0.0.1:7002',
-                    "*2\r\n$3\r\nGET\r\n$3\r\nfoo\r\n",
+                    "*2\r\n\$3\r\nGET\r\n\$3\r\nfoo\r\n",
                 ],
                 [
                     'tcp://127.0.0.1:7003',
-                    "*2\r\n$3\r\nGET\r\n$3\r\nfoo\r\n",
+                    "*2\r\n\$3\r\nGET\r\n\$3\r\nfoo\r\n",
                 ],
             ];
             $datum = array_shift($data);
@@ -224,4 +244,76 @@ public function test_ClusterFullAskErrorResponse() {
         $this->assertSame(4, GlobalFunctionMock::getCountCalls('RedisClient\Connection::fgets'));
         $this->assertSame(2, GlobalFunctionMock::getCountCalls('RedisClient\Connection::fread'));
     }
+
+    public function test_ClusterEmptyMixResponse() {
+        GlobalFunctionMock::mockFunction('RedisClient\Connection::fwrite', function($h, $m, $c) {
+            static $data = [
+                ['tcp://127.0.0.1:7001', "*2\r\n\$3\r\nGET\r\n\$3\r\nfoo\r\n"],
+                ['tcp://127.0.0.1:7003', "*2\r\n\$3\r\nGET\r\n\$3\r\nfoo\r\n"],
+                ['tcp://127.0.0.1:7002', "*1\r\n\$6\r\nASKING\r\n"],
+                ['tcp://127.0.0.1:7002', "*2\r\n\$3\r\nGET\r\n\$3\r\nfoo\r\n"],
+                ['tcp://127.0.0.1:7003', "*2\r\n\$3\r\nGET\r\n\$3\r\nfoo\r\n"],
+                ['tcp://127.0.0.1:7003', "*2\r\n\$3\r\nGET\r\n\$4\r\nfoo2\r\n"],
+                ['tcp://127.0.0.1:7001', "*2\r\n\$3\r\nGET\r\n\$4\r\nfoo2\r\n"],
+                ['tcp://127.0.0.1:7003', "*2\r\n\$3\r\nGET\r\n\$3\r\nfoo\r\n"],
+                ['tcp://127.0.0.1:7001', "*2\r\n\$3\r\nGET\r\n\$4\r\nfoo2\r\n"],
+                ['tcp://127.0.0.1:7003', "*2\r\n\$3\r\nGET\r\n\$4\r\nfoo1\r\n"],
+            ];
+            $datum = array_shift($data);
+            $this->assertSame($datum[0], $h);
+            $this->assertSame($datum[1], $m);
+            return $c;
+        });
+
+        GlobalFunctionMock::mockFunction('RedisClient\Connection::fgets', function() {
+            static $data = [
+                "-MOVED 12182 127.0.0.1:7003\r\n",
+                "-ASK 12182 127.0.0.1:7002\r\n",
+                "+OK\r\n",
+                "\$3\r\n",
+                "\$4\r\n",
+                "-MOVED 1044 127.0.0.1:7001\r\n",
+                "\$4\r\n",
+                "\$4\r\n",
+                "\$4\r\n",
+                "\$4\r\n",
+            ];
+            $datum = array_shift($data);
+            return $datum;
+        });
+
+        GlobalFunctionMock::mockFunction('RedisClient\Connection::fread', function() {
+            static $data = [
+                "bar\r\n",
+                "bar1\r\n",
+                "bar2\r\n",
+                "bar3\r\n",
+                "bar4\r\n",
+                "bar5\r\n",
+            ];
+            $datum = array_shift($data);
+            return $datum;
+        });
+
+        $Redis = new RedisClient([
+            'server' => '127.0.0.1:7001',
+            'cluster' => [
+                'enabled' => true,
+                'clusters' => []
+            ]
+        ]);
+
+        $this->assertSame('bar', $Redis->get('foo'));
+        $this->assertSame('bar1', $Redis->get('foo'));
+        $this->assertSame('bar2', $Redis->get('foo2'));
+        $this->assertSame('bar3', $Redis->get('foo'));
+        $this->assertSame('bar4', $Redis->get('foo2'));
+        $this->assertSame('bar5', $Redis->get('foo1'));
+
+        $this->assertSame(4, GlobalFunctionMock::getCountCalls('RedisClient\Connection::stream_socket_client'));
+        $this->assertSame(4, GlobalFunctionMock::getCountCalls('RedisClient\Connection::stream_set_timeout'));
+        $this->assertSame(10, GlobalFunctionMock::getCountCalls('RedisClient\Connection::fwrite'));
+        $this->assertSame(10, GlobalFunctionMock::getCountCalls('RedisClient\Connection::fgets'));
+        $this->assertSame(6, GlobalFunctionMock::getCountCalls('RedisClient\Connection::fread'));
+    }
 }
diff --git a/tests/Unit/Cluster/ClusterMapTest.php b/tests/Unit/Cluster/ClusterMapTest.php

Original file line number	Diff line number	Diff line change
`@@ -84,6 +84,7 @@ public static function create($config = null) {`
`84`	`84`	`* @param string $version`
`85`	`85`	`* @param null\|array $config`
`86`	`86`	`* @return RedisClient2x6\|RedisClient2x8\|RedisClient3x0\|RedisClient3x2\|RedisClient4x0`
	`87`	`+ * @throws InvalidArgumentException`
`87`	`88`	`*/`
`88`	`89`	`public static function createClientByVersion($version, $config = null) {`
`89`	`90`	`list($major, $minor, $patch) = explode('.', $version .'.0.0');`
`@@ -100,7 +101,7 @@ public static function createClientByVersion($version, $config = null) {`
`100`	`101`	`}`
`101`	`102`	`}`
`102`	`103`	`if (empty($class)) {`
`103`		`- throw new \InvalidArgumentException(`
	`104`	`+ throw new InvalidArgumentException(`
`104`	`105`	`'RedisClient does not support Redis version '. $version .'. Please, use version '. end($versions)`
`105`	`106`	`);`
`106`	`107`	`}`
Original file line number	Diff line number	Diff line change
`@@ -103,7 +103,7 @@ public function getServerBySlot($slot) {`
`103`	`103`	`return $server;`
`104`	`104`	`}`
`105`	`105`	`}`
`106`		`- return null;`
	`106`	`+ return isset($server) ? $server : null;`
`107`	`107`	`}`
`108`	`108`
`109`	`109`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@`
`11`	`11`	`namespace RedisClient\Pipeline;`
`12`	`12`
`13`	`13`	`use RedisClient\Command\Response\ResponseParser;`
	`14`	`+use RedisClient\Exception\CommandNotFoundException;`
`14`	`15`	`use RedisClient\Exception\ErrorException;`
`15`	`16`
`16`	`17`	`abstract class AbstractPipeline implements PipelineInterface {`
`@@ -121,7 +122,7 @@ public function __call($name , array $arguments) {`
`121`	`122`	`if ($method = $this->getMethodNameForReservedWord($name)) {`
`122`	`123`	`return call_user_func_array([$this, $method], $arguments);`
`123`	`124`	`}`
`124`		`- throw new \Exception('Call to undefined method '. static::class. '::'. $name);`
	`125`	`+ throw new CommandNotFoundException('Call to undefined method '. static::class. '::'. $name);`
`125`	`126`	`}`
`126`	`127`
`127`	`128`	`}`