unit test pass

Author: rwifeng

src/Qiniu/Auth.php

@@ -93,7 +93,12 @@ public function uploadToken(
         if ($zone === null) {
             $zone = new Zone();
         }
-        $args['upHosts'] = $zone->getUpHosts($this->accessKey, $bucket);
+
+        list($upHosts, $err) = $zone->getUpHosts($this->accessKey, $bucket);
+        if ($err === null) {
+            $args['upHosts'] = $upHosts;
+        }
+        
         $b = json_encode($args);
         return $this->signWithData($b);
     }

src/Qiniu/Config.php

@@ -18,8 +18,8 @@ final class Config
 
     public function __construct(Zone $z = null)         // 构造函数，默认为zone0
     {
-        if ($z === null) {
+        // if ($z === null) {
             $this->zone = new Zone();
-        }
+        // }
     }
 }

src/Qiniu/Storage/ResumeUploader.php

@@ -54,7 +54,7 @@ public function __construct(
         $this->mime = $mime;
         $this->contexts = array();
         $this->config = $config;
-        $this->host = $config->zone::getUpHostByToken($upToken);
+        $this->host = $config->zone->getUpHostByToken($upToken);
     }
 
     /**
@@ -76,7 +76,7 @@ public function upload()
                 $ret = $response->json();
             }
             if ($response->statusCode < 0) {
-                $this->host = $this->config->zone::getBackupUpHostByToken($this->upToken);
+                $this->host = $this->config->zone->getBackupUpHostByToken($this->upToken);
             }
             if ($response->needRetry() || !isset($ret['crc32']) || $crc != $ret['crc32']) {
                 $response = $this->makeBlock($data, $blockSize);

src/Qiniu/Storage/UploadManager.php

@@ -109,6 +109,7 @@ public function putFile(
                 $checkCrc
             );
         }
+
         $up = new ResumeUploader(
             $upToken,
             $key,

src/Qiniu/Zone.php

@@ -10,7 +10,11 @@ final class Zone
     public $upHost;
     public $upHostBackup;
 
-    public $hostCache; //<scheme>:<ak>:<bucket> ==> array('deadline' => 'xxx', 'upHosts' => array(), 'ioHost' => 'xxx.com')
+    //array(
+    //     <scheme>:<ak>:<bucket> ==>
+    //          array('deadline' => 'xxx', 'upHosts' => array(), 'ioHost' => 'xxx.com')
+    //)
+    public $hostCache;
     public $scheme = 'http';
 
     public function __construct($scheme = null)
@@ -37,8 +41,13 @@ public function getBackupUpHostByToken($uptoken)
 
     public function getIoHost($ak, $bucket)
     {
-        list($bucketHosts, ) = $this->getBucketHosts($ak, $bucket);
-        return $bucketHosts['ioHost'][0];
+        list($bucketHosts,) = $this->getBucketHosts($ak, $bucket);
+        $ioHosts = $bucketHosts['ioHost'];
+        if (count($ioHosts) === 0) {
+            return "";
+        }
+
+        return $ioHosts[0];
     }
 
     public function getUpHosts($ak, $bucket)
@@ -73,15 +82,11 @@ private function unmarshalUpToken($uptoken)
 
     public function getBucketHosts($ak, $bucket)
     {
-        $key = $ak . $bucket;
-
-        $exist = false;
-        if (count($this->hostCache) > 0) {
-            $exist = array_key_exists($key, $this->hostCache) && $this->hostCache[$key]['deadline'] > time();
-        }
+        $key = $this->scheme . $ak . $bucket;
 
-        if ($exist) {
-            return $this->hostCache[$key];
+        $bucketHosts = $this->getBucketHostsFromCache($key);
+        if (count($bucketHosts) > 0) {
+            return array($bucketHosts, null);
         }
 
         list($hosts, $err) = $this->bucketHosts($ak, $bucket);
@@ -90,12 +95,39 @@ public function getBucketHosts($ak, $bucket)
         }
 
         $schemeHosts = $hosts[$this->scheme];
-        $bucketHosts = array('upHosts' => $schemeHosts['up'], 'ioHost' => $schemeHosts['io'], 'deadline' => time() + $hosts['ttl']);
+        $bucketHosts = array(
+            'upHosts' => $schemeHosts['up'],
+            'ioHost' => $schemeHosts['io'],
+            'deadline' => time() + $hosts['ttl']
+        );
 
-        $this->hostCache[$key] = $bucketHosts;
+        $this->setBucketHostsToCache($key, $bucketHosts);
         return array($bucketHosts, null);
     }
 
+    private function getBucketHostsFromCache($key)
+    {
+        $ret = array();
+        if (count($this->hostCache) === 0) {
+            return $ret;
+        }
+
+        if (!array_key_exists($key, $this->hostCache)) {
+            return $ret;
+        }
+
+        if ($this->hostCache[$key]['deadline'] > time()) {
+            $ret = $this->hostCache[$key];
+        }
+
+        return $ret;
+    }
+
+    private function setBucketHostsToCache($key, $val)
+    {
+        $this->hostCache[$key] = $val;
+        return;
+    }
 
     /*  请求包：
      *   GET /v1/query?ak=<ak>&&bucket=<bucket>