Merge pull request #701 from harshavardhana/pr_out_move_to_container_list_datastructure_from_map_string_byte

Move to container/list datastructure from map[string][]byte

pkg/donut/cache/data/data.go

@@ -18,6 +18,7 @@
 package data
 
 import (
+	"container/list"
 	"sync"
 	"time"
 )
@@ -32,16 +33,10 @@ type Cache struct {
 	sync.Mutex
 
 	// items hold the cached objects
-	items map[string][]byte
+	items *list.List
 
-	// updatedAt holds the time that related item's updated at
+	// reverseItems holds the time that related item's updated at
-	updatedAt map[string]time.Time
+	reverseItems map[string]*list.Element
-
-	// expiration is a duration for a cache key to expire
-	expiration time.Duration
-
-	// stopExpireTimer channel to quit the timer thread
-	stopExpireTimer chan struct{}
 
 	// maxSize is a total size for overall cache
 	maxSize uint64
@@ -49,30 +44,34 @@ type Cache struct {
 	// currentSize is a current size in memory
 	currentSize uint64
 
-	// OnExpired - callback function for eviction
+	// OnEvicted - callback function for eviction
-	OnExpired func(a ...interface{})
+	OnEvicted func(a ...interface{})
 
-	// totalExpired counter to keep track of total expirations
+	// totalEvicted counter to keep track of total expirations
-	totalExpired uint64
+	totalEvicted int
 }
 
 // Stats current cache statistics
 type Stats struct {
 	Bytes   uint64
-	Items   uint64
+	Items   int
-	Expired uint64
+	Evicted int
+}
+
+type element struct {
+	key   string
+	value []byte
 }
 
 // NewCache creates an inmemory cache
 //
 // maxSize is used for expiring objects before we run out of memory
 // expiration is used for expiration of a key from cache
-func NewCache(maxSize uint64, expiration time.Duration) *Cache {
+func NewCache(maxSize uint64) *Cache {
 	return &Cache{
-		items:      make(map[string][]byte),
+		items:        list.New(),
-		updatedAt:  map[string]time.Time{},
+		reverseItems: make(map[string]*list.Element),
-		expiration: expiration,
+		maxSize:      maxSize,
-		maxSize:    maxSize,
 	}
 }
 
@@ -80,50 +79,32 @@ func NewCache(maxSize uint64, expiration time.Duration) *Cache {
 func (r *Cache) Stats() Stats {
 	return Stats{
 		Bytes:   r.currentSize,
-		Items:   uint64(len(r.items)),
+		Items:   r.items.Len(),
-		Expired: r.totalExpired,
+		Evicted: r.totalEvicted,
 	}
 }
 
-// ExpireObjects expire objects in go routine
-func (r *Cache) ExpireObjects(gcInterval time.Duration) {
-	r.stopExpireTimer = make(chan struct{})
-	ticker := time.NewTicker(gcInterval)
-	go func() {
-		for {
-			select {
-			case <-ticker.C:
-				r.Expire()
-			case <-r.stopExpireTimer:
-				ticker.Stop()
-				return
-			}
-
-		}
-	}()
-}
-
 // Get returns a value of a given key if it exists
 func (r *Cache) Get(key string) ([]byte, bool) {
 	r.Lock()
 	defer r.Unlock()
-	value, ok := r.items[key]
+	ele, hit := r.reverseItems[key]
-	if !ok {
+	if !hit {
 		return nil, false
 	}
-	r.updatedAt[key] = time.Now()
+	r.items.MoveToFront(ele)
-	return value, true
+	return ele.Value.(*element).value, true
 }
 
 // Len returns length of the value of a given key, returns zero if key doesn't exist
 func (r *Cache) Len(key string) int {
 	r.Lock()
 	defer r.Unlock()
-	_, ok := r.items[key]
+	_, ok := r.reverseItems[key]
 	if !ok {
 		return 0
 	}
-	return len(r.items[key])
+	return len(r.reverseItems[key].Value.(*element).value)
 }
 
 // Append will append new data to an existing key,
@@ -140,22 +121,20 @@ func (r *Cache) Append(key string, value []byte) bool {
 		}
 		// remove random key if only we reach the maxSize threshold
 		for (r.currentSize + valueLen) > r.maxSize {
-			for randomKey := range r.items {
+			r.doDeleteOldest()
-				r.doDelete(randomKey)
+			break
-				break
-			}
 		}
 	}
-	_, ok := r.items[key]
+	ele, hit := r.reverseItems[key]
-	if !ok {
+	if !hit {
-		r.items[key] = value
+		ele := r.items.PushFront(&element{key, value})
 		r.currentSize += valueLen
-		r.updatedAt[key] = time.Now()
+		r.reverseItems[key] = ele
 		return true
 	}
-	r.items[key] = append(r.items[key], value...)
+	r.items.MoveToFront(ele)
 	r.currentSize += valueLen
-	r.updatedAt[key] = time.Now()
+	ele.Value.(*element).value = append(ele.Value.(*element).value, value...)
 	return true
 }
 
@@ -172,55 +151,46 @@ func (r *Cache) Set(key string, value []byte) bool {
 		}
 		// remove random key if only we reach the maxSize threshold
 		for (r.currentSize + valueLen) > r.maxSize {
-			for randomKey := range r.items {
+			r.doDeleteOldest()
-				r.doDelete(randomKey)
-				break
-			}
 		}
 	}
-	r.items[key] = value
+	if _, hit := r.reverseItems[key]; hit {
+		return false
+	}
+	ele := r.items.PushFront(&element{key, value})
 	r.currentSize += valueLen
-	r.updatedAt[key] = time.Now()
+	r.reverseItems[key] = ele
 	return true
 }
 
-// Expire expires keys which have expired
-func (r *Cache) Expire() {
-	r.Lock()
-	defer r.Unlock()
-	for key := range r.items {
-		if !r.isValid(key) {
-			r.doDelete(key)
-		}
-	}
-}
-
 // Delete deletes a given key if exists
 func (r *Cache) Delete(key string) {
 	r.Lock()
 	defer r.Unlock()
-	r.doDelete(key)
+	ele, ok := r.reverseItems[key]
-}
+	if !ok {
-
+		return
-func (r *Cache) doDelete(key string) {
+	}
-	if _, ok := r.items[key]; ok {
+	if ele != nil {
-		r.currentSize -= uint64(len(r.items[key]))
+		r.currentSize -= uint64(len(r.reverseItems[key].Value.(*element).value))
-		delete(r.items, key)
+		r.items.Remove(ele)
-		delete(r.updatedAt, key)
+		delete(r.reverseItems, key)
-		r.totalExpired++
+		r.totalEvicted++
-		if r.OnExpired != nil {
+		if r.OnEvicted != nil {
-			r.OnExpired(key)
+			r.OnEvicted(key)
 		}
 	}
 }
 
-func (r *Cache) isValid(key string) bool {
+func (r *Cache) doDeleteOldest() {
-	updatedAt, ok := r.updatedAt[key]
+	ele := r.items.Back()
-	if !ok {
+	if ele != nil {
-		return false
+		r.currentSize -= uint64(len(r.reverseItems[ele.Value.(*element).key].Value.(*element).value))
-	}
+		delete(r.reverseItems, ele.Value.(*element).key)
-	if r.expiration == noExpiration {
+		r.items.Remove(ele)
-		return true
+		r.totalEvicted++
+		if r.OnEvicted != nil {
+			r.OnEvicted(ele.Value.(*element).key)
+		}
 	}
-	return updatedAt.Add(r.expiration).After(time.Now())
 }

pkg/donut/cache/data/data_test.go

@@ -29,7 +29,7 @@ type MySuite struct{}
 var _ = Suite(&MySuite{})
 
 func (s *MySuite) TestCache(c *C) {
-	cache := NewCache(1000, 0)
+	cache := NewCache(1000)
 	data := []byte("Hello, world!")
 	ok := cache.Set("filename", data)
 

pkg/donut/donut-v2.go

@@ -80,15 +80,12 @@ func New(c *Config) (Interface, error) {
 	a.storedBuckets = metadata.NewCache()
 	a.nodes = make(map[string]node)
 	a.buckets = make(map[string]bucket)
-	a.objects = data.NewCache(a.config.MaxSize, a.config.Expiration)
+	a.objects = data.NewCache(a.config.MaxSize)
-	a.multiPartObjects = data.NewCache(0, time.Duration(0))
+	a.multiPartObjects = data.NewCache(0)
-	a.objects.OnExpired = a.expiredObject
+	a.objects.OnEvicted = a.evictedObject
-	a.multiPartObjects.OnExpired = a.expiredPart
+	a.multiPartObjects.OnEvicted = a.evictedPart
 	a.lock = new(sync.Mutex)
 
-	// set up cache expiration
-	a.objects.ExpireObjects(time.Second * 5)
-
 	if len(a.config.NodeDiskMap) > 0 {
 		for k, v := range a.config.NodeDiskMap {
 			if len(v) == 0 {
@@ -570,10 +567,10 @@ func (donut API) GetObjectMetadata(bucket, key string) (ObjectMetadata, error) {
 	return ObjectMetadata{}, iodine.New(ObjectNotFound{Object: key}, nil)
 }
 
-func (donut API) expiredObject(a ...interface{}) {
+func (donut API) evictedObject(a ...interface{}) {
 	cacheStats := donut.objects.Stats()
-	log.Printf("CurrentSize: %d, CurrentItems: %d, TotalExpirations: %d",
+	log.Printf("CurrentSize: %d, CurrentItems: %d, TotalEvicted: %d",
-		cacheStats.Bytes, cacheStats.Items, cacheStats.Expired)
+		cacheStats.Bytes, cacheStats.Items, cacheStats.Evicted)
 	key := a[0].(string)
 	// loop through all buckets
 	for _, bucket := range donut.storedBuckets.GetAll() {

pkg/donut/multipart.go

@@ -376,7 +376,7 @@ func (donut API) ListObjectParts(bucket, key string, resources ObjectResourcesMe
 	return objectResourcesMetadata, nil
 }
 
-func (donut API) expiredPart(a ...interface{}) {
+func (donut API) evictedPart(a ...interface{}) {
 	key := a[0].(string)
 	// loop through all buckets
 	buckets := donut.storedBuckets.GetAll()