multicopy

oss/bucket_test.go

@@ -1066,7 +1066,7 @@ func (s *OssBucketSuite) TestCopyObject(c *C) {
 	c.Assert(err, NotNil)
 
 	// copy with constraints x-oss-metadata-directive
-	_, err = s.bucket.CopyObject(objectName, objectNameDest, Meta("my", "mydescprop"),
+	_, err = s.bucket.CopyObject(objectName, objectNameDest, Meta("my", "mydestprop"),
 		MetadataDirective(MetaCopy))
 	c.Assert(err, IsNil)
 
@@ -1088,10 +1088,10 @@ func (s *OssBucketSuite) TestCopyObject(c *C) {
 	err = s.bucket.DeleteObject(objectNameDest)
 	c.Assert(err, IsNil)
 
-	// copy with constraints x-oss-metadata-directive and self defined desc object meta
+	// copy with constraints x-oss-metadata-directive and self defined dest object meta
 	options := []Option{
 		ObjectACL(ACLPublicReadWrite),
-		Meta("my", "mydescprop"),
+		Meta("my", "mydestprop"),
 		MetadataDirective(MetaReplace),
 	}
 	_, err = s.bucket.CopyObject(objectName, objectNameDest, options...)
@@ -1106,7 +1106,7 @@ func (s *OssBucketSuite) TestCopyObject(c *C) {
 
 	destMeta, err = s.bucket.GetObjectDetailedMeta(objectNameDest)
 	c.Assert(err, IsNil)
-	c.Assert(destMeta.Get("X-Oss-Meta-My"), Equals, "mydescprop")
+	c.Assert(destMeta.Get("X-Oss-Meta-My"), Equals, "mydestprop")
 
 	acl, err = s.bucket.GetObjectACL(objectNameDest)
 	c.Assert(err, IsNil)
@@ -1122,36 +1122,36 @@ func (s *OssBucketSuite) TestCopyObject(c *C) {
 func (s *OssBucketSuite) TestCopyObjectToBucket(c *C) {
 	objectName := objectNamePrefix + "tcotb"
 	objectValue := "男儿何不带吴钩，收取关山五十州。请君暂上凌烟阁，若个书生万户侯？"
-	descBucket := "my-bucket-desc"
+	destBucket := bucketName + "-dest"
 	objectNameDest := objectName + "dest"
 
-	err := s.client.CreateBucket(descBucket)
+	err := s.client.CreateBucket(destBucket)
 	c.Assert(err, IsNil)
 
-	descBuck, err := s.client.Bucket(descBucket)
+	destBuck, err := s.client.Bucket(destBucket)
 	c.Assert(err, IsNil)
 
 	err = s.bucket.PutObject(objectName, strings.NewReader(objectValue))
 	c.Assert(err, IsNil)
 
 	// copy
-	_, err = s.bucket.CopyObjectTo(bucketName, objectName, descBucket, objectNameDest)
+	_, err = s.bucket.CopyObjectTo(bucketName, objectName, destBucket, objectNameDest)
 	c.Assert(err, IsNil)
 
 	// check
-	body, err := descBuck.GetObject(objectNameDest)
+	body, err := destBuck.GetObject(objectNameDest)
 	c.Assert(err, IsNil)
 	str, err := readBody(body)
 	c.Assert(err, IsNil)
 	c.Assert(str, Equals, objectValue)
 
-	err = descBuck.DeleteObject(objectNameDest)
+	err = destBuck.DeleteObject(objectNameDest)
 	c.Assert(err, IsNil)
 
 	err = s.bucket.DeleteObject(objectName)
 	c.Assert(err, IsNil)
 
-	err = s.client.DeleteBucket(descBucket)
+	err = s.client.DeleteBucket(destBucket)
 	c.Assert(err, IsNil)
 }
 

oss/client.go

@@ -599,9 +599,9 @@ func (client Client) GetBucketCORS(bucketName string) (GetBucketCORSResult, erro
 }
 
 //
-// GetBucketInfo 获得Bucket的日志设置。
+// GetBucketInfo 获得Bucket的信息。
 //
-// bucketName  需要删除访问日志的Bucket。
+// bucketName  存储空间名称。
 // GetBucketInfoResult  操作成功的返回值，error为nil时该返回值有效。
 //
 // error 操作无错误为nil，非nil为错误信息。

oss/client_test.go

@@ -1127,7 +1127,7 @@ func (s *OssClientSuite) TestGetBucketInfoNegative(c *C) {
 	_, err = client.GetBucketInfo(bucketNameTest)
 	c.Assert(err, NotNil)
 
-	// not exist
+	// bucket name invalid
 	_, err = client.GetBucketInfo("InvalidBucketName_")
 	c.Assert(err, NotNil)
 }

oss/download.go

@@ -9,7 +9,6 @@ import (
 	"io/ioutil"
 	"os"
 	"strconv"
-	"sync"
 )
 
 //
@@ -123,7 +122,7 @@ type downloadPart struct {
 }
 
 // 文件分片
-func getDownloadPart(bucket *Bucket, objectKey string, partSize int64) ([]downloadPart, error) {
+func getDownloadParts(bucket *Bucket, objectKey string, partSize int64) ([]downloadPart, error) {
 	meta, err := bucket.GetObjectDetailedMeta(objectKey)
 	if err != nil {
 		return nil, err
@@ -157,7 +156,7 @@ func (bucket Bucket) downloadFile(objectKey, filePath string, partSize int64, op
 	fd.Close()
 
 	// 分割文件
-	parts, err := getDownloadPart(&bucket, objectKey, partSize)
+	parts, err := getDownloadParts(&bucket, objectKey, partSize)
 	if err != nil {
 		return err
 	}
@@ -209,7 +208,6 @@ type downloadCheckpoint struct {
 	ObjStat  objectStat     // 文件状态
 	Parts    []downloadPart // 全部分片
 	PartStat []bool         // 分片下载是否完成
-	mutex    sync.Mutex     // Lock
 }
 
 type objectStat struct {
@@ -321,7 +319,7 @@ func (cp *downloadCheckpoint) prepare(bucket *Bucket, objectKey, filePath string
 	cp.ObjStat.Etag = meta.Get(HTTPHeaderEtag)
 
 	// parts
-	cp.Parts, err = getDownloadPart(bucket, objectKey, partSize)
+	cp.Parts, err = getDownloadParts(bucket, objectKey, partSize)
 	if err != nil {
 		return err
 	}

oss/multicopy.go

@@ -9,7 +9,6 @@ import (
 	"os"
 	"path/filepath"
 	"strconv"
-	"sync"
 )
 
 //
@@ -80,10 +79,10 @@ func copyWorker(id int, arg copyWorkerArg, jobs <-chan copyPart, results chan<-
 			break
 		}
 		select {
-        	case <-die:
-            	return
+			case <-die:
+				return
 			default:
-        }
+		}
 		results <- part
 	}
 }
@@ -98,13 +97,13 @@ func copyScheduler(jobs chan copyPart, parts []copyPart) {
 
 // 分片
 type copyPart struct {
-	Number int   // 片序号[1, 10000]
+	Number int  // 片序号[1, 10000]
 	Start int64 // 片起始位置
 	End   int64 // 片结束位置
 }
 
 // 文件分片
-func getCopyPart(bucket *Bucket, objectKey string, partSize int64) ([]copyPart, error) {
+func getCopyParts(bucket *Bucket, objectKey string, partSize int64) ([]copyPart, error) {
 	meta, err := bucket.GetObjectDetailedMeta(objectKey)
 	if err != nil {
 		return nil, err
@@ -135,7 +134,7 @@ func (bucket Bucket) copyFile(srcBucketName, srcObjectKey, destBucketName, destO
 	srcBucket, err := bucket.Client.Bucket(srcBucketName)
 	
 	// 分割文件
-	parts, err := getCopyPart(srcBucket, srcObjectKey, partSize)
+	parts, err := getCopyParts(srcBucket, srcObjectKey, partSize)
 	if err != nil {
 		return err
 	}
@@ -204,7 +203,6 @@ type copyCheckpoint struct {
 	Parts     []copyPart     // 全部分片
 	CopyParts []UploadPart   // 分片上传成功后的返回值
 	PartStat  []bool         // 分片下载是否完成
-	mutex     sync.Mutex     // Lock
 }
 
 // CP数据是否有效，CP有效且Object没有更新时有效
@@ -319,7 +317,7 @@ func (cp *copyCheckpoint) prepare(srcBucket *Bucket, srcObjectKey string, destBu
 	cp.ObjStat.Etag = meta.Get(HTTPHeaderEtag)
 
 	// parts
-	cp.Parts, err = getCopyPart(srcBucket, srcObjectKey, partSize)
+	cp.Parts, err = getCopyParts(srcBucket, srcObjectKey, partSize)
 	if err != nil {
 		return err
 	}