diff options
| author | Chris Lu <chris.lu@gmail.com> | 2018-12-31 15:10:14 -0800 |
|---|---|---|
| committer | Chris Lu <chris.lu@gmail.com> | 2018-12-31 15:10:14 -0800 |
| commit | 832ac8129a9de031658af2c44f7327dd0ea1e9f4 (patch) | |
| tree | d99036fa615f85b0b2658509b47e73082052ed2f | |
| parent | 1478d7ea211f4b390d3906e8c773f26074900d1a (diff) | |
| download | seaweedfs-832ac8129a9de031658af2c44f7327dd0ea1e9f4.tar.xz seaweedfs-832ac8129a9de031658af2c44f7327dd0ea1e9f4.zip | |
reduce pointer usage
| -rw-r--r-- | weed/filer2/filechunks.go | 14 | ||||
| -rw-r--r-- | weed/filesys/file.go | 2 |
2 files changed, 8 insertions, 8 deletions
diff --git a/weed/filer2/filechunks.go b/weed/filer2/filechunks.go index 1cdd4d852..0a53e4ecc 100644 --- a/weed/filer2/filechunks.go +++ b/weed/filer2/filechunks.go @@ -81,7 +81,7 @@ func ViewFromChunks(chunks []*filer_pb.FileChunk, offset int64, size int) (views } -func ViewFromVisibleIntervals(visibles []*VisibleInterval, offset int64, size int) (views []*ChunkView) { +func ViewFromVisibleIntervals(visibles []VisibleInterval, offset int64, size int) (views []*ChunkView) { stop := offset + int64(size) @@ -103,7 +103,7 @@ func ViewFromVisibleIntervals(visibles []*VisibleInterval, offset int64, size in } -func logPrintf(name string, visibles []*VisibleInterval) { +func logPrintf(name string, visibles []VisibleInterval) { /* log.Printf("%s len %d", name, len(visibles)) for _, v := range visibles { @@ -118,7 +118,7 @@ var bufPool = sync.Pool{ }, } -func mergeIntoVisibles(visibles, newVisibles []*VisibleInterval, chunk *filer_pb.FileChunk) []*VisibleInterval { +func mergeIntoVisibles(visibles, newVisibles []VisibleInterval, chunk *filer_pb.FileChunk) []VisibleInterval { newV := newVisibleInterval( chunk.Offset, @@ -179,13 +179,13 @@ func mergeIntoVisibles(visibles, newVisibles []*VisibleInterval, chunk *filer_pb return newVisibles } -func NonOverlappingVisibleIntervals(chunks []*filer_pb.FileChunk) (visibles []*VisibleInterval) { +func NonOverlappingVisibleIntervals(chunks []*filer_pb.FileChunk) (visibles []VisibleInterval) { sort.Slice(chunks, func(i, j int) bool { return chunks[i].Mtime < chunks[j].Mtime }) - var newVislbles []*VisibleInterval + var newVislbles []VisibleInterval for _, chunk := range chunks { newVislbles = mergeIntoVisibles(visibles, newVislbles, chunk) t := visibles[:0] @@ -210,8 +210,8 @@ type VisibleInterval struct { isFullChunk bool } -func newVisibleInterval(start, stop int64, fileId string, modifiedTime int64, isFullChunk bool) *VisibleInterval { - return &VisibleInterval{ +func newVisibleInterval(start, stop int64, fileId string, modifiedTime int64, isFullChunk bool) VisibleInterval { + return VisibleInterval{ start: start, stop: stop, fileId: fileId, diff --git a/weed/filesys/file.go b/weed/filesys/file.go index a9e763a1b..a2ffa0547 100644 --- a/weed/filesys/file.go +++ b/weed/filesys/file.go @@ -24,7 +24,7 @@ type File struct { dir *Dir wfs *WFS entry *filer_pb.Entry - entryViewCache []*filer2.VisibleInterval + entryViewCache []filer2.VisibleInterval isOpen bool } |