fix not query host

Author: lihsai0

src/Qiniu/Config.php

@@ -53,6 +53,27 @@ public function getUpHost($accessKey, $bucket)
         return $scheme . $host;
     }
 
+    public function getUpHostV2($accessKey, $bucket)
+    {
+        list($region, $err) = $this->getRegionV2($accessKey, $bucket);
+        if ($err != null) {
+            return array(null, $err);
+        }
+
+        if ($this->useHTTPS === true) {
+            $scheme = "https://";
+        } else {
+            $scheme = "http://";
+        }
+
+        $host = $region->srcUpHosts[0];
+        if ($this->useCdnDomains === true) {
+            $host = $region->cdnUpHosts[0];
+        }
+
+        return array($scheme . $host, null);
+    }
+
     public function getUpBackupHost($accessKey, $bucket)
     {
         $region = $this->getRegion($accessKey, $bucket);
@@ -70,6 +91,27 @@ public function getUpBackupHost($accessKey, $bucket)
         return $scheme . $host;
     }
 
+    public function getUpBackupHostV2($accessKey, $bucket)
+    {
+        list($region, $err) = $this->getRegionV2($accessKey, $bucket);
+        if ($err != null) {
+            return array(null, $err);
+        }
+
+        if ($this->useHTTPS === true) {
+            $scheme = "https://";
+        } else {
+            $scheme = "http://";
+        }
+
+        $host = $region->cdnUpHosts[0];
+        if ($this->useCdnDomains === true) {
+            $host = $region->srcUpHosts[0];
+        }
+
+        return array($scheme . $host, null);
+    }
+
     public function getRsHost($accessKey, $bucket)
     {
         $region = $this->getRegion($accessKey, $bucket);
@@ -83,6 +125,22 @@ public function getRsHost($accessKey, $bucket)
         return $scheme . $region->rsHost;
     }
 
+    public function getRsHostV2($accessKey, $bucket)
+    {
+        list($region, $err) = $this->getRegionV2($accessKey, $bucket);
+        if ($err != null) {
+            return array(null, $err);
+        }
+
+        if ($this->useHTTPS === true) {
+            $scheme = "https://";
+        } else {
+            $scheme = "http://";
+        }
+
+        return array($scheme . $region->rsHost, null);
+    }
+
     public function getRsfHost($accessKey, $bucket)
     {
         $region = $this->getRegion($accessKey, $bucket);
@@ -96,6 +154,22 @@ public function getRsfHost($accessKey, $bucket)
         return $scheme . $region->rsfHost;
     }
 
+    public function getRsfHostV2($accessKey, $bucket)
+    {
+        list($region, $err) = $this->getRegionV2($accessKey, $bucket);
+        if ($err != null) {
+            return array(null, $err);
+        }
+
+        if ($this->useHTTPS === true) {
+            $scheme = "https://";
+        } else {
+            $scheme = "http://";
+        }
+
+        return array($scheme . $region->rsfHost, null);
+    }
+
     public function getIovipHost($accessKey, $bucket)
     {
         $region = $this->getRegion($accessKey, $bucket);
@@ -109,6 +183,22 @@ public function getIovipHost($accessKey, $bucket)
         return $scheme . $region->iovipHost;
     }
 
+    public function getIovipHostV2($accessKey, $bucket)
+    {
+        list($region, $err) = $this->getRegionV2($accessKey, $bucket);
+        if ($err != null) {
+            return array(null, $err);
+        }
+
+        if ($this->useHTTPS === true) {
+            $scheme = "https://";
+        } else {
+            $scheme = "http://";
+        }
+
+        return array($scheme . $region->iovipHost, null);
+    }
+
     public function getApiHost($accessKey, $bucket)
     {
         $region = $this->getRegion($accessKey, $bucket);
@@ -122,6 +212,22 @@ public function getApiHost($accessKey, $bucket)
         return $scheme . $region->apiHost;
     }
 
+    public function getApiHostV2($accessKey, $bucket)
+    {
+        list($region, $err) = $this->getRegionV2($accessKey, $bucket);
+        if ($err != null) {
+            return array(null, $err);
+        }
+
+        if ($this->useHTTPS === true) {
+            $scheme = "https://";
+        } else {
+            $scheme = "http://";
+        }
+
+        return array($scheme . $region->apiHost, null);
+    }
+
     private function getRegion($accessKey, $bucket)
     {
         $cacheId = "$accessKey:$bucket";
@@ -143,4 +249,25 @@ private function getRegion($accessKey, $bucket)
         }
         return $region;
     }
+
+    private function getRegionV2($accessKey, $bucket)
+    {
+        $cacheId = "$accessKey:$bucket";
+
+        if (isset($this->regionCache[$cacheId])) {
+            $region = $this->regionCache[$cacheId];
+        } elseif (isset($this->zone)) {
+            $region = $this->zone;
+            $this->regionCache[$cacheId] = $region;
+        } else {
+            $region = Zone::queryZone($accessKey, $bucket);
+            if (is_array($region)) {
+                list($region, $err) = $region;
+                return array($region, $err);
+            }
+            $this->regionCache[$cacheId] = $region;
+        }
+
+        return array($region, null);
+    }
 }