Rio support

Author: xushiwei

qiniu/resumable_io.php

@@ -16,6 +16,10 @@ class Qiniu_Rio_PutExtra
 	public $Progresses = null;	// 可选。上传进度：[]BlkputRet
 	public $Notify = null;		// 进度通知：func(blkIdx int, blkSize int, ret *BlkputRet)
 	public $NotifyErr = null;	// 错误通知：func(blkIdx int, blkSize int, err error)
+
+	public function __construct($bucket = null) {
+		$this->Bucket = $bucket;
+	}
 }
 
 // ----------------------------------------------------------
@@ -34,12 +38,19 @@ function Qiniu_Rio_BlockCount($fsize) // => $blockCnt
 
 function Qiniu_Rio_Mkblock($self, $host, $reader, $size) // => ($blkputRet, $err)
 {
-	$body = fread($reader, $size);
-	if ($body === false) {
-		$err = Qiniu_NewError(0, 'fread failed');
-		return array(null, $err);
+	if (is_resource($reader)) {
+		$body = fread($reader, $size);
+		if ($body === false) {
+			$err = Qiniu_NewError(0, 'fread failed');
+			return array(null, $err);
+		}
+	} else {
+		list($body, $err) = $reader->Read($size);
+		if ($err !== null) {
+			return array(null, $err);
+		}
 	}
-	if (strlen($body) != $fsize) {
+	if (strlen($body) != $size) {
 		$err = Qiniu_NewError(0, 'fread failed: unexpected eof');
 		return array(null, $err);
 	}
@@ -58,7 +69,7 @@ function Qiniu_Rio_Mkfile($self, $host, $key, $fsize, $extra) // => ($putRet, $e
 	}
 
 	$ctxs = array();
-	for ($extra->Progresses as $prog) {
+	foreach ($extra->Progresses as $prog) {
 		$ctxs []= $prog['ctx'];
 	}
 	$body = implode(',', $ctxs);
@@ -98,8 +109,8 @@ function Qiniu_Rio_Put($upToken, $key, $body, $fsize, $putExtra) // => ($putRet,
 	$progresses = array();
 	$host = $QINIU_UP_HOST;
 	$uploaded = 0;
-	while($uploaded < $fsize) {
-		if ($uploaded + QINIU_RIO_BLOCK_SIZE < $fsize) {
+	while ($uploaded < $fsize) {
+		if ($fsize < $uploaded + QINIU_RIO_BLOCK_SIZE) {
 			$bsize = $fsize - $uploaded;
 		} else {
 			$bsize = QINIU_RIO_BLOCK_SIZE;
@@ -110,12 +121,12 @@ function Qiniu_Rio_Put($upToken, $key, $body, $fsize, $putExtra) // => ($putRet,
 		$progresses []= $blkputRet;
 	}
 
+	$putExtra->Progresses = $progresses;
 	return Qiniu_Rio_Mkfile($self, $host, $key, $fsize, $putExtra);
 }
 
 function Qiniu_Rio_PutFile($upToken, $key, $localFile, $putExtra) // => ($putRet, $err)
 {
-
 	$fp = fopen($localFile, 'rb');
 	if ($fp === false) {
 		$err = Qiniu_NewError(0, 'fopen failed');

qiniu/rs_utils.php

@@ -2,6 +2,7 @@
 
 require_once("rs.php");
 require_once("io.php");
+require_once("resumable_io.php");
 
 function Qiniu_RS_Put($self, $bucket, $key, $body, $putExtra) // => ($putRet, $err)
 {

tests/RioTest.php

@@ -0,0 +1,93 @@
+<?php
+
+require_once("bootstrap.php");
+
+class MockReader
+{
+	private $off = 0;
+
+	public function __construct($off = 0)
+	{
+		$this->off = $off;
+	}
+
+	public function Read($bytes) // => ($data, $err)
+	{
+		$off = $this->off;
+		$data = '';
+		for ($i = 0; $i < $bytes; $i++) {
+			$data .= chr(65 + ($off % 26)); // ord('A') = 65
+			$off++;
+		}
+		$this->off = $off;
+		return array($data, null);
+	}
+}
+
+class RioTest extends PHPUnit_Framework_TestCase
+{
+	public $bucket;
+	public $client;
+
+	public function setUp()
+	{
+		initKeys();
+		$this->client = new Qiniu_MacHttpClient(null);
+		$this->bucket = getenv("QINIU_BUCKET_NAME");
+	}
+
+	public function testMockReader()
+	{
+		$reader = new MockReader;
+		list($data) = $reader->Read(5);
+		$this->assertEquals($data, "ABCDE");
+
+		list($data) = $reader->Read(27);
+		$this->assertEquals($data, "FGHIJKLMNOPQRSTUVWXYZABCDEF");
+	}
+
+	public function testPut()
+	{
+		$key = 'testRioPut' . getTid();
+		$err = Qiniu_RS_Delete($this->client, $this->bucket, $key);
+
+		$putPolicy = new Qiniu_RS_PutPolicy($this->bucket);
+		$upToken = $putPolicy->Token(null);
+		$putExtra = new Qiniu_Rio_PutExtra($this->bucket);
+		$reader = new MockReader;
+		list($ret, $err) = Qiniu_Rio_Put($upToken, $key, $reader, 5, $putExtra);
+		$this->assertNull($err);
+		$this->assertEquals($ret['hash'], "Fnvgeq9GDVk6Mj0Nsz2gW2S_3LOl");
+		var_dump($ret);
+
+		list($ret, $err) = Qiniu_RS_Stat($this->client, $this->bucket, $key);
+		$this->assertNull($err);
+		var_dump($ret);
+
+		$err = Qiniu_RS_Delete($this->client, $this->bucket, $key);
+		$this->assertNull($err);
+	}
+
+	public function testLargePut()
+	{
+		$key = 'testRioLargePut' . getTid();
+		$err = Qiniu_RS_Delete($this->client, $this->bucket, $key);
+
+		$putPolicy = new Qiniu_RS_PutPolicy($this->bucket);
+		$upToken = $putPolicy->Token(null);
+		$putExtra = new Qiniu_Rio_PutExtra($this->bucket);
+		$reader = new MockReader;
+		list($ret, $err) = Qiniu_Rio_Put($upToken, $key, $reader, QINIU_RIO_BLOCK_SIZE + 5, $putExtra);
+		$this->assertNull($err);
+		$this->assertEquals($ret['hash'], "lgQEOCZ8Ievliq8XOfZmWTndgOll");
+		var_dump($ret);
+
+		list($ret, $err) = Qiniu_RS_Stat($this->client, $this->bucket, $key);
+		$this->assertNull($err);
+		var_dump($ret);
+
+		$err = Qiniu_RS_Delete($this->client, $this->bucket, $key);
+		$this->assertNull($err);
+	}
+}
+