code style simplify
Showing
1 changed file
with
10 additions
and
14 deletions
| ... | @@ -49,15 +49,14 @@ func NewMemoryCache() *MemoryCache { | ... | @@ -49,15 +49,14 @@ func NewMemoryCache() *MemoryCache { |
| 49 | func (bc *MemoryCache) Get(name string) interface{} { | 49 | func (bc *MemoryCache) Get(name string) interface{} { |
| 50 | bc.lock.RLock() | 50 | bc.lock.RLock() |
| 51 | defer bc.lock.RUnlock() | 51 | defer bc.lock.RUnlock() |
| 52 | itm, ok := bc.items[name] | 52 | if itm, ok := bc.items[name]; ok { |
| 53 | if !ok { | 53 | if (time.Now().Unix() - itm.Lastaccess.Unix()) > itm.expired { |
| 54 | return nil | 54 | go bc.Delete(name) |
| 55 | } | 55 | return nil |
| 56 | if (time.Now().Unix() - itm.Lastaccess.Unix()) > itm.expired { | 56 | } |
| 57 | go bc.Delete(name) | 57 | return itm.val |
| 58 | return nil | ||
| 59 | } | 58 | } |
| 60 | return itm.val | 59 | return nil |
| 61 | } | 60 | } |
| 62 | 61 | ||
| 63 | // Put cache to memory. | 62 | // Put cache to memory. |
| ... | @@ -65,12 +64,11 @@ func (bc *MemoryCache) Get(name string) interface{} { | ... | @@ -65,12 +64,11 @@ func (bc *MemoryCache) Get(name string) interface{} { |
| 65 | func (bc *MemoryCache) Put(name string, value interface{}, expired int64) error { | 64 | func (bc *MemoryCache) Put(name string, value interface{}, expired int64) error { |
| 66 | bc.lock.Lock() | 65 | bc.lock.Lock() |
| 67 | defer bc.lock.Unlock() | 66 | defer bc.lock.Unlock() |
| 68 | t := MemoryItem{ | 67 | bc.items[name] = &MemoryItem{ |
| 69 | val: value, | 68 | val: value, |
| 70 | Lastaccess: time.Now(), | 69 | Lastaccess: time.Now(), |
| 71 | expired: expired, | 70 | expired: expired, |
| 72 | } | 71 | } |
| 73 | bc.items[name] = &t | ||
| 74 | return nil | 72 | return nil |
| 75 | } | 73 | } |
| 76 | 74 | ||
| ... | @@ -82,8 +80,7 @@ func (bc *MemoryCache) Delete(name string) error { | ... | @@ -82,8 +80,7 @@ func (bc *MemoryCache) Delete(name string) error { |
| 82 | return errors.New("key not exist") | 80 | return errors.New("key not exist") |
| 83 | } | 81 | } |
| 84 | delete(bc.items, name) | 82 | delete(bc.items, name) |
| 85 | _, valid := bc.items[name] | 83 | if _, ok := bc.items[name]; ok { |
| 86 | if valid { | ||
| 87 | return errors.New("delete key error") | 84 | return errors.New("delete key error") |
| 88 | } | 85 | } |
| 89 | return nil | 86 | return nil |
| ... | @@ -214,8 +211,7 @@ func (bc *MemoryCache) item_expired(name string) bool { | ... | @@ -214,8 +211,7 @@ func (bc *MemoryCache) item_expired(name string) bool { |
| 214 | if !ok { | 211 | if !ok { |
| 215 | return true | 212 | return true |
| 216 | } | 213 | } |
| 217 | sec := time.Now().Unix() - itm.Lastaccess.Unix() | 214 | if time.Now().Unix()-itm.Lastaccess.Unix() >= itm.expired { |
| 218 | if sec >= itm.expired { | ||
| 219 | delete(bc.items, name) | 215 | delete(bc.items, name) |
| 220 | return true | 216 | return true |
| 221 | } | 217 | } | ... | ... |
-
Please register or sign in to post a comment