diff options
| author | guol-fnst <goul-fnst@fujitsu.com> | 2022-04-12 13:29:50 +0800 |
|---|---|---|
| committer | guol-fnst <goul-fnst@fujitsu.com> | 2022-04-12 13:40:53 +0800 |
| commit | 44d810d163af8eb417a0a79f09e80eef8aff9e25 (patch) | |
| tree | 540af1325bbd4e8ca55cfd332c2ccb8359a13922 | |
| parent | 180aa88a92a930add1b3199183ae929b6f89b76b (diff) | |
| download | seaweedfs-44d810d163af8eb417a0a79f09e80eef8aff9e25.tar.xz seaweedfs-44d810d163af8eb417a0a79f09e80eef8aff9e25.zip | |
rename functions and remove uncessary check
| -rw-r--r-- | weed/s3api/s3api_object_multipart_handlers.go | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/weed/s3api/s3api_object_multipart_handlers.go b/weed/s3api/s3api_object_multipart_handlers.go index 09ecad759..d2fa21c2e 100644 --- a/weed/s3api/s3api_object_multipart_handlers.go +++ b/weed/s3api/s3api_object_multipart_handlers.go @@ -71,7 +71,7 @@ func (s3a *S3ApiServer) CompleteMultipartUploadHandler(w http.ResponseWriter, r // Get upload id. uploadID, _, _, _ := getObjectResources(r.URL.Query()) - err := s3a.chkUploadID(object, uploadID) + err := s3a.checkUploadId(object, uploadID) if err != nil { s3err.WriteErrorResponse(w, r, s3err.ErrNoSuchUpload) return @@ -100,7 +100,7 @@ func (s3a *S3ApiServer) AbortMultipartUploadHandler(w http.ResponseWriter, r *ht // Get upload id. uploadID, _, _, _ := getObjectResources(r.URL.Query()) - err := s3a.chkUploadID(object, uploadID) + err := s3a.checkUploadId(object, uploadID) if err != nil { s3err.WriteErrorResponse(w, r, s3err.ErrNoSuchUpload) return @@ -176,7 +176,7 @@ func (s3a *S3ApiServer) ListObjectPartsHandler(w http.ResponseWriter, r *http.Re return } - err := s3a.chkUploadID(object, uploadID) + err := s3a.checkUploadId(object, uploadID) if err != nil { s3err.WriteErrorResponse(w, r, s3err.ErrNoSuchUpload) return @@ -206,13 +206,7 @@ func (s3a *S3ApiServer) PutObjectPartHandler(w http.ResponseWriter, r *http.Requ bucket, object := xhttp.GetBucketAndObject(r) uploadID := r.URL.Query().Get("uploadId") - exists, err := s3a.exists(s3a.genUploadsFolder(bucket), uploadID, true) - if !exists { - s3err.WriteErrorResponse(w, r, s3err.ErrNoSuchUpload) - return - } - - err = s3a.chkUploadID(object, uploadID) + err := s3a.checkUploadId(object, uploadID) if err != nil { s3err.WriteErrorResponse(w, r, s3err.ErrNoSuchUpload) return @@ -284,7 +278,7 @@ func (s3a *S3ApiServer) generateUploadID(object string) string { } //Check object name and uploadID when processing multipart uploading -func (s3a *S3ApiServer) chkUploadID(object string, id string) error { +func (s3a *S3ApiServer) checkUploadId(object string, id string) error { hash := s3a.generateUploadID(object) if hash != id { |