diff options
| author | Chris Lu <chris.lu@gmail.com> | 2014-03-23 21:57:10 -0700 |
|---|---|---|
| committer | Chris Lu <chris.lu@gmail.com> | 2014-03-23 21:57:10 -0700 |
| commit | a0955aa4dd909f64eabfac87cf0d878c8e768d0d (patch) | |
| tree | 409f714b486d3f18002de5bde23b8a11af740114 /go | |
| parent | b1f083cb604483cc30d4bec21b69038dc7cb7e55 (diff) | |
| download | seaweedfs-a0955aa4dd909f64eabfac87cf0d878c8e768d0d.tar.xz seaweedfs-a0955aa4dd909f64eabfac87cf0d878c8e768d0d.zip | |
refactor functions
Diffstat (limited to 'go')
| -rw-r--r-- | go/storage/file_id.go | 3 | ||||
| -rw-r--r-- | go/storage/volume.go | 2 | ||||
| -rw-r--r-- | go/weed/export.go | 2 |
3 files changed, 6 insertions, 1 deletions
diff --git a/go/storage/file_id.go b/go/storage/file_id.go index b60f4ec21..5fcd8c387 100644 --- a/go/storage/file_id.go +++ b/go/storage/file_id.go @@ -14,6 +14,9 @@ type FileId struct { Hashcode uint32 } +func NewFileIdFromNeedle(VolumeId VolumeId, n *Needle) *FileId { + return &FileId{VolumeId: VolumeId, Key: n.Id, Hashcode: n.Cookie} +} func NewFileId(VolumeId VolumeId, Key uint64, Hashcode uint32) *FileId { return &FileId{VolumeId: VolumeId, Key: Key, Hashcode: Hashcode} } diff --git a/go/storage/volume.go b/go/storage/volume.go index 5421975b6..f0006f5cc 100644 --- a/go/storage/volume.go +++ b/go/storage/volume.go @@ -208,6 +208,7 @@ func (v *Volume) Destroy() (err error) { } func (v *Volume) write(n *Needle) (size uint32, err error) { + glog.V(4).Infof("writing needle %s", NewFileIdFromNeedle(v.Id, n).String()) if v.readOnly { err = fmt.Errorf("%s is read-only", v.dataFile) return @@ -249,6 +250,7 @@ func (v *Volume) write(n *Needle) (size uint32, err error) { } func (v *Volume) delete(n *Needle) (uint32, error) { + glog.V(4).Infof("delete needle %s", NewFileIdFromNeedle(v.Id, n).String()) if v.readOnly { return 0, fmt.Errorf("%s is read-only", v.dataFile) } diff --git a/go/weed/export.go b/go/weed/export.go index c5d4eb4d9..ef14e19c0 100644 --- a/go/weed/export.go +++ b/go/weed/export.go @@ -130,7 +130,7 @@ type nameParams struct { } func walker(vid storage.VolumeId, n *storage.Needle, version storage.Version) (err error) { - key := storage.NewFileId(vid, n.Id, n.Cookie).String() + key := storage.NewFileIdFromNeedle(vid, n).String() if tarFh != nil { fnTmplBuf.Reset() if err = fnTmpl.Execute(fnTmplBuf, |