diff options
| author | Chris Lu <chris.lu@gmail.com> | 2020-04-11 12:45:24 -0700 |
|---|---|---|
| committer | Chris Lu <chris.lu@gmail.com> | 2020-04-11 12:45:24 -0700 |
| commit | d7f3acb2c056534f29950f3586d804ec274349b2 (patch) | |
| tree | 0fa0f3326a71f97514374888ebc019afdfde3dcc | |
| parent | ed5468259867502facd8df0e3e90574421abfc94 (diff) | |
| download | seaweedfs-d7f3acb2c056534f29950f3586d804ec274349b2.tar.xz seaweedfs-d7f3acb2c056534f29950f3586d804ec274349b2.zip | |
refactor
| -rw-r--r-- | weed/filer2/reader_at.go | 6 | ||||
| -rw-r--r-- | weed/filesys/wfs.go | 6 | ||||
| -rw-r--r-- | weed/server/webdav_server.go | 6 | ||||
| -rw-r--r-- | weed/util/chunk_cache/chunk_cache.go (renamed from weed/util/pb_cache/chunk_cache.go) | 2 |
4 files changed, 10 insertions, 10 deletions
diff --git a/weed/filer2/reader_at.go b/weed/filer2/reader_at.go index 448aa3465..2782cc204 100644 --- a/weed/filer2/reader_at.go +++ b/weed/filer2/reader_at.go @@ -10,7 +10,7 @@ import ( "github.com/chrislusf/seaweedfs/weed/glog" "github.com/chrislusf/seaweedfs/weed/pb/filer_pb" "github.com/chrislusf/seaweedfs/weed/util" - "github.com/chrislusf/seaweedfs/weed/util/pb_cache" + "github.com/chrislusf/seaweedfs/weed/util/chunk_cache" "github.com/chrislusf/seaweedfs/weed/wdclient" ) @@ -22,12 +22,12 @@ type ChunkReadAt struct { lookupFileId func(fileId string) (targetUrl string, err error) readerLock sync.Mutex - chunkCache *pb_cache.ChunkCache + chunkCache *chunk_cache.ChunkCache } // var _ = io.ReaderAt(&ChunkReadAt{}) -func NewChunkReaderAtFromClient(filerClient filer_pb.FilerClient, chunkViews []*ChunkView, chunkCache *pb_cache.ChunkCache) *ChunkReadAt { +func NewChunkReaderAtFromClient(filerClient filer_pb.FilerClient, chunkViews []*ChunkView, chunkCache *chunk_cache.ChunkCache) *ChunkReadAt { return &ChunkReadAt{ chunkViews: chunkViews, diff --git a/weed/filesys/wfs.go b/weed/filesys/wfs.go index 5e994d14e..49db18b6e 100644 --- a/weed/filesys/wfs.go +++ b/weed/filesys/wfs.go @@ -16,7 +16,7 @@ import ( "github.com/chrislusf/seaweedfs/weed/pb" "github.com/chrislusf/seaweedfs/weed/pb/filer_pb" "github.com/chrislusf/seaweedfs/weed/util" - "github.com/chrislusf/seaweedfs/weed/util/pb_cache" + "github.com/chrislusf/seaweedfs/weed/util/chunk_cache" "github.com/seaweedfs/fuse" "github.com/seaweedfs/fuse/fs" ) @@ -64,7 +64,7 @@ type WFS struct { root fs.Node fsNodeCache *FsCache - chunkCache *pb_cache.ChunkCache + chunkCache *chunk_cache.ChunkCache } type statsCache struct { filer_pb.StatisticsResponse @@ -81,7 +81,7 @@ func NewSeaweedFileSystem(option *Option) *WFS { return make([]byte, option.ChunkSizeLimit) }, }, - chunkCache: pb_cache.NewChunkCache(option.ChunkCacheCountLimit), + chunkCache: chunk_cache.NewChunkCache(option.ChunkCacheCountLimit), } wfs.root = &Dir{name: wfs.option.FilerMountRootPath, wfs: wfs} diff --git a/weed/server/webdav_server.go b/weed/server/webdav_server.go index 5a9861fe7..082755291 100644 --- a/weed/server/webdav_server.go +++ b/weed/server/webdav_server.go @@ -17,7 +17,7 @@ import ( "github.com/chrislusf/seaweedfs/weed/pb" "github.com/chrislusf/seaweedfs/weed/pb/filer_pb" "github.com/chrislusf/seaweedfs/weed/util" - "github.com/chrislusf/seaweedfs/weed/util/pb_cache" + "github.com/chrislusf/seaweedfs/weed/util/chunk_cache" "github.com/chrislusf/seaweedfs/weed/filer2" "github.com/chrislusf/seaweedfs/weed/glog" @@ -67,7 +67,7 @@ type WebDavFileSystem struct { secret security.SigningKey filer *filer2.Filer grpcDialOption grpc.DialOption - chunkCache *pb_cache.ChunkCache + chunkCache *chunk_cache.ChunkCache } type FileInfo struct { @@ -98,7 +98,7 @@ type WebDavFile struct { func NewWebDavFileSystem(option *WebDavOption) (webdav.FileSystem, error) { return &WebDavFileSystem{ option: option, - chunkCache: pb_cache.NewChunkCache(1000), + chunkCache: chunk_cache.NewChunkCache(1000), }, nil } diff --git a/weed/util/pb_cache/chunk_cache.go b/weed/util/chunk_cache/chunk_cache.go index d729bd8c1..e2676d9cc 100644 --- a/weed/util/pb_cache/chunk_cache.go +++ b/weed/util/chunk_cache/chunk_cache.go @@ -1,4 +1,4 @@ -package pb_cache +package chunk_cache import ( "time" |