Add support for multiple servers in Elastica_Client (issue #39)

ruflin · Jun 18, 2011 · fa7117e · fa7117e
1 parent 39934d9
commit fa7117e
Show file tree

Hide file tree

Showing 5 changed files with 69 additions and 4 deletions.
diff --git a/lib/Elastica/Client.php b/lib/Elastica/Client.php
@@ -42,7 +42,8 @@ class Elastica_Client
 		'transport' => self::DEFAULT_TRANSPORT,
 		'timeout' => self::TIMEOUT,
 		'headers' => array(),
-		'servers' => array()
+		'servers' => array(),
+		'roundRobin' => false,
 	);
 
 	/**

diff --git a/lib/Elastica/Request.php b/lib/Elastica/Request.php
@@ -18,6 +18,13 @@ class Elastica_Request {
 	protected $_method;
 	protected $_data;
 
+	/**
+	 * Internal id of last used server. This is used for round robin
+	 *
+	 * @var int Last server id
+	 */
+	protected static $_serverId = null;
+
 	/**
 	 * @param string $path Request path
 	 * @param string $method Request method (use const's)
@@ -113,10 +120,31 @@ public function getTransport() {
 		return new $className($this);
 	}
 
+	/**
+	 * Sends request to server
+	 *
+	 * @return Elastica_Response Response object
+	 */
 	public function send() {
 		$transport = $this->getTransport();
 
-		// TODO Implement multiple servers
-		return $transport->exec($this->getClient()->getHost(), $this->getClient()->getPort());
+		$servers = $this->getClient()->getConfig('servers');
+
+		if (empty($servers)) {
+			$response = $transport->exec($this->getClient()->getHost(), $this->getClient()->getPort());
+		} else {
+			// Set server id for first request (round robin by default)
+			if (is_null(self::$_serverId)) {
+				self::$_serverId = rand(0, count($servers) - 1);
+			} else {
+				self::$_serverId = (self::$_serverId + 1) % count($servers);
+			}
+
+			$server = $servers[self::$_serverId];
+
+			$response = $transport->exec($server['host'], $server['port']);
+		}
+
+		return $response;
 	}
 }
diff --git a/lib/Elastica/Transport/Abstract.php b/lib/Elastica/Transport/Abstract.php
@@ -33,5 +33,12 @@ public function getRequest() {
 		return $this->_request;
 	}
 
+	/**
+	 * Executes the transport request
+	 *
+	 * @param string $host Hostname
+	 * @param int $port Port number
+	 * @return Elastica_Response Response object
+	 */
 	abstract public function exec($host, $port);
 }
diff --git a/test/lib/Elastica/ClientTest.php b/test/lib/Elastica/ClientTest.php
@@ -31,6 +31,36 @@ public function testDefaults() {
 		$this->assertEquals(Elastica_Client::DEFAULT_TRANSPORT, $client->getTransport());
 	}
 
+	public function testServersArray() {
+		// Creates a new index 'xodoa' and a type 'user' inside this index
+		$client = new Elastica_Client(array('servers' => array(array('host' => 'localhost', 'port' => 9200))));
+		$index = $client->getIndex('test1');
+		$index->create(array(), true);
+
+		$type = $index->getType('user');
+
+		// Adds 1 document to the index
+		$doc1 = new Elastica_Document(1,
+			array('username' => 'hans', 'test' => array('2', '3', '5'))
+		);
+		$type->addDocument($doc1);
+
+		// Adds a list of documents with _bulk upload to the index
+		$docs = array();
+		$docs[] = new Elastica_Document(2,
+			array('username' => 'john', 'test' => array('1', '3', '6'))
+		);
+		$docs[] = new Elastica_Document(3,
+			array('username' => 'rolf', 'test' => array('2', '3', '7'))
+		);
+		$type->addDocuments($docs);
+
+		// Refresh index
+		$index->refresh();
+
+		$resultSet = $type->search('rolf');
+	}
+
 	public function testBulk() {
 		$client = new Elastica_Client();
 

diff --git a/test/lib/Elastica/ExampleTest.php b/test/lib/Elastica/ExampleTest.php
@@ -20,7 +20,6 @@ public function testExample() {
 
 		$type = $index->getType('user');
 
-
 		// Adds 1 document to the index
 		$doc1 = new Elastica_Document(1,
 			array('username' => 'hans', 'test' => array('2', '3', '5'))