mirror of
https://github.com/seaweedfs/seaweedfs.git
synced 2025-10-21 07:17:25 +08:00
refactoring to typed Size
Go is amazing with refactoring!
This commit is contained in:
@@ -5,12 +5,11 @@ import (
|
||||
|
||||
"github.com/chrislusf/seaweedfs/weed/glog"
|
||||
"github.com/chrislusf/seaweedfs/weed/storage/types"
|
||||
"github.com/chrislusf/seaweedfs/weed/util"
|
||||
)
|
||||
|
||||
// walks through the index file, calls fn function with each key, offset, size
|
||||
// stops with the error returned by the fn function
|
||||
func WalkIndexFile(r io.ReaderAt, fn func(key types.NeedleId, offset types.Offset, size uint32) error) error {
|
||||
func WalkIndexFile(r io.ReaderAt, fn func(key types.NeedleId, offset types.Offset, size types.Size) error) error {
|
||||
var readerOffset int64
|
||||
bytes := make([]byte, types.NeedleMapEntrySize*RowsToRead)
|
||||
count, e := r.ReadAt(bytes, readerOffset)
|
||||
@@ -22,7 +21,7 @@ func WalkIndexFile(r io.ReaderAt, fn func(key types.NeedleId, offset types.Offse
|
||||
var (
|
||||
key types.NeedleId
|
||||
offset types.Offset
|
||||
size uint32
|
||||
size types.Size
|
||||
i int
|
||||
)
|
||||
|
||||
@@ -43,10 +42,10 @@ func WalkIndexFile(r io.ReaderAt, fn func(key types.NeedleId, offset types.Offse
|
||||
return e
|
||||
}
|
||||
|
||||
func IdxFileEntry(bytes []byte) (key types.NeedleId, offset types.Offset, size uint32) {
|
||||
func IdxFileEntry(bytes []byte) (key types.NeedleId, offset types.Offset, size types.Size) {
|
||||
key = types.BytesToNeedleId(bytes[:types.NeedleIdSize])
|
||||
offset = types.BytesToOffset(bytes[types.NeedleIdSize : types.NeedleIdSize+types.OffsetSize])
|
||||
size = util.BytesToUint32(bytes[types.NeedleIdSize+types.OffsetSize : types.NeedleIdSize+types.OffsetSize+types.SizeSize])
|
||||
size = types.BytesToSize(bytes[types.NeedleIdSize+types.OffsetSize : types.NeedleIdSize+types.OffsetSize+types.SizeSize])
|
||||
return
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user