Merge pull request #1 from chrislusf/master

catch up

3 files changed, 25 insertions, 20 deletions

diff --git a/weed/util/chunk_cache/chunk_cache.go b/weed/util/chunk_cache/chunk_cache.go
index 17b64fb6c..2b0c635a1 100644
--- a/weed/util/chunk_cache/chunk_cache.go
+++ b/weed/util/chunk_cache/chunk_cache.go
@@ -13,16 +13,21 @@ const (
 	onDiskCacheSizeLimit1 = 4 * memCacheSizeLimit
 )
 
+type ChunkCache interface {
+	GetChunk(fileId string, minSize uint64) (data []byte)
+	SetChunk(fileId string, data []byte)
+}
+
 // a global cache for recently accessed file chunks
-type ChunkCache struct {
+type TieredChunkCache struct {
 	memCache   *ChunkCacheInMemory
 	diskCaches []*OnDiskCacheLayer
 	sync.RWMutex
 }
 
-func NewChunkCache(maxEntries int64, dir string, diskSizeMB int64) *ChunkCache {
+func NewTieredChunkCache(maxEntries int64, dir string, diskSizeMB int64) *TieredChunkCache {
 
-	c := &ChunkCache{
+	c := &TieredChunkCache{
 		memCache: NewChunkCacheInMemory(maxEntries),
 	}
 	c.diskCaches = make([]*OnDiskCacheLayer, 3)
@@ -33,7 +38,7 @@ func NewChunkCache(maxEntries int64, dir string, diskSizeMB int64) *ChunkCache {
 	return c
 }
 
-func (c *ChunkCache) GetChunk(fileId string, chunkSize uint64) (data []byte) {
+func (c *TieredChunkCache) GetChunk(fileId string, minSize uint64) (data []byte) {
 	if c == nil {
 		return
 	}
@@ -41,14 +46,14 @@ func (c *ChunkCache) GetChunk(fileId string, chunkSize uint64) (data []byte) {
 	c.RLock()
 	defer c.RUnlock()
 
-	return c.doGetChunk(fileId, chunkSize)
+	return c.doGetChunk(fileId, minSize)
 }
 
-func (c *ChunkCache) doGetChunk(fileId string, chunkSize uint64) (data []byte) {
+func (c *TieredChunkCache) doGetChunk(fileId string, minSize uint64) (data []byte) {
 
-	if chunkSize < memCacheSizeLimit {
+	if minSize < memCacheSizeLimit {
 		data = c.memCache.GetChunk(fileId)
-		if len(data) >= int(chunkSize) {
+		if len(data) >= int(minSize) {
 			return data
 		}
 	}
@@ -59,21 +64,21 @@ func (c *ChunkCache) doGetChunk(fileId string, chunkSize uint64) (data []byte) {
 		return nil
 	}
 
-	if chunkSize < onDiskCacheSizeLimit0 {
+	if minSize < onDiskCacheSizeLimit0 {
 		data = c.diskCaches[0].getChunk(fid.Key)
-		if len(data) >= int(chunkSize) {
+		if len(data) >= int(minSize) {
 			return data
 		}
 	}
-	if chunkSize < onDiskCacheSizeLimit1 {
+	if minSize < onDiskCacheSizeLimit1 {
 		data = c.diskCaches[1].getChunk(fid.Key)
-		if len(data) >= int(chunkSize) {
+		if len(data) >= int(minSize) {
 			return data
 		}
 	}
 	{
 		data = c.diskCaches[2].getChunk(fid.Key)
-		if len(data) >= int(chunkSize) {
+		if len(data) >= int(minSize) {
 			return data
 		}
 	}
@@ -82,7 +87,7 @@ func (c *ChunkCache) doGetChunk(fileId string, chunkSize uint64) (data []byte) {
 
 }
 
-func (c *ChunkCache) SetChunk(fileId string, data []byte) {
+func (c *TieredChunkCache) SetChunk(fileId string, data []byte) {
 	if c == nil {
 		return
 	}
@@ -94,7 +99,7 @@ func (c *ChunkCache) SetChunk(fileId string, data []byte) {
 	c.doSetChunk(fileId, data)
 }
 
-func (c *ChunkCache) doSetChunk(fileId string, data []byte) {
+func (c *TieredChunkCache) doSetChunk(fileId string, data []byte) {
 
 	if len(data) < memCacheSizeLimit {
 		c.memCache.SetChunk(fileId, data)
@@ -116,7 +121,7 @@ func (c *ChunkCache) doSetChunk(fileId string, data []byte) {
 
 }
 
-func (c *ChunkCache) Shutdown() {
+func (c *TieredChunkCache) Shutdown() {
 	if c == nil {
 		return
 	}
diff --git a/weed/util/chunk_cache/chunk_cache_on_disk.go b/weed/util/chunk_cache/chunk_cache_on_disk.go
index d74f87b0c..356dfe188 100644
--- a/weed/util/chunk_cache/chunk_cache_on_disk.go
+++ b/weed/util/chunk_cache/chunk_cache_on_disk.go
@@ -63,7 +63,7 @@ func LoadOrCreateChunkCacheVolume(fileName string, preallocate int64) (*ChunkCac
 		return nil, fmt.Errorf("cannot write cache index %s.idx: %v", v.fileName, err)
 	}
 
-	glog.V(0).Infoln("loading leveldb", v.fileName+".ldb")
+	glog.V(1).Infoln("loading leveldb", v.fileName+".ldb")
 	opts := &opt.Options{
 		BlockCacheCapacity:            2 * 1024 * 1024, // default value is 8MiB
 		WriteBuffer:                   1 * 1024 * 1024, // default value is 4MiB
@@ -137,7 +137,7 @@ func (v *ChunkCacheVolume) WriteNeedle(key types.NeedleId, data []byte) error {
 		v.fileSize += int64(types.NeedlePaddingSize - extraSize)
 	}
 
-	if err := v.nm.Put(key, types.ToOffset(offset), uint32(len(data))); err != nil {
+	if err := v.nm.Put(key, types.ToOffset(offset), types.Size(len(data))); err != nil {
 		return err
 	}
 
diff --git a/weed/util/chunk_cache/chunk_cache_on_disk_test.go b/weed/util/chunk_cache/chunk_cache_on_disk_test.go
index f061f2ba2..558488f18 100644
--- a/weed/util/chunk_cache/chunk_cache_on_disk_test.go
+++ b/weed/util/chunk_cache/chunk_cache_on_disk_test.go
@@ -16,7 +16,7 @@ func TestOnDisk(t *testing.T) {
 
 	totalDiskSizeMb := int64(32)
 
-	cache := NewChunkCache(0, tmpDir, totalDiskSizeMb)
+	cache := NewTieredChunkCache(0, tmpDir, totalDiskSizeMb)
 
 	writeCount := 5
 	type test_data struct {
@@ -45,7 +45,7 @@ func TestOnDisk(t *testing.T) {
 
 	cache.Shutdown()
 
-	cache = NewChunkCache(0, tmpDir, totalDiskSizeMb)
+	cache = NewTieredChunkCache(0, tmpDir, totalDiskSizeMb)
 
 	for i := 0; i < writeCount; i++ {
 		data := cache.GetChunk(testData[i].fileId, testData[i].size)