gsh-digital-services/seaweedFS
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge interval now is quite faster with reusing slices

Browse Source
This commit is contained in:
Chris Lu
2018-11-18 21:24:58 -08:00
parent d2924c7748
commit 469863f7f0
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
weed/filer2/filechunks.go
View File

@@ -109,7 +109,7 @@ var bufPool = sync.Pool{
}, },
} }
func mergeIntoVisibles(visibles []*visibleInterval, chunk *filer_pb.FileChunk) (newVisibles []*visibleInterval) { func mergeIntoVisibles(visibles, newVisibles []*visibleInterval, chunk *filer_pb.FileChunk, ) ([]*visibleInterval) {
newV := newVisibleInterval( newV := newVisibleInterval(
chunk.Offset, chunk.Offset,
@@ -160,7 +160,7 @@ func mergeIntoVisibles(visibles []*visibleInterval, chunk *filer_pb.FileChunk) (
} }
} }
return return newVisibles
} }
func nonOverlappingVisibleIntervals(chunks []*filer_pb.FileChunk) (visibles []*visibleInterval) { func nonOverlappingVisibleIntervals(chunks []*filer_pb.FileChunk) (visibles []*visibleInterval) {
@@ -169,8 +169,12 @@ func nonOverlappingVisibleIntervals(chunks []*filer_pb.FileChunk) (visibles []*v
return chunks[i].Mtime < chunks[j].Mtime return chunks[i].Mtime < chunks[j].Mtime
}) })
var newVislbles []*visibleInterval
for _, chunk := range chunks { for _, chunk := range chunks {
visibles = mergeIntoVisibles(visibles, chunk) newVislbles = mergeIntoVisibles(visibles, newVislbles, chunk)
t := visibles[:0]
visibles = newVislbles
newVislbles = t
} }
logPrintf("visibles", visibles) logPrintf("visibles", visibles)