added AND ('&') operation.
This commit is contained in:
parent
46f4078530
commit
ae0206e6c5
12
cache.go
12
cache.go
|
@ -125,12 +125,10 @@ func (c *cache) Get(k string) (interface{}, bool) {
|
|||
c.mu.RUnlock()
|
||||
return nil, false
|
||||
}
|
||||
if item.Expiration > 0 {
|
||||
if time.Now().UnixNano() > item.Expiration {
|
||||
if item.Expiration > 0 && time.Now().UnixNano() > item.Expiration {
|
||||
c.mu.RUnlock()
|
||||
return nil, false
|
||||
}
|
||||
}
|
||||
c.mu.RUnlock()
|
||||
return item.Object, true
|
||||
}
|
||||
|
@ -171,11 +169,9 @@ func (c *cache) get(k string) (interface{}, bool) {
|
|||
return nil, false
|
||||
}
|
||||
// "Inlining" of Expired
|
||||
if item.Expiration > 0 {
|
||||
if time.Now().UnixNano() > item.Expiration {
|
||||
if item.Expiration > 0 && time.Now().UnixNano() > item.Expiration {
|
||||
return nil, false
|
||||
}
|
||||
}
|
||||
return item.Object, true
|
||||
}
|
||||
|
||||
|
@ -1042,11 +1038,9 @@ func (c *cache) Items() map[string]Item {
|
|||
now := time.Now().UnixNano()
|
||||
for k, v := range c.items {
|
||||
// "Inlining" of Expired
|
||||
if v.Expiration > 0 {
|
||||
if now > v.Expiration {
|
||||
if v.Expiration > 0 && now > v.Expiration {
|
||||
continue
|
||||
}
|
||||
}
|
||||
m[k] = v
|
||||
}
|
||||
return m
|
||||
|
|
Loading…
Reference in New Issue