This commit is contained in:
Chris Lu
2018-11-18 11:51:38 -08:00
parent 9655dc9ca9
commit 4fcfc9410f
6 changed files with 34 additions and 8 deletions

View File

@@ -4,6 +4,7 @@ import (
"fmt"
"hash/fnv"
"sort"
"sync"
"github.com/chrislusf/seaweedfs/weed/pb/filer_pb"
)
@@ -46,6 +47,8 @@ func CompactFileChunks(chunks []*filer_pb.FileChunk) (compacted, garbage []*file
}
}
cleanupIntervals(visibles)
return
}
@@ -89,6 +92,8 @@ func ViewFromChunks(chunks []*filer_pb.FileChunk, offset int64, size int) (views
}
}
cleanupIntervals(visibles)
return views
}
@@ -102,6 +107,12 @@ func logPrintf(name string, visibles []*visibleInterval) {
*/
}
var bufPool = sync.Pool{
New: func() interface{} {
return new(visibleInterval)
},
}
func mergeIntoVisibles(visibles []*visibleInterval, chunk *filer_pb.FileChunk) (newVisibles []*visibleInterval) {
for _, v := range visibles {
if v.start < chunk.Offset && chunk.Offset < v.stop {
@@ -153,6 +164,12 @@ func nonOverlappingVisibleIntervals(chunks []*filer_pb.FileChunk) (visibles []*v
return
}
func cleanupIntervals(visibles []*visibleInterval) {
for _, v := range visibles {
bufPool.Put(v)
}
}
// find non-overlapping visible intervals
// visible interval map to one file chunk
@@ -164,7 +181,12 @@ type visibleInterval struct {
}
func newVisibleInterval(start, stop int64, fileId string, modifiedTime int64) *visibleInterval {
return &visibleInterval{start: start, stop: stop, fileId: fileId, modifiedTime: modifiedTime}
b := bufPool.Get().(*visibleInterval)
b.start = start
b.stop = stop
b.fileId = fileId
b.modifiedTime = modifiedTime
return b
}
func min(x, y int64) int64 {