From 59022b6fe00f25ceef8d7a027cbc90bf14f7605e Mon Sep 17 00:00:00 2001
From: Chris Lu <chris.lu@gmail.com>
Date: Wed, 18 Jan 2017 08:34:44 -0800
Subject: [PATCH] fix byte counter on loading index file

fix https://github.com/chrislusf/seaweedfs/issues/441
---
 weed/storage/compact_map.go       | 11 +++++------
 weed/storage/needle_map_memory.go | 10 +++++-----
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/weed/storage/compact_map.go b/weed/storage/compact_map.go
index 721be2ec7..0f56922b8 100644
--- a/weed/storage/compact_map.go
+++ b/weed/storage/compact_map.go
@@ -39,14 +39,13 @@ func NewCompactSection(start Key) *CompactSection {
 }
 
 //return old entry size
-func (cs *CompactSection) Set(key Key, offset uint32, size uint32) uint32 {
-	ret := uint32(0)
+func (cs *CompactSection) Set(key Key, offset, size uint32) (oldOffset, oldSize uint32) {
 	cs.Lock()
 	if key > cs.end {
 		cs.end = key
 	}
 	if i := cs.binarySearchValues(key); i >= 0 {
-		ret = cs.values[i].Size
+		oldOffset, oldSize = cs.values[i].Offset, cs.values[i].Size
 		//println("key", key, "old size", ret)
 		cs.values[i].Offset, cs.values[i].Size = offset, size
 	} else {
@@ -55,7 +54,7 @@ func (cs *CompactSection) Set(key Key, offset uint32, size uint32) uint32 {
 		if needOverflow {
 			//println("start", cs.start, "counter", cs.counter, "key", key)
 			if oldValue, found := cs.overflow[key]; found {
-				ret = oldValue.Size
+				oldOffset, oldSize = oldValue.Offset, oldValue.Size
 			}
 			cs.overflow[key] = NeedleValue{Key: key, Offset: offset, Size: size}
 		} else {
@@ -66,7 +65,7 @@ func (cs *CompactSection) Set(key Key, offset uint32, size uint32) uint32 {
 		}
 	}
 	cs.Unlock()
-	return ret
+	return
 }
 
 //return old entry size
@@ -129,7 +128,7 @@ func NewCompactMap() CompactMap {
 	return CompactMap{}
 }
 
-func (cm *CompactMap) Set(key Key, offset uint32, size uint32) uint32 {
+func (cm *CompactMap) Set(key Key, offset, size uint32) (oldOffset, oldSize uint32) {
 	x := cm.binarySearchCompactSection(key)
 	if x < 0 {
 		//println(x, "creating", len(cm.list), "section, starting", key)
diff --git a/weed/storage/needle_map_memory.go b/weed/storage/needle_map_memory.go
index 6fa929d90..ccbb21317 100644
--- a/weed/storage/needle_map_memory.go
+++ b/weed/storage/needle_map_memory.go
@@ -31,12 +31,12 @@ func LoadNeedleMap(file *os.File) (*NeedleMap, error) {
 		if key > nm.MaximumFileKey {
 			nm.MaximumFileKey = key
 		}
-		nm.FileCounter++
-		nm.FileByteCounter = nm.FileByteCounter + uint64(size)
 		if offset > 0 && size != TombstoneFileSize {
-			oldSize := nm.m.Set(Key(key), offset, size)
+			nm.FileCounter++
+			nm.FileByteCounter = nm.FileByteCounter + uint64(size)
+			oldOffset, oldSize := nm.m.Set(Key(key), offset, size)
 			glog.V(3).Infoln("reading key", key, "offset", offset*NeedlePaddingSize, "size", size, "oldSize", oldSize)
-			if oldSize > 0 {
+			if oldOffset > 0 && oldSize != TombstoneFileSize {
 				nm.DeletionCounter++
 				nm.DeletionByteCounter = nm.DeletionByteCounter + uint64(oldSize)
 			}
@@ -84,7 +84,7 @@ func WalkIndexFile(r *os.File, fn func(key uint64, offset, size uint32) error) e
 }
 
 func (nm *NeedleMap) Put(key uint64, offset uint32, size uint32) error {
-	oldSize := nm.m.Set(Key(key), offset, size)
+	_, oldSize := nm.m.Set(Key(key), offset, size)
 	nm.logPut(key, oldSize, size)
 	return nm.appendToIndexFile(key, offset, size)
 }