store pointers to entry, not copy of entry

Author: gammazero

bitswap/client/wantlist/wantlist.go

@@ -12,10 +12,10 @@ import (
 
 // Wantlist is a raw list of wanted blocks and their priorities
 type Wantlist struct {
-	set map[cid.Cid]Entry
+	set map[cid.Cid]*Entry
 
 	// Re-computing this can get expensive so we memoize it.
-	cached []Entry
+	cached []*Entry
 }
 
 // Entry is an entry in a want list, consisting of a cid and its priority
@@ -37,7 +37,7 @@ func NewRefEntry(c cid.Cid, p int32) Entry {
 // New generates a new raw Wantlist
 func New() *Wantlist {
 	return &Wantlist{
-		set: make(map[cid.Cid]Entry),
+		set: make(map[cid.Cid]*Entry),
 	}
 }
 
@@ -55,7 +55,7 @@ func (w *Wantlist) Add(c cid.Cid, priority int32, wantType pb.Message_Wantlist_W
 		return false
 	}
 
-	w.put(c, Entry{
+	w.put(c, &Entry{
 		Cid:      c,
 		Priority: priority,
 		WantType: wantType,
@@ -91,7 +91,7 @@ func (w *Wantlist) delete(c cid.Cid) {
 	w.cached = nil
 }
 
-func (w *Wantlist) put(c cid.Cid, e Entry) {
+func (w *Wantlist) put(c cid.Cid, e *Entry) {
 	w.cached = nil
 	w.set[c] = e
 }
@@ -103,23 +103,23 @@ func (w *Wantlist) Has(c cid.Cid) bool {
 
 // Get returns the entry, if present, for the given CID, plus whether it was
 // present.
-func (w *Wantlist) Get(c cid.Cid) (Entry, bool) {
+func (w *Wantlist) Get(c cid.Cid) (*Entry, bool) {
 	e, ok := w.set[c]
 	return e, ok
 }
 
 // Entries returns all wantlist entries for a want list, sorted by priority.
 //
 // DO NOT MODIFY. The returned list is cached.
-func (w *Wantlist) Entries() []Entry {
+func (w *Wantlist) Entries() []*Entry {
 	if w.cached != nil {
 		return w.cached
 	}
-	es := make([]Entry, 0, len(w.set))
+	es := make([]*Entry, 0, len(w.set))
 	for _, e := range w.set {
 		es = append(es, e)
 	}
-	slices.SortFunc(es, func(a, b Entry) int {
+	slices.SortFunc(es, func(a, b *Entry) int {
 		return cmp.Compare(b.Priority, a.Priority)
 	})
 	w.cached = es

bitswap/client/wantlist/wantlist_test.go

@@ -26,7 +26,7 @@ func init() {
 }
 
 type wli interface {
-	Get(cid.Cid) (Entry, bool)
+	Get(cid.Cid) (*Entry, bool)
 	Has(cid.Cid) bool
 }