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/filer/filechunks_read.go | |
| 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/filer/filechunks_read.go')
| -rw-r--r-- | weed/filer/filechunks_read.go | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/weed/filer/filechunks_read.go b/weed/filer/filechunks_read.go index 8b2d36e12..b8768ed63 100644 --- a/weed/filer/filechunks_read.go +++ b/weed/filer/filechunks_read.go @@ -30,14 +30,20 @@ func readResolvedChunks(chunks []*filer_pb.FileChunk, startOffset int64, stopOff isStart: false, }) } - slices.SortFunc(points, func(a, b *Point) bool { + slices.SortFunc(points, func(a, b *Point) int { if a.x != b.x { - return a.x < b.x + return int(a.x - b.x) } if a.ts != b.ts { - return a.ts < b.ts + return int(a.ts - b.ts) } - return !a.isStart + if a.isStart { + return -1 + } + if b.isStart { + return 1 + } + return 0 }) var prevX int64 |