Revert "Revert "Merge branch 'master' of https://github.com/seaweedfs/seaweedfs""

This reverts commit 8cb42c39
2023-09-25 09:35:16 -07:00
parent 3d07895518
commit 645ae8c57b
23 changed files with 84 additions and 70 deletions
--- a/weed/server/filer_server_handlers_write_upload.go
+++ b/weed/server/filer_server_handlers_write_upload.go
@@ -135,8 +135,8 @@ func (fs *FilerServer) uploadReaderToChunks(w http.ResponseWriter, r *http.Reque
 		fs.filer.DeleteChunks(fileChunks)
 		return nil, md5Hash, 0, uploadErr, nil
 	}
-	slices.SortFunc(fileChunks, func(a, b *filer_pb.FileChunk) bool {
-		return a.Offset < b.Offset
+	slices.SortFunc(fileChunks, func(a, b *filer_pb.FileChunk) int {
+		return int(a.Offset - b.Offset)
 	})
 	return fileChunks, md5Hash, chunkOffset, nil, smallContent
 }