gitlab-com-seaweedfs/seaweedfs
1
0
Fork 0
mirror of https://github.com/seaweedfs/seaweedfs.git synced 2024-01-19 02:48:24 +00:00
Code Issues Projects Releases Wiki Activity

change name: needle id instead of needle key

Browse source
This commit is contained in:
Chris Lu 2012-08-23 23:06:15 -07:00
parent 9f92f2779d
commit b820609088
3 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
weed-fs/src/cmd/weed/fix.go
View file

@ -52,10 +52,10 @@ func runFix(cmd *Command, args []string) bool {
offset := uint32(storage.SuperBlockSize) offset := uint32(storage.SuperBlockSize)
for n != nil { for n != nil {
if *IsDebug { if *IsDebug {
log.Println("key", n.Key, "volume offset", offset, "data_size", n.Size, "length", length) log.Println("key", n.Id, "volume offset", offset, "data_size", n.Size, "length", length)
} }
if n.Size > 0 { if n.Size > 0 {
count, pe := nm.Put(n.Key, offset/8, n.Size) count, pe := nm.Put(n.Id, offset/8, n.Size)
if *IsDebug { if *IsDebug {
log.Println("saved", count, "with error", pe) log.Println("saved", count, "with error", pe)
} }

12
weed-fs/src/pkg/storage/needle.go
View file

@ -15,7 +15,7 @@ import (
type Needle struct { type Needle struct {
Cookie uint32 "random number to mitigate brute force lookups" Cookie uint32 "random number to mitigate brute force lookups"
Key uint64 "file id" Id uint64 "needle id"
Size uint32 "Data size" Size uint32 "Data size"
Data []byte "The actual file data" Data []byte "The actual file data"
Checksum int32 "CRC32 to check integrity" Checksum int32 "CRC32 to check integrity"
@ -69,18 +69,18 @@ func (n *Needle) ParsePath(fid string) {
if deltaIndex > 0 { if deltaIndex > 0 {
fid, delta = fid[0:deltaIndex], fid[deltaIndex+1:] fid, delta = fid[0:deltaIndex], fid[deltaIndex+1:]
} }
n.Key, n.Cookie = ParseKeyHash(fid) n.Id, n.Cookie = ParseKeyHash(fid)
if delta != "" { if delta != "" {
d, e := strconv.ParseUint(delta, 10, 64) d, e := strconv.ParseUint(delta, 10, 64)
if e == nil { if e == nil {
n.Key += d n.Id += d
} }
} }
} }
func (n *Needle) Append(w io.Writer) uint32 { func (n *Needle) Append(w io.Writer) uint32 {
header := make([]byte, 16) header := make([]byte, 16)
util.Uint32toBytes(header[0:4], n.Cookie) util.Uint32toBytes(header[0:4], n.Cookie)
util.Uint64toBytes(header[4:12], n.Key) util.Uint64toBytes(header[4:12], n.Id)
n.Size = uint32(len(n.Data)) n.Size = uint32(len(n.Data))
util.Uint32toBytes(header[12:16], n.Size) util.Uint32toBytes(header[12:16], n.Size)
w.Write(header) w.Write(header)
@ -94,7 +94,7 @@ func (n *Needle) Read(r io.Reader, size uint32) (int, error) {
bytes := make([]byte, size+16+4) bytes := make([]byte, size+16+4)
ret, e := r.Read(bytes) ret, e := r.Read(bytes)
n.Cookie = util.BytesToUint32(bytes[0:4]) n.Cookie = util.BytesToUint32(bytes[0:4])
n.Key = util.BytesToUint64(bytes[4:12]) n.Id = util.BytesToUint64(bytes[4:12])
n.Size = util.BytesToUint32(bytes[12:16]) n.Size = util.BytesToUint32(bytes[12:16])
n.Data = bytes[16 : 16+size] n.Data = bytes[16 : 16+size]
n.Checksum = int32(util.BytesToUint32(bytes[16+size : 16+size+4])) n.Checksum = int32(util.BytesToUint32(bytes[16+size : 16+size+4]))
@ -108,7 +108,7 @@ func ReadNeedle(r *os.File) (*Needle, uint32) {
return nil, 0 return nil, 0
} }
n.Cookie = util.BytesToUint32(bytes[0:4]) n.Cookie = util.BytesToUint32(bytes[0:4])
n.Key = util.BytesToUint64(bytes[4:12]) n.Id = util.BytesToUint64(bytes[4:12])
n.Size = util.BytesToUint32(bytes[12:16]) n.Size = util.BytesToUint32(bytes[12:16])
rest := 8 - ((n.Size + 16 + 4) % 8) rest := 8 - ((n.Size + 16 + 4) % 8)
r.Seek(int64(n.Size+4+rest), 1) r.Seek(int64(n.Size+4+rest), 1)

12
weed-fs/src/pkg/storage/volume.go
View file

@ -76,19 +76,19 @@ func (v *Volume) write(n *Needle) uint32 {
defer v.accessLock.Unlock() defer v.accessLock.Unlock()
offset, _ := v.dataFile.Seek(0, 2) offset, _ := v.dataFile.Seek(0, 2)
ret := n.Append(v.dataFile) ret := n.Append(v.dataFile)
nv, ok := v.nm.Get(n.Key) nv, ok := v.nm.Get(n.Id)
if !ok || int64(nv.Offset)*8 < offset { if !ok || int64(nv.Offset)*8 < offset {
v.nm.Put(n.Key, uint32(offset/8), n.Size) v.nm.Put(n.Id, uint32(offset/8), n.Size)
} }
return ret return ret
} }
func (v *Volume) delete(n *Needle) uint32 { func (v *Volume) delete(n *Needle) uint32 {
v.accessLock.Lock() v.accessLock.Lock()
defer v.accessLock.Unlock() defer v.accessLock.Unlock()
nv, ok := v.nm.Get(n.Key) nv, ok := v.nm.Get(n.Id)
//log.Println("key", n.Key, "volume offset", nv.Offset, "data_size", n.Size, "cached size", nv.Size) //log.Println("key", n.Id, "volume offset", nv.Offset, "data_size", n.Size, "cached size", nv.Size)
if ok { if ok {
v.nm.Delete(n.Key) v.nm.Delete(n.Id)
v.dataFile.Seek(int64(nv.Offset*8), 0) v.dataFile.Seek(int64(nv.Offset*8), 0)
n.Append(v.dataFile) n.Append(v.dataFile)
return nv.Size return nv.Size
@ -98,7 +98,7 @@ func (v *Volume) delete(n *Needle) uint32 {
func (v *Volume) read(n *Needle) (int, error) { func (v *Volume) read(n *Needle) (int, error) {
v.accessLock.Lock() v.accessLock.Lock()
defer v.accessLock.Unlock() defer v.accessLock.Unlock()
nv, ok := v.nm.Get(n.Key) nv, ok := v.nm.Get(n.Id)
if ok && nv.Offset > 0 { if ok && nv.Offset > 0 {
v.dataFile.Seek(int64(nv.Offset)*8, 0) v.dataFile.Seek(int64(nv.Offset)*8, 0)
return n.Read(v.dataFile, nv.Size) return n.Read(v.dataFile, nv.Size)