geckon01/predis
1
0
Fork 0
mirror of https://github.com/predis/predis.git synced 2026-09-11 19:07:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added possibility to use custom connection cluster classes in Predis\Client constructor.

Browse Source 
Added three methods (used by \Predis\Client) to IConnectionSingle interface.
This commit is contained in:
Artur Kotyrba
2011-01-05 20:31:48 +01:00
parent 9ae69e6c51
commit 6a7fc49176
2 changed files with 30 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/Predis.php
+6
View File
@@ -93,6 +93,9 @@ class Client {
} }
$this->setConnection($cluster); $this->setConnection($cluster);
} }
else if ($parameters instanceof IConnectionCluster) {
$this->setConnection($parameters);
}
else { else {
$this->setConnection($this->createConnection($parameters)); $this->setConnection($this->createConnection($parameters));
} }
@@ -1206,6 +1209,9 @@ interface IConnectionSingle extends IConnection {
public function writeBytes($buffer); public function writeBytes($buffer);
public function readBytes($length); public function readBytes($length);
public function readLine(); public function readLine();
public function getParameters();
public function pushInitCommand(ICommand $command);
public function __toString();
} }
interface IConnectionCluster extends IConnection { interface IConnectionCluster extends IConnection {
test/PredisClientFeatures.php
+24 -9
View File
@@ -408,18 +408,33 @@ class PredisClientFeaturesTestSuite extends PHPUnit_Framework_TestCase {
$params3 = new \Predis\ConnectionParameters($params1); $params3 = new \Predis\ConnectionParameters($params1);
$params4 = new \Predis\TcpConnection($params3); $params4 = new \Predis\TcpConnection($params3);
$client = new \Predis\Client(array($params1, $params2, $params3, $params4)); $connectionCluster1 = array($params1, $params2, $params3, $params4);
foreach ($client->getConnection() as $connection) { $connectionCluster2 = array($params4);
$parameters = $connection->getParameters(); $connectionCluster3 = new \Predis\ConnectionCluster();
$this->assertEquals($params1['host'], $parameters->host); $connectionCluster3->add($params4);
$this->assertEquals($params1['port'], $parameters->port);
$this->assertEquals($params1['connection_timeout'], $parameters->connection_timeout); foreach (array($connectionCluster1, $connectionCluster2, $connectionCluster3) as $connectionCluster) {
$this->assertEquals($params1['read_write_timeout'], $parameters->read_write_timeout); $client = new \Predis\Client($connectionCluster);
$this->assertNull($parameters->password);
foreach ($client->getConnection() as $connection) {
$parameters = $connection->getParameters();
$this->assertEquals($params1['host'], $parameters->host);
$this->assertEquals($params1['port'], $parameters->port);
$this->assertEquals($params1['connection_timeout'], $parameters->connection_timeout);
$this->assertEquals($params1['read_write_timeout'], $parameters->read_write_timeout);
$this->assertNull($parameters->password);
}
}
foreach (array($connectionCluster2, $connectionCluster3) as $connectionCluster) {
$client = new \Predis\Client($connectionCluster);
foreach ($client->getConnection() as $connection) {
$this->assertSame($params4, $connection);
}
} }
} }
/* Client + CommandPipeline */ /* Client + CommandPipeline */
function testCommandPipeline_Simple() { function testCommandPipeline_Simple() {