diff options
| author | chrislu <chris.lu@gmail.com> | 2023-09-18 16:06:41 -0700 |
|---|---|---|
| committer | chrislu <chris.lu@gmail.com> | 2023-09-18 16:06:41 -0700 |
| commit | 2e5aa06026750c99ea283181974d2ccfe5eb0468 (patch) | |
| tree | 7360ecafeb9f8c81e46244b5da9b07e2b74f3fff /weed/s3api | |
| parent | 4d414f54a224142f3f4d934f4af3b5dceb6fec6b (diff) | |
| parent | a04bd4d26fb355fff6447dd8e508fa54f3c6c180 (diff) | |
| download | seaweedfs-2e5aa06026750c99ea283181974d2ccfe5eb0468.tar.xz seaweedfs-2e5aa06026750c99ea283181974d2ccfe5eb0468.zip | |
Merge branch 'master' of https://github.com/seaweedfs/seaweedfs
Diffstat (limited to 'weed/s3api')
| -rw-r--r-- | weed/s3api/filer_multipart.go | 4 | ||||
| -rw-r--r-- | weed/s3api/s3api_object_handlers.go | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/weed/s3api/filer_multipart.go b/weed/s3api/filer_multipart.go index f8027c7ee..765a5679e 100644 --- a/weed/s3api/filer_multipart.go +++ b/weed/s3api/filer_multipart.go @@ -72,8 +72,8 @@ func (s3a *S3ApiServer) completeMultipartUpload(input *s3.CompleteMultipartUploa glog.V(2).Infof("completeMultipartUpload input %v", input) completedParts := parts.Parts - slices.SortFunc(completedParts, func(a, b CompletedPart) bool { - return a.PartNumber < b.PartNumber + slices.SortFunc(completedParts, func(a, b CompletedPart) int { + return a.PartNumber - b.PartNumber }) uploadDirectory := s3a.genUploadsFolder(*input.Bucket) + "/" + *input.UploadId diff --git a/weed/s3api/s3api_object_handlers.go b/weed/s3api/s3api_object_handlers.go index b63997cd3..f32dcefeb 100644 --- a/weed/s3api/s3api_object_handlers.go +++ b/weed/s3api/s3api_object_handlers.go @@ -334,8 +334,8 @@ func (s3a *S3ApiServer) doDeleteEmptyDirectories(client filer_pb.SeaweedFilerCli for dir := range directoriesWithDeletion { allDirs = append(allDirs, dir) } - slices.SortFunc(allDirs, func(a, b string) bool { - return len(a) > len(b) + slices.SortFunc(allDirs, func(a, b string) int { + return len(b) - len(a) }) newDirectoriesWithDeletion = make(map[string]int) for _, dir := range allDirs { |