bug fix

common.go

@@ -34,4 +34,5 @@ type entry struct {
 	expiresAt int64
 	kind      string
 	tags      []uint64
+	deleted   bool
 }

pot.go

@@ -51,9 +51,13 @@ func (p *pot) DropTags(tags ...string) {
 func (p *pot) Drop(keys ...string) {
 	for _, key := range keys {
 		e, ok := p.getEntry(key)
-		if ok {
-			p.dropEntry(e)
+		if !ok {
+			continue
 		}
+		e.deleted = true
+		p.tags.drop(e)
+		p.shards[e.shard].DropEntry(e.key)
+		e = nil
 	}
 }
 
@@ -84,7 +88,7 @@ func (p *pot) getEntry(key string) (*entry, bool) {
 
 func (p *pot) Get(key string, i interface{}) (err error) {
 	ent, ok := p.getEntry(key)
-	if !ok {
+	if !ok || ent.deleted {
 		return NotFoundErr
 	}
 
@@ -144,6 +148,7 @@ func (p *pot) dropExpiredEntries() {
 		}
 		if now > entry.expiresAt {
 			expiredWindows++
+			entry.deleted = true
 			expiredEntries = append(expiredEntries, entry)
 		} else {
 			break
@@ -157,14 +162,11 @@ func (p *pot) dropExpiredEntries() {
 
 func (p *pot) dropEntries(entries ...*entry) {
 	for _, entry := range entries {
+		if !entry.deleted {
+			continue
+		}
 		p.tags.drop(entry)
 		p.shards[entry.shard].DropEntry(entry.key)
 		entry = nil
 	}
 }
-
-func (p *pot) dropEntry(e *entry) {
-	p.tags.drop(e)
-	p.shards[e.shard].DropEntry(e.key)
-	e = nil
-}

shard.go

@@ -47,7 +47,12 @@ func (s *shard) GetEntry(key uint64) (ent *entry, ok bool) {
 
 func (s *shard) SetEntry(key uint64, ent *entry) {
 	s.rw.Lock()
-	s.entries[key] = ent
+	e, ok := s.entries[key]
+	if ok {
+		*e = *ent
+	} else {
+		s.entries[key] = ent
+	}
 	s.rw.Unlock()
 }
 

tags.go

@@ -68,7 +68,18 @@ func (t *tags) getEntries(tag uint64) (entries entrySlice) {
 
 func (t *tags) dropTags(tags ...uint64) {
 	for _, tag := range tags {
-		entries := t.getEntries(tag)
+		var entries entrySlice
+		t.rw.RLock()
+		if _, ok := t.pairs[tag]; !ok {
+			t.rw.RUnlock()
+			continue
+		}
+		for _, e := range t.pairs[tag] {
+			e.deleted = true
+			entries = append(entries, e)
+		}
+		t.rw.RUnlock()
+
 		t.rw.Lock()
 		delete(t.pairs, tag)
 		t.rw.Unlock()