fix regression for 97c4957

* No panics during multiple simultaneous access using LoaderFunc * Cache.get returns raw values, not item struct.
CiscoM31 · Mar 15, 2017 · d2f44c6 · d2f44c6
1 parent 78acdfb
commit d2f44c6
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 13 deletions.
diff --git a/arc.go b/arc.go
@@ -170,7 +170,7 @@ func (c *ARC) get(key interface{}, onLoad bool) (interface{}, error) {
  if !onLoad {
  c.stats.IncrHitCount()
  }
- return item, nil
+ return item.value, nil
  } else {
  delete(c.items, key)
  c.b1.PushFront(key)
@@ -186,7 +186,7 @@ func (c *ARC) get(key interface{}, onLoad bool) (interface{}, error) {
  if !onLoad {
  c.stats.IncrHitCount()
  }
- return item, nil
+ return item.value, nil
  } else {
  delete(c.items, key)
  c.t2.Remove(key, elt)
@@ -204,11 +204,10 @@ func (c *ARC) get(key interface{}, onLoad bool) (interface{}, error) {
 }
 
 func (c *ARC) getValue(key interface{}) (interface{}, error) {
- it, err := c.get(key, false)
+ v, err := c.get(key, false)
  if err != nil {
  return nil, err
  }
- v := it.(*arcItem).value
  if c.deserializeFunc != nil {
  return c.deserializeFunc(key, v)
  }

diff --git a/lfu.go b/lfu.go
@@ -116,7 +116,7 @@ func (c *LFUCache) get(key interface{}, onLoad bool) (interface{}, error) {
  if !onLoad {
  c.stats.IncrHitCount()
  }
- return item, nil
+ return item.value, nil
  }
  c.mu.Lock()
  c.removeItem(item)
@@ -129,11 +129,10 @@ func (c *LFUCache) get(key interface{}, onLoad bool) (interface{}, error) {
 }
 
 func (c *LFUCache) getValue(key interface{}) (interface{}, error) {
- it, err := c.get(key, false)
+ v, err := c.get(key, false)
  if err != nil {
  return nil, err
  }
- v := it.(*lfuItem).value
  if c.deserializeFunc != nil {
  return c.deserializeFunc(key, v)
  }

diff --git a/lru.go b/lru.go
@@ -109,7 +109,7 @@ func (c *LRUCache) get(key interface{}, onLoad bool) (interface{}, error) {
  if !onLoad {
  c.stats.IncrHitCount()
  }
- return it, nil
+ return it.value, nil
  }
  c.mu.Lock()
  c.removeElement(item)
@@ -122,11 +122,10 @@ func (c *LRUCache) get(key interface{}, onLoad bool) (interface{}, error) {
 }
 
 func (c *LRUCache) getValue(key interface{}) (interface{}, error) {
- it, err := c.get(key, false)
+ v, err := c.get(key, false)
  if err != nil {
  return nil, err
  }
- v := it.(*lruItem).value
  if c.deserializeFunc != nil {
  return c.deserializeFunc(key, v)
  }

diff --git a/simple.go b/simple.go
@@ -96,7 +96,7 @@ func (c *SimpleCache) get(key interface{}, onLoad bool) (interface{}, error) {
  if !onLoad {
  c.stats.IncrHitCount()
  }
- return item, nil
+ return item.value, nil
  }
  c.mu.Lock()
  c.remove(key)
@@ -109,11 +109,10 @@ func (c *SimpleCache) get(key interface{}, onLoad bool) (interface{}, error) {
 }
 
 func (c *SimpleCache) getValue(key interface{}) (interface{}, error) {
- it, err := c.get(key, false)
+ v, err := c.get(key, false)
  if err != nil {
  return nil, err
  }
- v := it.(*simpleItem).value
  if c.deserializeFunc != nil {
  return c.deserializeFunc(key, v)
  }