diff options
| author | Chris Lu <chris.lu@gmail.com> | 2020-08-17 11:12:10 -0700 |
|---|---|---|
| committer | Chris Lu <chris.lu@gmail.com> | 2020-08-17 11:12:10 -0700 |
| commit | 9d46c7bc78987b1b02236030e9ca0af3f8c9e4f4 (patch) | |
| tree | cc7271167a292e9a5063b96dc94944c4a4dc6715 | |
| parent | 4ccfdaeb4dd7a20c50414b1a3f5a4c37cacf6774 (diff) | |
| download | seaweedfs-9d46c7bc78987b1b02236030e9ca0af3f8c9e4f4.tar.xz seaweedfs-9d46c7bc78987b1b02236030e9ca0af3f8c9e4f4.zip | |
rename
| -rw-r--r-- | weed/filesys/dirty_page.go | 4 | ||||
| -rw-r--r-- | weed/filesys/dirty_page_interval.go | 2 | ||||
| -rw-r--r-- | weed/filesys/filehandle.go | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/weed/filesys/dirty_page.go b/weed/filesys/dirty_page.go index 9e8ec1702..bfb417ea9 100644 --- a/weed/filesys/dirty_page.go +++ b/weed/filesys/dirty_page.go @@ -172,11 +172,11 @@ func min(x, y int64) int64 { return y } -func (pages *ContinuousDirtyPages) ReadDirtyData(data []byte, startOffset int64) (maxStop int64) { +func (pages *ContinuousDirtyPages) ReadDirtyDataAt(data []byte, startOffset int64) (maxStop int64) { pages.lock.Lock() defer pages.lock.Unlock() - return pages.intervals.ReadData(data, startOffset) + return pages.intervals.ReadDataAt(data, startOffset) } diff --git a/weed/filesys/dirty_page_interval.go b/weed/filesys/dirty_page_interval.go index 10b74bb68..afa2755ed 100644 --- a/weed/filesys/dirty_page_interval.go +++ b/weed/filesys/dirty_page_interval.go @@ -185,7 +185,7 @@ func (c *ContinuousIntervals) removeList(target *IntervalLinkedList) { } -func (c *ContinuousIntervals) ReadData(data []byte, startOffset int64) (maxStop int64) { +func (c *ContinuousIntervals) ReadDataAt(data []byte, startOffset int64) (maxStop int64) { for _, list := range c.lists { start := max(startOffset, list.Offset()) stop := min(startOffset+int64(len(data)), list.Offset()+list.Size()) diff --git a/weed/filesys/filehandle.go b/weed/filesys/filehandle.go index a40135b42..c3d49b16b 100644 --- a/weed/filesys/filehandle.go +++ b/weed/filesys/filehandle.go @@ -80,7 +80,7 @@ func (fh *FileHandle) Read(ctx context.Context, req *fuse.ReadRequest, resp *fus } func (fh *FileHandle) readFromDirtyPages(buff []byte, startOffset int64) (maxStop int64) { - return fh.dirtyPages.ReadDirtyData(buff, startOffset) + return fh.dirtyPages.ReadDirtyDataAt(buff, startOffset) } func (fh *FileHandle) readFromChunks(buff []byte, offset int64) (int64, error) { |