1 files changed, 11 insertions, 24 deletions
diff --git a/weed/storage/file_id.go b/weed/storage/file_id.go
index 4cfdb16fa..0871bfb25 100644
--- a/weed/storage/file_id.go
+++ b/weed/storage/file_id.go
@@ -2,40 +2,27 @@ package storage
 
 import (
 	"encoding/hex"
-	"errors"
-	"strings"
-
-	"github.com/chrislusf/seaweedfs/weed/glog"
-	"github.com/chrislusf/seaweedfs/weed/util"
+	. "github.com/chrislusf/seaweedfs/weed/storage/types"
 )
 
 type FileId struct {
 	VolumeId VolumeId
-	Key      uint64
-	Hashcode uint32
+	Key      NeedleId
+	Cookie   Cookie
 }
 
 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}
+	return &FileId{VolumeId: VolumeId, Key: n.Id, Cookie: n.Cookie}
 }
-func ParseFileId(fid string) (*FileId, error) {
-	a := strings.Split(fid, ",")
-	if len(a) != 2 {
-		glog.V(1).Infoln("Invalid fid ", fid, ", split length ", len(a))
-		return nil, errors.New("Invalid fid " + fid)
-	}
-	vid_string, key_hash_string := a[0], a[1]
-	volumeId, _ := NewVolumeId(vid_string)
-	key, hash, e := ParseKeyHash(key_hash_string)
-	return &FileId{VolumeId: volumeId, Key: key, Hashcode: hash}, e
+
+func NewFileId(VolumeId VolumeId, key uint64, cookie uint32) *FileId {
+	return &FileId{VolumeId: VolumeId, Key: Uint64ToNeedleId(key), Cookie: Uint32ToCookie(cookie)}
 }
+
 func (n *FileId) String() string {
-	bytes := make([]byte, 12)
-	util.Uint64toBytes(bytes[0:8], n.Key)
-	util.Uint32toBytes(bytes[8:12], n.Hashcode)
+	bytes := make([]byte, NeedleIdSize+CookieSize)
+	NeedleIdToBytes(bytes[0:NeedleIdSize], n.Key)
+	CookieToBytes(bytes[NeedleIdSize:NeedleIdSize+CookieSize], n.Cookie)
 	nonzero_index := 0
 	for ; bytes[nonzero_index] == 0; nonzero_index++ {
 	}