Switch the default text protocol processor to the new and faster one.

lib/Predis.php

@@ -1183,6 +1183,7 @@ use Predis\ConnectionParameters;
 use Predis\CommunicationException;
 use Predis\Protocols\IRedisProtocol;
 use Predis\Protocols\TextProtocol;
+use Predis\Protocols\ComposableTextProtocol;
 use Predis\Distribution\IDistributionStrategy;
 
 interface IConnection {
@@ -1511,10 +1512,12 @@ class ConnectionCluster implements IConnectionCluster, \IteratorAggregate {
 
 namespace Predis\Protocols;
 
+use Predis\Utils;
 use Predis\ICommand;
-use Predis\Iterators;
+use Predis\CommunicationException;
 use Predis\MalformedServerResponse;
 use Predis\Network\IConnectionSingle;
+use Predis\Iterators\MultiBulkResponseSimple;
 
 interface IRedisProtocol {
     public function write(IConnectionSingle $connection, ICommand $command);
@@ -1542,7 +1545,7 @@ interface IResponseHandler {
     function handle(IConnectionSingle $connection, $payload);
 }
 
-class TextProtocol implements IRedisProtocolExtended {
+class TextProtocol implements IRedisProtocol {
     const NEWLINE = "\r\n";
     const OK      = 'OK';
     const ERROR   = 'ERR';
@@ -1555,6 +1558,116 @@ class TextProtocol implements IRedisProtocolExtended {
     const PREFIX_BULK       = '$';
     const PREFIX_MULTI_BULK = '*';
 
+    const BUFFER_SIZE = 8192;
+
+    private $_mbiterable, $_throwErrors;
+
+    public function __construct() {
+        $this->_mbiterable  = false;
+        $this->_throwErrors = true;
+    }
+
+    public function write(IConnectionSingle $connection, ICommand $command) {
+        $commandId = $command->getCommandId();
+        $arguments = $command->getArguments();
+
+        $cmdlen  = strlen($commandId);
+        $reqlen  = count($arguments) + 1;
+
+        $buffer = "*{$reqlen}\r\n\${$cmdlen}\r\n{$commandId}\r\n";
+        for ($i = 0; $i < $reqlen - 1;  $i++) {
+            $argument = $arguments[$i];
+            $arglen  = strlen($argument);
+            $buffer .= "\${$arglen}\r\n{$argument}\r\n";
+        }
+
+        fwrite($connection->getResource(), $buffer);
+    }
+
+    public function read(IConnectionSingle $connection) {
+        $socket = $connection->getResource();
+        $chunk  = fgets($socket);
+        if ($chunk === false || $chunk === '') {
+            throw new CommunicationException(
+                $connection, 'Error while reading line from the server'
+            );
+        }
+        $prefix  = $chunk[0];
+        $payload = substr($chunk, 1, -2);
+        switch ($prefix) {
+            case '+':    // inline
+                if ($payload === 'OK') {
+                    return true;
+                }
+                if ($payload === 'QUEUED') {
+                    return new \Predis\ResponseQueued();
+                }
+                return $payload;
+
+            case '$':    // bulk
+                $size = (int) $payload;
+                if ($size === -1) {
+                    return null;
+                }
+                $bulkData = '';
+                $bytesLeft = ($size += 2);
+                do {
+                    $chunk = fread($socket, min($bytesLeft, self::BUFFER_SIZE));
+                    if ($chunk === false || $chunk === '') {
+                        throw new CommunicationException(
+                            $connection, 'Error while reading bytes from the server'
+                        );
+                    }
+                    $bulkData .= $chunk;
+                    $bytesLeft = $size - strlen($bulkData);
+                } while ($bytesLeft > 0);
+                return substr($bulkData, 0, -2);
+
+            case '*':    // multi bulk
+                $count = (int) $payload;
+                if ($count === -1) {
+                    return null;
+                }
+                if ($this->_mbiterable == true) {
+                    return new MultiBulkResponseSimple($connection, $count);
+                }
+                $multibulk = array();
+                for ($i = 0; $i < $count; $i++) {
+                    $multibulk[$i] = $this->read($connection);
+                }
+                return $multibulk;
+
+            case ':':    // integer
+                return (int) $payload;
+
+            case '-':    // error
+                $errorMessage = substr($payload, 4);
+                if ($this->_throwErrors) {
+                    throw new \Predis\ServerException($errorMessage);
+                }
+                return new \Predis\ResponseError($errorMessage);
+
+            default:
+                throw new CommunicationException(
+                    $connection, "Unknown prefix: '$prefix'"
+                );
+        }
+    }
+
+    public function setOption($option, $value) {
+        switch ($option) {
+            case 'iterable_multibulk':
+                $this->_mbiterable = (bool) $value;
+                break;
+            case 'throw_errors':
+            case 'throw_on_error':
+                $this->_throwErrors = (bool) $value;
+                break;
+        }
+    }
+}
+
+class ComposableTextProtocol implements IRedisProtocolExtended {
     private $_serializer, $_reader;
 
     public function __construct(Array $options = array()) {
@@ -1575,11 +1688,12 @@ class TextProtocol implements IRedisProtocolExtended {
         switch ($option) {
             case 'iterable_multibulk':
                 $handler = $value ? new ResponseMultiBulkStreamHandler() : new ResponseMultiBulkHandler();
-                $this->_reader->setHandler(self::PREFIX_MULTI_BULK, $handler);
+                $this->_reader->setHandler(TextProtocol::PREFIX_MULTI_BULK, $handler);
                 break;
+            case 'throw_errors':
             case 'throw_on_error':
                 $handler = $value ? new ResponseErrorHandler() : new ResponseErrorSilentHandler();
-                $this->_reader->setHandler(self::PREFIX_ERROR, $handler);
+                $this->_reader->setHandler(TextProtocol::PREFIX_ERROR, $handler);
                 break;
             default:
                 throw new \InvalidArgumentException(

lib/addons/FastTextProtocol.php

@@ -1,118 +0,0 @@
-<?php
-namespace Predis\Protocols;
-
-use Predis\Utils;
-use Predis\ICommand;
-use Predis\CommunicationException;
-use Predis\Network\IConnectionSingle;
-use Predis\Iterators\MultiBulkResponseSimple;
-
-class FastTextProtocol implements IRedisProtocol {
-    const BUFFER_SIZE = 8192;
-    private $_mbiterable, $_throwErrors;
-
-    public function __construct() {
-        $this->_mbiterable  = false;
-        $this->_throwErrors = true;
-    }
-
-    public function write(IConnectionSingle $connection, ICommand $command) {
-        $commandId = $command->getCommandId();
-        $arguments = $command->getArguments();
-
-        $cmdlen  = strlen($commandId);
-        $reqlen  = count($arguments) + 1;
-
-        $buffer = "*{$reqlen}\r\n\${$cmdlen}\r\n{$commandId}\r\n";
-        for ($i = 0; $i < $reqlen - 1;  $i++) {
-            $argument = $arguments[$i];
-            $arglen  = strlen($argument);
-            $buffer .= "\${$arglen}\r\n{$argument}\r\n";
-        }
-
-        fwrite($connection->getResource(), $buffer);
-    }
-
-    public function read(IConnectionSingle $connection) {
-        $socket = $connection->getResource();
-        $chunk  = fgets($socket);
-        if ($chunk === false || $chunk === '') {
-            throw new CommunicationException(
-                $connection, 'Error while reading line from the server'
-            );
-        }
-        $prefix  = $chunk[0];
-        $payload = substr($chunk, 1, -2);
-        switch ($prefix) {
-            case '+':    // inline
-                if ($payload === 'OK') {
-                    return true;
-                }
-                if ($payload === 'QUEUED') {
-                    return new \Predis\ResponseQueued();
-                }
-                return $payload;
-
-            case '$':    // bulk
-                $size = (int) $payload;
-                if ($size === -1) {
-                    return null;
-                }
-                $bulkData = '';
-                $bytesLeft = ($size += 2);
-                do {
-                    $chunk = fread($socket, min($bytesLeft, self::BUFFER_SIZE));
-                    if ($chunk === false || $chunk === '') {
-                        throw new CommunicationException(
-                            $connection, 'Error while reading bytes from the server'
-                        );
-                    }
-                    $bulkData .= $chunk;
-                    $bytesLeft = $size - strlen($bulkData);
-                } while ($bytesLeft > 0);
-                return substr($bulkData, 0, -2);
-
-            case '*':    // multi bulk
-                $count = (int) $payload;
-                if ($count === -1) {
-                    return null;
-                }
-                if ($this->_mbiterable == true) {
-                    return new MultiBulkResponseSimple($connection, $count);
-                }
-                $multibulk = array();
-                for ($i = 0; $i < $count; $i++) {
-                    $multibulk[$i] = $this->read($connection);
-                }
-                return $multibulk;
-
-            case ':':    // integer
-                return (int) $payload;
-
-            case '-':    // error
-                $errorMessage = substr($payload, 4);
-                if ($this->_throwErrors) {
-                    throw new \Predis\ServerException($errorMessage);
-                }
-                return new \Predis\ResponseError($errorMessage);
-
-            default:
-                throw new CommunicationException(
-                    $connection, "Unknown prefix: '$prefix'"
-                );
-        }
-    }
-
-    public function setOption($option, $value) {
-        switch ($option) {
-            case 'iterable_multibulk':
-                $this->_mbiterable = (bool) $value;
-                break;
-            case 'throw_errors':
-            case 'throw_on_error':
-                $this->_throwErrors = (bool) $value;
-                break;
-        }
-    }
-}
-?>