libp2p/go-libp2p-peerstore
1
0
Fork 0
mirror of https://github.com/libp2p/go-libp2p-peerstore.git synced 2025-03-25 13:20:07 +08:00
Code Issues Projects Releases Wiki Activity

do not prettify cache keys (peer ids).

Browse Source
This commit is contained in:
Raúl Kripalani 2018-09-13 13:28:27 +01:00 committed by Raúl Kripalani
parent afc9ee92b0
commit 7e645fa115
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pstoreds/addr_book.go
View File

@ -145,7 +145,7 @@ func (mgr *dsAddrBook) deleteAddrs(p peer.ID, addrs []ma.Multiaddr) error {
return err return err
} }
mgr.cache.Remove(p.Pretty()) mgr.cache.Remove(p)
// Attempt transactional KV deletion. // Attempt transactional KV deletion.
for i := 0; i < mgr.writeRetries; i++ { for i := 0; i < mgr.writeRetries; i++ {
if err = mgr.dbDelete(keys); err == nil { if err = mgr.dbDelete(keys); err == nil {
@ -169,8 +169,7 @@ func (mgr *dsAddrBook) setAddrs(p peer.ID, addrs []ma.Multiaddr, ttl time.Durati
return err return err
} }
mgr.cache.Remove(p.Pretty()) mgr.cache.Remove(p)
// Attempt transactional KV insertion. // Attempt transactional KV insertion.
var existed []bool var existed []bool
for i := 0; i < mgr.writeRetries; i++ { for i := 0; i < mgr.writeRetries; i++ {
@ -256,7 +255,7 @@ func (mgr *dsAddrBook) dbInsert(keys []ds.Key, addrs []ma.Multiaddr, ttl time.Du
// UpdateAddrs will update any addresses for a given peer and TTL combination to // UpdateAddrs will update any addresses for a given peer and TTL combination to
// have a new TTL. // have a new TTL.
func (mgr *dsAddrBook) UpdateAddrs(p peer.ID, oldTTL time.Duration, newTTL time.Duration) { func (mgr *dsAddrBook) UpdateAddrs(p peer.ID, oldTTL time.Duration, newTTL time.Duration) {
mgr.cache.Remove(p.Pretty()) mgr.cache.Remove(p)
var err error var err error
for i := 0; i < mgr.writeRetries; i++ { for i := 0; i < mgr.writeRetries; i++ {
@ -322,14 +321,14 @@ func (mgr *dsAddrBook) Addrs(p peer.ID) []ma.Multiaddr {
) )
// Check the cache and return the entry only if it hasn't expired; if expired, remove. // Check the cache and return the entry only if it hasn't expired; if expired, remove.
if e, ok := mgr.cache.Get(p.Pretty()); ok { if e, ok := mgr.cache.Get(p); ok {
entry := e.(cacheEntry) entry := e.(cacheEntry)
if entry.expiration.After(time.Now()) { if entry.expiration.After(time.Now()) {
addrs := make([]ma.Multiaddr, len(entry.addrs)) addrs := make([]ma.Multiaddr, len(entry.addrs))
copy(addrs, entry.addrs) copy(addrs, entry.addrs)
return addrs return addrs
} else { } else {
mgr.cache.Remove(p.Pretty()) mgr.cache.Remove(p)
} }
} }
@ -360,7 +359,7 @@ func (mgr *dsAddrBook) Addrs(p peer.ID) []ma.Multiaddr {
addrsCpy := make([]ma.Multiaddr, len(addrs)) addrsCpy := make([]ma.Multiaddr, len(addrs))
copy(addrsCpy, addrs) copy(addrsCpy, addrs)
entry := cacheEntry{addrs: addrsCpy, expiration: earliestExp} entry := cacheEntry{addrs: addrsCpy, expiration: earliestExp}
mgr.cache.Add(p.Pretty(), entry) mgr.cache.Add(p, entry)
return addrs return addrs
} }
@ -417,8 +416,8 @@ func (mgr *dsAddrBook) ClearAddrs(p peer.ID) {
deleteFn func() error deleteFn func() error
) )
if e, ok := mgr.cache.Peek(p.Pretty()); ok { if e, ok := mgr.cache.Peek(p); ok {
mgr.cache.Remove(p.Pretty()) mgr.cache.Remove(p)
keys, _, _ := keysAndAddrs(p, e.(cacheEntry).addrs) keys, _, _ := keysAndAddrs(p, e.(cacheEntry).addrs)
deleteFn = func() error { deleteFn = func() error {
return mgr.dbDelete(keys) return mgr.dbDelete(keys)