Huge "KVClient::getTree" performance update

Author: dcarbone

src/Agent/AgentClient.php

@@ -17,8 +17,8 @@
 */
 
 use DCarbone\PHPConsulAPI\AbstractApiClient;
-use DCarbone\PHPConsulAPI\Hydrator;
 use DCarbone\PHPConsulAPI\HttpRequest;
+use DCarbone\PHPConsulAPI\Hydrator;
 
 /**
  * Class AgentClient

src/Agent/AgentService.php

@@ -18,7 +18,6 @@
 
 use DCarbone\PHPConsulAPI\AbstractDefinedCollection;
 use DCarbone\PHPConsulAPI\AbstractObjectModel;
-use DCarbone\PHPConsulAPI\TaggedInterface;
 
 /**
  * Class AgentService

src/Catalog/CatalogClient.php

@@ -17,9 +17,9 @@
 */
 
 use DCarbone\PHPConsulAPI\AbstractApiClient;
+use DCarbone\PHPConsulAPI\HttpRequest;
 use DCarbone\PHPConsulAPI\Hydrator;
 use DCarbone\PHPConsulAPI\QueryOptions;
-use DCarbone\PHPConsulAPI\HttpRequest;
 use DCarbone\PHPConsulAPI\WriteOptions;
 
 /**

src/Coordinate/CoordinateClient.php

@@ -17,9 +17,9 @@
 */
 
 use DCarbone\PHPConsulAPI\AbstractApiClient;
+use DCarbone\PHPConsulAPI\HttpRequest;
 use DCarbone\PHPConsulAPI\Hydrator;
 use DCarbone\PHPConsulAPI\QueryOptions;
-use DCarbone\PHPConsulAPI\HttpRequest;
 
 /**
  * Class CoordinateClient

src/Event/EventClient.php

@@ -17,9 +17,9 @@
 */
 
 use DCarbone\PHPConsulAPI\AbstractApiClient;
+use DCarbone\PHPConsulAPI\HttpRequest;
 use DCarbone\PHPConsulAPI\Hydrator;
 use DCarbone\PHPConsulAPI\QueryOptions;
-use DCarbone\PHPConsulAPI\HttpRequest;
 use DCarbone\PHPConsulAPI\WriteOptions;
 
 /**

src/Health/HealthClient.php

@@ -18,9 +18,9 @@
 
 use DCarbone\PHPConsulAPI\AbstractApiClient;
 use DCarbone\PHPConsulAPI\Error;
+use DCarbone\PHPConsulAPI\HttpRequest;
 use DCarbone\PHPConsulAPI\Hydrator;
 use DCarbone\PHPConsulAPI\QueryOptions;
-use DCarbone\PHPConsulAPI\HttpRequest;
 
 /**
  * Class HealthClient

src/KV/KVClient.php

@@ -18,9 +18,9 @@
 
 use DCarbone\PHPConsulAPI\AbstractApiClient;
 use DCarbone\PHPConsulAPI\Error;
+use DCarbone\PHPConsulAPI\HttpRequest;
 use DCarbone\PHPConsulAPI\Hydrator;
 use DCarbone\PHPConsulAPI\QueryOptions;
-use DCarbone\PHPConsulAPI\HttpRequest;
 use DCarbone\PHPConsulAPI\WriteOptions;
 
 /**
@@ -201,22 +201,21 @@ public function delete($key, WriteOptions $writeOptions = null)
      */
     public function tree($prefix = null, QueryOptions $queryOptions = null)
     {
-        list($keys, $_, $err) = $this->keys($prefix, $queryOptions);
+        list($valueList, $_, $err) = $this->valueList($prefix, $queryOptions);
 
         if (null !== $err)
             return [null, $err];
 
         $treeHierarchy = array();
-        foreach($keys as $path)
+        foreach($valueList as $path=>$kvp)
         {
             $slashPos = strpos($path, '/');
             if (false === $slashPos)
             {
-                list($kv, $_, $err) = $this->get($path, $queryOptions);
                 if (null !== $err)
                     return [null, $err];
 
-                $treeHierarchy[$path] = $kv;
+                $treeHierarchy[$path] = $kvp;
                 continue;
             }
 
@@ -233,11 +232,7 @@ public function tree($prefix = null, QueryOptions $queryOptions = null)
             // We've arrived at an actual key
             else
             {
-                list($kv, $_, $err) = $this->get($path, $queryOptions);
-                if (null !== $err)
-                    return [null, $err];
-
-                $treeHierarchy[$root][$path] = $kv;
+                $treeHierarchy[$root][$path] = $kvp;
             }
         }
         return [$treeHierarchy, null];