From a83fee9f52e201bfa537643f780372733c817251 Mon Sep 17 00:00:00 2001 From: toranger Date: Tue, 11 Dec 2018 14:54:18 +0800 Subject: [PATCH] update rm the append interface --- README.md | 1 - example/object/append.go | 75 ---------------------------------------------- object.go | 77 +++++++++++++++++++++++++----------------------- 3 files changed, 40 insertions(+), 113 deletions(-) delete mode 100644 example/object/append.go diff --git a/README.md b/README.md index a6120d9..0316a13 100644 --- a/README.md +++ b/README.md @@ -78,7 +78,6 @@ Bucket API: Object API: -* [x] Append Object（使用示例：[object/append.go](./example/object/append.go)） * [x] Get Object（使用示例：[object/get.go](./example/object/get.go)） * [x] Get Object ACL（使用示例：[object/getACL.go](./example/object/getACL.go)） * [x] Put Object（使用示例：[object/put.go](./example/object/put.go)） diff --git a/example/object/append.go b/example/object/append.go deleted file mode 100644 index 792f467..0000000 --- a/example/object/append.go +++ /dev/null @@ -1,75 +0,0 @@ -package main - -import ( - "bytes" - "context" - "fmt" - "math/rand" - "net/url" - "os" - "time" - - "net/http" - - "github.com/tencentyun/cos-go-sdk-v5" - "github.com/tencentyun/cos-go-sdk-v5/debug" -) - -func genBigData(blockSize int) []byte { - b := make([]byte, blockSize) - if _, err := rand.Read(b); err != nil { - panic(err) - } - return b -} - -func main() { - u, _ := url.Parse("https://test-1253846586.cos.ap-guangzhou.myqcloud.com") - b := &cos.BaseURL{ - BucketURL: u, - } - c := cos.NewClient(b, &http.Client{ - Transport: &cos.AuthorizationTransport{ - SecretID: os.Getenv("COS_SECRETID"), - SecretKey: os.Getenv("COS_SECRETKEY"), - Transport: &debug.DebugRequestTransport{ - RequestHeader: true, - RequestBody: false, - ResponseHeader: true, - ResponseBody: true, - }, - }, - }) - - startTime := time.Now() - - name := fmt.Sprintf("test/test_object_append_%s", startTime.Format(time.RFC3339)) - data := genBigData(1024 * 1024 * 1) - length := len(data) - r := bytes.NewReader(data) - - ctx := context.Background() - - // 第一次就必须 append - resp, err := c.Object.Append(ctx, name, 0, r, nil) - if err != nil { - panic(err) - return - } - fmt.Printf("%s\n", resp.Status) - - // head - if _, err = c.Object.Head(ctx, name, nil); err != nil { - panic(err) - return - } - - // 再次 append - data = genBigData(1024 * 1024 * 5) - r = bytes.NewReader(data) - resp, err = c.Object.Append(context.Background(), name, length, r, nil) - if err != nil { - panic(err) - } - fmt.Printf("%s\n", resp.Status) -} diff --git a/object.go b/object.go index 8879dc6..2e1833f 100644 --- a/object.go +++ b/object.go @@ -169,8 +169,8 @@ func (s *ObjectService) Head(ctx context.Context, name string, opt *ObjectHeadOp optHeader: opt, } resp, err := s.client.send(ctx, &sendOpt) - if (resp.Header["X-Cos-Object-Type"] != nil && resp.Header["X-Cos-Object-Type"][0] == "appendable") { - resp.Header.Add("x-cos-next-append-position",resp.Header["Content-Length"][0]) + if resp.Header["X-Cos-Object-Type"] != nil && resp.Header["X-Cos-Object-Type"][0] == "appendable" { + resp.Header.Add("x-cos-next-append-position", resp.Header["Content-Length"][0]) } return resp, err @@ -200,6 +200,7 @@ func (s *ObjectService) Options(ctx context.Context, name string, opt *ObjectOpt } // Append ... +// TODO Append 接口在优化未开放使用 // // Append请求可以将一个文件（Object）以分块追加的方式上传至 Bucket 中。使用Append Upload的文件必须事前被设定为Appendable。 // 当Appendable的文件被执行Put Object的操作以后，文件被覆盖，属性改变为Normal。 @@ -214,21 +215,21 @@ func (s *ObjectService) Options(ctx context.Context, name string, opt *ObjectOpt // 当 r 不是 bytes.Buffer/bytes.Reader/strings.Reader 时，必须指定 opt.ObjectPutHeaderOptions.ContentLength // // https://www.qcloud.com/document/product/436/7741 -func (s *ObjectService) Append(ctx context.Context, name string, position int, r io.Reader, opt *ObjectPutOptions) (*Response, error) { - u := fmt.Sprintf("/%s?append&position=%d", encodeURIComponent(name), position) - if position != 0{ - opt = nil - } - sendOpt := sendOptions{ - baseURL: s.client.BaseURL.BucketURL, - uri: u, - method: http.MethodPost, - optHeader: opt, - body: r, - } - resp, err := s.client.send(ctx, &sendOpt) - return resp, err -} +// func (s *ObjectService) Append(ctx context.Context, name string, position int, r io.Reader, opt *ObjectPutOptions) (*Response, error) { +// u := fmt.Sprintf("/%s?append&position=%d", encodeURIComponent(name), position) +// if position != 0{ +// opt = nil +// } +// sendOpt := sendOptions{ +// baseURL: s.client.BaseURL.BucketURL, +// uri: u, +// method: http.MethodPost, +// optHeader: opt, +// body: r, +// } +// resp, err := s.client.send(ctx, &sendOpt) +// return resp, err +// } // ObjectDeleteMultiOptions ... type ObjectDeleteMultiOptions struct { @@ -283,7 +284,7 @@ type Object struct { } type MultiUploadOptions struct { - OptIni *InitiateMultipartUploadOptions + OptIni *InitiateMultipartUploadOptions PartSize int } @@ -294,45 +295,47 @@ type MultiUploadOptions struct { // func (s *ObjectService) MultiUpload(ctx context.Context, name string, r io.Reader, opt *MultiUploadOptions) (*CompleteMultipartUploadResult, *Response, error) { - + optini := opt.OptIni res, _, err := s.InitiateMultipartUpload(ctx, name, optini) - if err != nil{panic(err)} + if err != nil { + panic(err) + } uploadID := res.UploadID - bufSize := opt.PartSize * 1024 *1024 - buffer := make([]byte,bufSize) + bufSize := opt.PartSize * 1024 * 1024 + buffer := make([]byte, bufSize) optcom := &CompleteMultipartUploadOptions{} - + PartUpload := func(ch chan *Response, ctx context.Context, name string, uploadId string, partNumber int, data io.Reader, opt *ObjectUploadPartOptions) { - - defer func(){ + + defer func() { if err := recover(); err != nil { fmt.Println(err) } }() resp, err := s.UploadPart(context.Background(), name, uploadId, partNumber, data, nil) - if err!=nil{ + if err != nil { panic(err) } ch <- resp } - + chs := make([]chan *Response, 10000) - PartNumber := 0 - for i := 1 ;true; i++ { - bytesread,err := r.Read(buffer) - if err != nil { - if err != io.EOF { - panic(err) - } + PartNumber := 0 + for i := 1; true; i++ { + bytesread, err := r.Read(buffer) + if err != nil { + if err != io.EOF { + panic(err) + } PartNumber = i - break - } + break + } chs[i] = make(chan *Response) go PartUpload(chs[i], context.Background(), name, uploadID, i, strings.NewReader(string(buffer[:bytesread])), nil) } - for i := 1; i < PartNumber; i++ { + for i := 1; i < PartNumber; i++ { resp := <-chs[i] etag := resp.Header.Get("ETag") optcom.Parts = append(optcom.Parts, Object{