file handler directly read from volume servers

this mostly works fine now!

next: need to cache files to local disk

1 files changed, 13 insertions, 5 deletions

diff --git a/weed/filer2/filechunks.go b/weed/filer2/filechunks.go
index 93cee81de..6bdfbd48e 100644
--- a/weed/filer2/filechunks.go
+++ b/weed/filer2/filechunks.go
@@ -52,7 +52,14 @@ func FindUnusedFileChunks(oldChunks, newChunks []*filer_pb.FileChunk) (unused []
 	return
 }
 
-func ReadFromChunks(chunks []*filer_pb.FileChunk, offset int64, size int) (views []*filer_pb.FileChunk) {
+type ChunkView struct {
+	FileId      string
+	Offset      int64
+	Size        uint64
+	LogicOffset int64
+}
+
+func ReadFromChunks(chunks []*filer_pb.FileChunk, offset int64, size int) (views []*ChunkView) {
 
 	visibles := nonOverlappingVisibleIntervals(chunks)
 
@@ -60,10 +67,11 @@ func ReadFromChunks(chunks []*filer_pb.FileChunk, offset int64, size int) (views
 
 	for _, chunk := range visibles {
 		if chunk.start <= offset && offset < chunk.stop {
-			views = append(views, &filer_pb.FileChunk{
-				FileId: chunk.fileId,
-				Offset: offset - chunk.start, // offset is the data starting location in this file id
-				Size:   uint64(min(chunk.stop, stop) - offset),
+			views = append(views, &ChunkView{
+				FileId:      chunk.fileId,
+				Offset:      offset - chunk.start, // offset is the data starting location in this file id
+				Size:        uint64(min(chunk.stop, stop) - offset),
+				LogicOffset: offset,
 			})
 			offset = min(chunk.stop, stop)
 		}