aboutsummaryrefslogtreecommitdiff
path: root/weed/filer/filechunks_read.go
diff options
context:
space:
mode:
authorchrislu <chris.lu@gmail.com>2023-09-18 16:12:50 -0700
committerchrislu <chris.lu@gmail.com>2023-09-18 16:12:50 -0700
commit8cb42c39adbbe7f082009cf91eccb4d2dc527235 (patch)
treea4a54f1e1211e273bede5ecc39ed9513316c596d /weed/filer/filechunks_read.go
parent2e5aa06026750c99ea283181974d2ccfe5eb0468 (diff)
downloadseaweedfs-8cb42c39adbbe7f082009cf91eccb4d2dc527235.tar.xz
seaweedfs-8cb42c39adbbe7f082009cf91eccb4d2dc527235.zip
Revert "Merge branch 'master' of https://github.com/seaweedfs/seaweedfs"
This reverts commit 2e5aa06026750c99ea283181974d2ccfe5eb0468, reversing changes made to 4d414f54a224142f3f4d934f4af3b5dceb6fec6b.
Diffstat (limited to 'weed/filer/filechunks_read.go')
-rw-r--r--weed/filer/filechunks_read.go14
1 files changed, 4 insertions, 10 deletions
diff --git a/weed/filer/filechunks_read.go b/weed/filer/filechunks_read.go
index b8768ed63..8b2d36e12 100644
--- a/weed/filer/filechunks_read.go
+++ b/weed/filer/filechunks_read.go
@@ -30,20 +30,14 @@ func readResolvedChunks(chunks []*filer_pb.FileChunk, startOffset int64, stopOff
isStart: false,
})
}
- slices.SortFunc(points, func(a, b *Point) int {
+ slices.SortFunc(points, func(a, b *Point) bool {
if a.x != b.x {
- return int(a.x - b.x)
+ return a.x < b.x
}
if a.ts != b.ts {
- return int(a.ts - b.ts)
+ return a.ts < b.ts
}
- if a.isStart {
- return -1
- }
- if b.isStart {
- return 1
- }
- return 0
+ return !a.isStart
})
var prevX int64