diff options
| author | chrislu <chris.lu@gmail.com> | 2023-09-25 09:35:16 -0700 |
|---|---|---|
| committer | chrislu <chris.lu@gmail.com> | 2023-09-25 09:35:16 -0700 |
| commit | 645ae8c57bc449cbb298e90d1ad19f7d2153aea0 (patch) | |
| tree | 08458e352ea27e8e673a3670269ec84f04512d77 /weed/filer/filechunks_read.go | |
| parent | 3d07895518b2b6e816518be0a2355c1f0a98ff15 (diff) | |
| download | seaweedfs-645ae8c57bc449cbb298e90d1ad19f7d2153aea0.tar.xz seaweedfs-645ae8c57bc449cbb298e90d1ad19f7d2153aea0.zip | |
Revert "Revert "Merge branch 'master' of https://github.com/seaweedfs/seaweedfs""
This reverts commit 8cb42c39
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 |