refactoring: add type for needle id, offset

later the type size can possibly be adjusted

1 files changed, 18 insertions, 16 deletions

diff --git a/weed/storage/needle_map_memory.go b/weed/storage/needle_map_memory.go
index cfdffe3d6..690ddd737 100644
--- a/weed/storage/needle_map_memory.go
+++ b/weed/storage/needle_map_memory.go
@@ -6,6 +6,7 @@ import (
 
 	"github.com/chrislusf/seaweedfs/weed/glog"
 	"github.com/chrislusf/seaweedfs/weed/storage/needle"
+	. "github.com/chrislusf/seaweedfs/weed/storage/types"
 )
 
 type NeedleMap struct {
@@ -45,21 +46,21 @@ func LoadBtreeNeedleMap(file *os.File) (*NeedleMap, error) {
 }
 
 func doLoading(file *os.File, nm *NeedleMap) (*NeedleMap, error) {
-	e := WalkIndexFile(file, func(key uint64, offset, size uint32) error {
+	e := WalkIndexFile(file, func(key NeedleId, offset Offset, size uint32) error {
 		if key > nm.MaximumFileKey {
 			nm.MaximumFileKey = key
 		}
 		if offset > 0 && size != TombstoneFileSize {
 			nm.FileCounter++
 			nm.FileByteCounter = nm.FileByteCounter + uint64(size)
-			oldOffset, oldSize := nm.m.Set(needle.Key(key), offset, size)
+			oldOffset, oldSize := nm.m.Set(NeedleId(key), offset, size)
 			// glog.V(3).Infoln("reading key", key, "offset", offset*NeedlePaddingSize, "size", size, "oldSize", oldSize)
 			if oldOffset > 0 && oldSize != TombstoneFileSize {
 				nm.DeletionCounter++
 				nm.DeletionByteCounter = nm.DeletionByteCounter + uint64(oldSize)
 			}
 		} else {
-			oldSize := nm.m.Delete(needle.Key(key))
+			oldSize := nm.m.Delete(NeedleId(key))
 			// glog.V(3).Infoln("removing key", key, "offset", offset*NeedlePaddingSize, "size", size, "oldSize", oldSize)
 			nm.DeletionCounter++
 			nm.DeletionByteCounter = nm.DeletionByteCounter + uint64(oldSize)
@@ -72,21 +73,22 @@ func doLoading(file *os.File, nm *NeedleMap) (*NeedleMap, error) {
 
 // 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 *os.File, fn func(key uint64, offset, size uint32) error) error {
+func WalkIndexFile(r *os.File, fn func(key NeedleId, offset Offset, size uint32) error) error {
 	var readerOffset int64
-	bytes := make([]byte, NeedleIndexSize*RowsToRead)
+	bytes := make([]byte, NeedleEntrySize*RowsToRead)
 	count, e := r.ReadAt(bytes, readerOffset)
 	glog.V(3).Infoln("file", r.Name(), "readerOffset", readerOffset, "count", count, "e", e)
 	readerOffset += int64(count)
 	var (
-		key          uint64
-		offset, size uint32
-		i            int
+		key    NeedleId
+		offset Offset
+		size   uint32
+		i      int
 	)
 
 	for count > 0 && e == nil || e == io.EOF {
-		for i = 0; i+NeedleIndexSize <= count; i += NeedleIndexSize {
-			key, offset, size = idxFileEntry(bytes[i: i+NeedleIndexSize])
+		for i = 0; i+NeedleEntrySize <= count; i += NeedleEntrySize {
+			key, offset, size = IdxFileEntry(bytes[i: i+NeedleEntrySize])
 			if e = fn(key, offset, size); e != nil {
 				return e
 			}
@@ -101,17 +103,17 @@ func WalkIndexFile(r *os.File, fn func(key uint64, offset, size uint32) error) e
 	return e
 }
 
-func (nm *NeedleMap) Put(key uint64, offset uint32, size uint32) error {
-	_, oldSize := nm.m.Set(needle.Key(key), offset, size)
+func (nm *NeedleMap) Put(key NeedleId, offset Offset, size uint32) error {
+	_, oldSize := nm.m.Set(NeedleId(key), offset, size)
 	nm.logPut(key, oldSize, size)
 	return nm.appendToIndexFile(key, offset, size)
 }
-func (nm *NeedleMap) Get(key uint64) (element *needle.NeedleValue, ok bool) {
-	element, ok = nm.m.Get(needle.Key(key))
+func (nm *NeedleMap) Get(key NeedleId) (element *needle.NeedleValue, ok bool) {
+	element, ok = nm.m.Get(NeedleId(key))
 	return
 }
-func (nm *NeedleMap) Delete(key uint64, offset uint32) error {
-	deletedBytes := nm.m.Delete(needle.Key(key))
+func (nm *NeedleMap) Delete(key NeedleId, offset Offset) error {
+	deletedBytes := nm.m.Delete(NeedleId(key))
 	nm.logDelete(deletedBytes)
 	return nm.appendToIndexFile(key, offset, TombstoneFileSize)
 }