diff options
| author | Chris Lu <chris.lu@gmail.com> | 2014-01-21 20:51:46 -0800 |
|---|---|---|
| committer | Chris Lu <chris.lu@gmail.com> | 2014-01-21 20:51:46 -0800 |
| commit | cda2a6b51014822217ad97a9a43990f19d5faa96 (patch) | |
| tree | 0a6a1bd07c8e0f4540fe974b922bf7d4c701be04 /go | |
| parent | bd6e1a8a70b99680625ade9276c615d77157cae9 (diff) | |
| download | seaweedfs-cda2a6b51014822217ad97a9a43990f19d5faa96.tar.xz seaweedfs-cda2a6b51014822217ad97a9a43990f19d5faa96.zip | |
trivial refactoring
Diffstat (limited to 'go')
| -rw-r--r-- | go/storage/volume.go | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/go/storage/volume.go b/go/storage/volume.go index d7aa8dcd9..f3cfe2194 100644 --- a/go/storage/volume.go +++ b/go/storage/volume.go @@ -53,14 +53,17 @@ func loadVolumeWithoutIndex(dirname string, collection string, id VolumeId) (v * e = v.load(false) return } +func (v *Volume) FileName() (fileName string) { + if v.Collection == "" { + fileName = path.Join(v.dir, v.Id.String()) + } else { + fileName = path.Join(v.dir, v.Collection+"_"+v.Id.String()) + } + return +} func (v *Volume) load(alsoLoadIndex bool) error { var e error - var fileName string - if v.Collection == "" { - fileName = path.Join(v.dir, v.Id.String()) - } else { - fileName = path.Join(v.dir, v.Collection+"_"+v.Id.String()) - } + fileName := v.FileName() if exists, canRead, canWrite, _ := checkFile(fileName + ".dat"); exists && !canRead { return fmt.Errorf("cannot read Volume Data file %s.dat", fileName) } else if !exists || canWrite { |