diff options
| author | chrislu <chris.lu@gmail.com> | 2022-02-26 03:00:08 -0800 |
|---|---|---|
| committer | chrislu <chris.lu@gmail.com> | 2022-02-26 03:00:08 -0800 |
| commit | b2a148cb4cdea40a70e496e83351c977ce363ebd (patch) | |
| tree | 3a7f04f76d7cff01240d2af7725a30cc3b0041d5 /weed/filesys | |
| parent | 2ab0ad24a3451410f7ff0fd6cbd9ae5bb5c33634 (diff) | |
| download | seaweedfs-b2a148cb4cdea40a70e496e83351c977ce363ebd.tar.xz seaweedfs-b2a148cb4cdea40a70e496e83351c977ce363ebd.zip | |
use file size as max range
Diffstat (limited to 'weed/filesys')
| -rw-r--r-- | weed/filesys/filehandle.go | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/weed/filesys/filehandle.go b/weed/filesys/filehandle.go index ad0afc90e..35f87373e 100644 --- a/weed/filesys/filehandle.go +++ b/weed/filesys/filehandle.go @@ -4,7 +4,6 @@ import ( "context" "fmt" "io" - "math" "net/http" "os" "sync" @@ -148,7 +147,7 @@ func (fh *FileHandle) readFromChunks(buff []byte, offset int64) (int64, error) { var chunkResolveErr error if fh.entryViewCache == nil { - fh.entryViewCache, chunkResolveErr = filer.NonOverlappingVisibleIntervals(fh.f.wfs.LookupFn(), entry.Chunks, 0, math.MaxInt64) + fh.entryViewCache, chunkResolveErr = filer.NonOverlappingVisibleIntervals(fh.f.wfs.LookupFn(), entry.Chunks, 0, fileSize) if chunkResolveErr != nil { return 0, fmt.Errorf("fail to resolve chunk manifest: %v", chunkResolveErr) } @@ -157,7 +156,7 @@ func (fh *FileHandle) readFromChunks(buff []byte, offset int64) (int64, error) { reader := fh.reader if reader == nil { - chunkViews := filer.ViewFromVisibleIntervals(fh.entryViewCache, 0, math.MaxInt64) + chunkViews := filer.ViewFromVisibleIntervals(fh.entryViewCache, 0, fileSize) glog.V(4).Infof("file handle read %s [%d,%d) from %d views", fileFullPath, offset, offset+int64(len(buff)), len(chunkViews)) for _, chunkView := range chunkViews { glog.V(4).Infof(" read %s [%d,%d) from chunk %+v", fileFullPath, chunkView.LogicOffset, chunkView.LogicOffset+int64(chunkView.Size), chunkView.FileId) |