Update namespaces for used Thrift classes

Author: thobbs

lib/phpcassa/Connection/ConnectionPool.php

@@ -1,6 +1,9 @@
 <?php
 namespace phpcassa\Connection;
 
+use Thrift\Exception\TException;
+use Thrift\Exception\TTransportException;
+
 use phpcassa\Connection\ConnectionWrapper;
 use phpcassa\Connection\MaxRetriesException;
 use phpcassa\Connection\NoServerAvailable;
@@ -126,7 +129,7 @@ protected function make_conn() {
                 array_push($this->queue, $new_conn);
                 $this->stats['created'] += 1;
                 return;
-            } catch (\TException $e) {
+            } catch (TException $e) {
                 $h = $this->servers[$this->list_position];
                 $err = $e;
                 $msg = $e->getMessage();
@@ -270,7 +273,7 @@ public function call() {
             } catch (UnavailableException $ue) {
                 $last_err = $ue;
                 $this->handle_conn_failure($conn, $f, $ue, $retry_count);
-            } catch (\TTransportException $tte) {
+            } catch (TTransportException $tte) {
                 $last_err = $tte;
                 $this->handle_conn_failure($conn, $f, $tte, $retry_count);
             } catch (\Exception $e) {

lib/phpcassa/Connection/ConnectionWrapper.php

@@ -1,11 +1,10 @@
 <?php
 namespace phpcassa\Connection;
 
-// These don't use namespaces yet, so we can't rely on the autoloader
-require_once $GLOBALS['THRIFT_ROOT'].'/transport/TSocket.php';
-require_once $GLOBALS['THRIFT_ROOT'].'/protocol/TBinaryProtocol.php';
-require_once $GLOBALS['THRIFT_ROOT'].'/transport/TFramedTransport.php';
-require_once $GLOBALS['THRIFT_ROOT'].'/transport/TBufferedTransport.php';
+use Thrift\Transport\TSocket;
+use Thrift\Transport\TFramedTransport;
+use Thrift\Transport\TBufferedTransport;
+use Thrift\Protocol\TBinaryProtocolAccelerated;
 
 use cassandra\CassandraClient;
 use cassandra\AuthenticationRequest;
@@ -36,18 +35,18 @@ public function __construct($keyspace,
             $port = (int)$server[1];
         else
             $port = self::DEFAULT_PORT;
-        $socket = new \TSocket($host, $port);
+        $socket = new TSocket($host, $port);
 
         if($send_timeout) $socket->setSendTimeout($send_timeout);
         if($recv_timeout) $socket->setRecvTimeout($recv_timeout);
 
         if($framed_transport) {
-            $transport = new \TFramedTransport($socket, true, true);
+            $transport = new TFramedTransport($socket, true, true);
         } else {
-            $transport = new \TBufferedTransport($socket, 1024, 1024);
+            $transport = new TBufferedTransport($socket, 1024, 1024);
         }
 
-        $this->client = new CassandraClient(new \TBinaryProtocolAccelerated($transport));
+        $this->client = new CassandraClient(new TBinaryProtocolAccelerated($transport));
         $transport->open();
 
         $this->set_keyspace($keyspace);

lib/phpcassa/Index/IndexExpression.php

@@ -1,13 +1,23 @@
 <?php
 namespace phpcassa\Index;
 
+use cassandra\IndexOperator;
+
 use phpcassa\ColumnFamily;
 
 /**
  * @package phpcassa\Index
  */
 class IndexExpression extends \cassandra\IndexExpression {
 
+    static protected $names_to_values = array(
+        "EQ" => IndexOperator::EQ,
+        "GTE" => IndexOperator::GTE,
+        "GT" => IndexOperator::GT,
+        "LTE" => IndexOperator::LTE,
+        "LT" => IndexOperator::LT
+    );
+
     /**
      * Constructs an IndexExpression to be used in an IndexClause, which can
      * be used with get_indexed_slices().
@@ -25,8 +35,7 @@ public function __construct($column_name, $value, $op="EQ") {
         if (is_int($op)) {
             $this->op = $op;
         } else {
-            $operators = $GLOBALS['\cassandra\E_IndexOperator'];
-            $this->op = $operators[$op];
+            $this->op = IndexExpression::$names_to_values[$op];
         }
     }
 }

test/ConnectionPoolTest.php

@@ -1,5 +1,7 @@
 <?php
 
+use Thrift\Protocol\TBinaryProtocolAccelerated;
+
 use phpcassa\Connection\ConnectionPool;
 use phpcassa\Connection\MaxRetriesException;
 use phpcassa\Connection\NoServerAvailable;