Merge pull request #192 from rwifeng/multi_zones

Multi zones

Author: longbai

src/Qiniu/Zone.php

@@ -43,10 +43,6 @@ public function getIoHost($ak, $bucket)
     {
         list($bucketHosts,) = $this->getBucketHosts($ak, $bucket);
         $ioHosts = $bucketHosts['ioHost'];
-        if (count($ioHosts) === 0) {
-            return "";
-        }
-
         return $ioHosts[0];
     }
 
@@ -85,7 +81,7 @@ private function unmarshalUpToken($uptoken)
 
     public function getBucketHosts($ak, $bucket)
     {
-        $key = $this->scheme . $ak . $bucket;
+        $key = $this->scheme . ":$ak:$bucket";
 
         $bucketHosts = $this->getBucketHostsFromCache($key);
         if (count($bucketHosts) > 0) {
@@ -112,7 +108,7 @@ private function getBucketHostsFromCache($key)
     {
         $ret = array();
         if (count($this->hostCache) === 0) {
-            return $ret;
+            $this->hostCacheFromFile();
         }
 
         if (!array_key_exists($key, $this->hostCache)) {
@@ -129,9 +125,36 @@ private function getBucketHostsFromCache($key)
     private function setBucketHostsToCache($key, $val)
     {
         $this->hostCache[$key] = $val;
+        $this->hostCacheToFile();
         return;
     }
 
+    private function hostCacheFromFile()
+    {
+
+        $path = $this->hostCacheFilePath();
+        if (!file_exists($path)) {
+            return;
+        }
+
+        $bucketHosts = file_get_contents($path);
+        $this->hostCache = json_decode($bucketHosts, true);
+        return;
+    }
+
+    private function hostCacheToFile()
+    {
+        $path = $this->hostCacheFilePath();
+        file_put_contents($path, json_encode($this->hostCache), LOCK_EX);
+        return;
+    }
+
+    private function hostCacheFilePath()
+    {
+        $home = getenv('HOME');
+        return $home . '/.qiniu_phpsdk_hostscache.json';
+    }
+
     /*  请求包：
      *   GET /v1/query?ak=<ak>&&bucket=<bucket>
      *  返回包：

tests/Qiniu/Tests/ZoneTest.php

@@ -50,4 +50,20 @@ public function testUpHosts()
         $this->assertNull($err);
         $this->assertEquals('https://up-z1.qbox.me', $upHosts[0]);
     }
+
+    public function testIoHosts()
+    {
+
+        $ioHost = $this->zone->getIoHost($this->ak, $this->bucketName);
+        $this->assertEquals('http://iovip.qbox.me', $ioHost);
+
+        $ioHost = $this->zone->getIoHost($this->ak, $this->bucketNameBC);
+        $this->assertEquals('http://iovip-z1.qbox.me', $ioHost);
+
+        $ioHost = $this->zoneHttps->getIoHost($this->ak, $this->bucketName);
+        $this->assertEquals('https://iovip.qbox.me', $ioHost);
+
+        $ioHost = $this->zoneHttps->getIoHost($this->ak, $this->bucketNameBC);
+        $this->assertEquals('https://iovip-z1.qbox.me', $ioHost);
+    }
 }