This repository has been archived by the owner on Sep 22, 2020. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 172
cache: update LRU cache when putting same key but different value #424
Open
nak3
wants to merge
3
commits into
coreos:master
Choose a base branch
from
nak3:lru-cache
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -2,6 +2,7 @@ package distributor | |
|
||
import ( | ||
"container/list" | ||
"reflect" | ||
"sync" | ||
) | ||
|
||
|
@@ -32,8 +33,19 @@ func (lru *cache) Put(key string, value interface{}) { | |
} | ||
lru.mut.Lock() | ||
defer lru.mut.Unlock() | ||
if _, ok := lru.get(key); ok { | ||
return | ||
if v, ok := lru.get(key); ok { | ||
if reflect.DeepEqual(v, value) { | ||
return | ||
} else { | ||
// Actually find() is not necessary, but it makes sure to remove | ||
// correct element and the find loop would be finished soon, since | ||
// the element is in the front now. | ||
if old := lru.find(lru.priority.Front(), v); old != nil { | ||
lru.priority.Remove(old) | ||
} else { | ||
clog.Errorf("read cache is corrupted. Please restart the process.") | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. clog.Fatalf |
||
} | ||
} | ||
} | ||
if len(lru.cache) == lru.maxSize { | ||
lru.removeOldest() | ||
|
@@ -63,3 +75,13 @@ func (lru *cache) removeOldest() { | |
last := lru.priority.Remove(lru.priority.Back()) | ||
delete(lru.cache, last.(kv).key) | ||
} | ||
|
||
func (lru *cache) find(e *list.Element, v interface{}) *list.Element { | ||
if e == nil { | ||
return nil | ||
} else if e.Value.(kv).value == v { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. change else if to if. we already return at line 81. |
||
return e | ||
} else { | ||
return lru.find(e.Next(), v) | ||
} | ||
} |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
not sure if we want to be extra safe here.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Umm... @lpabon how do you think?