Add RedisSharedClient that can share one connected driver for more clients

src/Kdyby/Redis/ConnectionPool.php

@@ -0,0 +1,74 @@
+<?php
+
+/**
+ * This file is part of the Kdyby (http://www.kdyby.org)
+ *
+ * Copyright (c) 2008 Filip Procházka (filip@prochazka.su)
+ *
+ * For the full copyright and license information, please view the file license.txt that was distributed with this source code.
+ */
+
+namespace Kdyby\Redis;
+
+use Kdyby;
+use Nette;
+
+
+
+/**
+ * @author Filip Procházka <filip@prochazka.su>
+ */
+class ConnectionPool extends Nette\Object
+{
+
+	/**
+	 * @var IRedisDriver[]
+	 */
+	private $connections = array();
+
+
+	/**
+	 * Add new connection to pool
+	 * @param string $host
+	 * @param int $port
+	 * @param IRedisDriver $connection
+	 * @throws ConnectionAlreadyInPoolException
+	 */
+	public function addConnection($host, $port, IRedisDriver $connection)
+	{
+		$key = $this->getKey($host, $port);
+
+		if (isset($this->connections[$key])) {
+			throw new ConnectionAlreadyInPoolException;
+		}
+
+		$this->connections[$key] = $connection;
+	}
+
+
+
+	/**
+	 * Get connection from pool
+	 * @param string $host
+	 * @param int $port
+	 * @return Driver\PhpRedisDriver
+	 */
+	public function getConnection($host, $port)
+	{
+		$key = $this->getKey($host, $port);
+
+		if (!isset($this->connections[$key])) {
+			return NULL;
+		}
+
+		return $this->connections[$key];
+	}
+
+
+
+	private function getKey($host, $port)
+	{
+		return strtolower($host) . ':' . $port;
+	}
+
+}

src/Kdyby/Redis/Driver/PhpRedisDriver.php

@@ -21,6 +21,12 @@
 class PhpRedisDriver extends \Redis implements Kdyby\Redis\IRedisDriver
 {
 
+	/**
+	 * @var integer
+	 */
+	private $database = 0;
+
+
 	/**
 	 * {@inheritdoc}
 	 */
@@ -38,7 +44,13 @@ public function connect($host, $port = NULL, $timeout = 0)
 	public function select($database)
 	{
 		$args = func_get_args();
-		return call_user_func_array('parent::select', $args);
+		$result = call_user_func_array('parent::select', $args);
+
+		if ($result === TRUE) {
+			$this->database = (int) $database;
+		}
+
+		return $result;
 	}
 
 
@@ -63,4 +75,14 @@ public function evalsha($scriptSha, $argsArray = array(), $numKeys = 0)
 		return call_user_func_array('parent::evalsha', $args);
 	}
 
+
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function getDatabase()
+	{
+		return $this->database;
+	}
+
 }

src/Kdyby/Redis/IRedisDriver.php

@@ -195,6 +195,13 @@ function select($database);
 	 */
 	function close();
 
+	/**
+	 * Get actual selected database
+	 *
+	 * @return int
+	 */
+	function getDatabase();
+
 	/**
 	 * The last error message (if any)
 	 *

src/Kdyby/Redis/RedisClient.php

@@ -165,7 +165,7 @@ class RedisClient extends Nette\Object implements \ArrayAccess
 	/**
 	 * @var Driver\PhpRedisDriver
 	 */
-	private $driver;
+	protected $driver;
 
 	/**
 	 * @var bool
@@ -183,7 +183,7 @@ class RedisClient extends Nette\Object implements \ArrayAccess
 	private $panel;
 
 	/**
-	 * @var string
+	 * @var int
 	 */
 	private $host;
 
@@ -261,6 +261,36 @@ public function __destruct()
 
 
 
+	/**
+	 * @return string
+	 */
+	protected function getHost()
+	{
+		return $this->host;
+	}
+
+
+
+	/**
+	 * @return int
+	 */
+	protected function getPort()
+	{
+		return $this->port;
+	}
+
+
+
+	/**
+	 * @return int
+	 */
+	protected function getDatabase()
+	{
+		return $this->database;
+	}
+
+
+
 	/**
 	 * @return \Kdyby\Redis\IRedisDriver
 	 */
@@ -279,6 +309,7 @@ public function connect()
 		}
 
 		if ($this->driver->isConnected()) {
+			$this->isConnected = TRUE;
 			return;
 		}
 

src/Kdyby/Redis/RedisSharedClient.php

@@ -0,0 +1,97 @@
+<?php
+
+/**
+ * This file is part of the Kdyby (http://www.kdyby.org)
+ *
+ * Copyright (c) 2008 Filip Procházka (filip@prochazka.su)
+ *
+ * For the full copyright and license information, please view the file license.md that was distributed with this source code.
+ */
+
+namespace Kdyby\Redis;
+
+use Kdyby;
+use Nette;
+
+
+
+/**
+ * @author Jakub Trmota <jakub@trmota.cz>
+ */
+class RedisSharedClient extends RedisClient
+{
+
+	/**
+	 * @var ConnectionPool
+	 */
+	private $connectionPool;
+
+
+	/**
+	 * @param ConnectionPool $connectionPool
+	 * @param string $host
+	 * @param int $port
+	 * @param int $database
+	 * @param int $timeout
+	 * @param string $auth
+	 * @param bool $persistent
+	 * @throws MissingExtensionException
+	 */
+	public function __construct(ConnectionPool $connectionPool, $host = '127.0.0.1', $port = NULL, $database = 0, $timeout = 10, $auth = NULL, $persistent = FALSE)
+	{
+		parent::__construct($host, $port, $database, $timeout, $auth, $persistent);
+		$this->connectionPool = $connectionPool;
+	}
+
+
+
+	public function connect()
+	{
+		if (!$this->driver) {
+			$driver = $this->connectionPool->getConnection($this->getHost(), $this->getPort());
+
+			if ($driver === NULL) {
+				$driver = new Driver\PhpRedisDriver();
+				$this->connectionPool->addConnection($this->getHost(), $this->getPort(), $driver);
+			}
+
+			$this->driver = $driver;
+		}
+
+		parent::connect();
+
+		$this->synchronizeClientDatabase();
+	}
+
+
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function send($cmd, array $args = array())
+	{
+		if ($this->driver) {
+			if (!$this->driver->isConnected()) {
+				$this->connect();
+			}
+			$this->synchronizeClientDatabase();
+		}
+
+		return parent::send($cmd, $args);
+	}
+
+
+
+	/**
+	 * @throws RedisClientException
+	 */
+	private function synchronizeClientDatabase()
+	{
+		if ($this->driver->getDatabase() != $this->getDatabase()) {
+			if (call_user_func_array(array($this->driver, 'select'), [$this->getDatabase()]) === FALSE) {
+				throw new RedisClientException('Can\'t set client database on driver');
+			}
+		}
+	}
+
+}

src/Kdyby/Redis/exceptions.php

@@ -92,6 +92,16 @@ class TransactionException extends RedisClientException implements Exception
 
 
 
+/**
+ * @author Filip Procházka <filip@prochazka.su>
+ */
+class ConnectionAlreadyInPoolException extends \RuntimeException implements Exception
+{
+
+}
+
+
+
 /**
  * @author Filip Procházka <filip@prochazka.su>
  */