rename parameter and reuse functions

rename milestone to  watermark

weed/storage/idx/walk.go

@@ -9,42 +9,8 @@ import (
 
 // 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 types.Size) error) error {
-	var readerOffset int64
-	bytes := make([]byte, types.NeedleMapEntrySize*RowsToRead)
-	count, e := r.ReadAt(bytes, readerOffset)
-	if count == 0 && e == io.EOF {
-		return nil
-	}
-	glog.V(3).Infof("readerOffset %d count %d err: %v", readerOffset, count, e)
-	readerOffset += int64(count)
-	var (
-		key    types.NeedleId
-		offset types.Offset
-		size   types.Size
-		i      int
-	)
-
-	for count > 0 && e == nil || e == io.EOF {
-		for i = 0; i+types.NeedleMapEntrySize <= count; i += types.NeedleMapEntrySize {
-			key, offset, size = IdxFileEntry(bytes[i : i+types.NeedleMapEntrySize])
-			if e = fn(key, offset, size); e != nil {
-				return e
-			}
-		}
-		if e == io.EOF {
-			return nil
-		}
-		count, e = r.ReadAt(bytes, readerOffset)
-		glog.V(3).Infof("readerOffset %d count %d err: %v", readerOffset, count, e)
-		readerOffset += int64(count)
-	}
-	return e
-}
-
-//copied from WalkIndexFile, just init readerOffset from milestone
-func WalkIndexFileIncrement(r io.ReaderAt, milestone uint64, fn func(key types.NeedleId, offset types.Offset, size types.Size) error) error {
-	var readerOffset = int64(milestone * types.NeedleMapEntrySize)
+func WalkIndexFile(r io.ReaderAt, startFrom uint64, fn func(key types.NeedleId, offset types.Offset, size types.Size) error) error {
+	readerOffset := int64(startFrom * types.NeedleMapEntrySize)
 	bytes := make([]byte, types.NeedleMapEntrySize*RowsToRead)
 	count, e := r.ReadAt(bytes, readerOffset)
 	if count == 0 && e == io.EOF {