Merge pull request #26 from Automattic/add/dryer-fetch-results

DRYer code for fetching results

Author: xyu

src/ThriftSQL.php

@@ -7,16 +7,6 @@ abstract class ThriftSQL {
   */
   abstract public function connect();
 
-  /**
-  * The simplest use case; takes a query string executes it synchronously and
-  * returns the entire result set after collecting it from the server.
-  *
-  * @param string $queryStr
-  * @return array
-  * @throws \ThriftSQL\Exception
-  */
-  abstract public function queryAndFetchAll( $queryStr );
-
   /**
   * Sends a query string for execution on the server and returns a
   * ThriftSQLQuery object for fetching the results manually.
@@ -32,6 +22,25 @@ abstract public function query( $queryStr );
   */
   abstract public function disconnect();
 
+  /**
+  * The simplest use case; takes a query string executes it synchronously and
+  * returns the entire result set after collecting it from the server.
+  *
+  * @param string $queryStr
+  * @return array
+  * @throws \ThriftSQL\Exception
+  */
+  public function queryAndFetchAll( $queryStr ) {
+    $iterator = $this->getIterator( $queryStr );
+
+    $resultTuples = array();
+    foreach( $iterator as $rowNum => $row ) {
+      $resultTuples[] = $row;
+    }
+
+    return $resultTuples;
+  }
+
   /**
    * Gets a memory efficient iterator that you can use in a foreach loop.
    *

src/ThriftSQL/Hive.php

@@ -84,25 +84,6 @@ public function query( $queryStr ) {
     return new \ThriftSQL\HiveQuery( $response, $this->_client );
   }
 
-  public function queryAndFetchAll( $queryStr ) {
-    try {
-      $query = $this->query( $queryStr );
-      $query->wait();
-      // Collect results
-      $resultTuples = array();
-      do {
-        $responseTuples = $query->fetch(100);
-        // No more data we're done
-        if ( empty( $responseTuples ) ) {
-          return $resultTuples;
-        }
-        $resultTuples = array_merge( $resultTuples, $responseTuples );
-      } while (true);
-    } catch( Exception $e ) {
-      throw new \ThriftSQL\Exception( $e->getMessage() );
-    }
-  }
-
   public function disconnect() {
     // Close session if we have one
     if ( null !== $this->_sessionHandle ) {

src/ThriftSQL/HiveQuery.php

@@ -48,6 +48,7 @@ public function wait() {
     }
 
     $this->_ready = true;
+    return $this;
   }
 
   public function fetch( $maxRows ) {

src/ThriftSQL/Impala.php

@@ -20,7 +20,6 @@ public function __construct( $host, $port = 21000, $username = null, $password =
   }
 
   public function connect() {
-
     // Check if we have already connected
     if ( null !== $this->_client ) {
       return $this;
@@ -47,7 +46,6 @@ public function connect() {
     }
 
     return $this;
-
   }
 
   public function query( $queryStr ) {
@@ -58,26 +56,7 @@ public function query( $queryStr ) {
     }
   }
 
-  public function queryAndFetchAll( $queryStr ) {
-    try {
-      $query = $this->query( $queryStr );
-      $query->wait();
-      $result = array();
-      do {
-        $rows = $query->fetch( 100 );
-        if ( empty( $rows ) ) {
-          break;
-        }
-        $result = array_merge( $result, $rows );
-      } while ( true );
-      return $result;
-    } catch( Exception $e ) {
-      throw new \ThriftSQL\Exception( $e->getMessage() );
-    }
-  }
-
   public function disconnect() {
-
     // Clear out the client
     $this->_client = null;
 
@@ -86,6 +65,5 @@ public function disconnect() {
       $this->_transport->close();
     }
     $this->_transport = null;
-
   }
 }

src/ThriftSQL/ImpalaQuery.php

@@ -52,6 +52,7 @@ public function wait() {
     } while (true);
 
     $this->_ready = true;
+    return $this;
   }
 
   public function fetch( $maxRows ) {

src/ThriftSQL/Utils/Iterator.php

@@ -96,9 +96,8 @@ public function rewind() {
     }
     $this->runCount++;
 
-    $this->thriftSQLQuery = $this->thriftSQL->query( $this->queryStr );
     $this->buffer = array();
     $this->location = 0;
-    $this->thriftSQLQuery->wait();
+    $this->thriftSQLQuery = $this->thriftSQL->query( $this->queryStr )->wait();
   }
 }