Files
prysm/container/thread-safe/map_test.go
Preston Van Loon 2fd6bd8150 Add golang.org/x/tools modernize static analyzer and fix violations (#15946)
* Ran gopls modernize to fix everything

go run golang.org/x/tools/gopls/internal/analysis/modernize/cmd/modernize@latest -fix -test ./...

* Override rules_go provided dependency for golang.org/x/tools to v0.38.0.

To update this, checked out rules_go, then ran `bazel run //go/tools/releaser -- upgrade-dep -mirror=false org_golang_x_tools` and copied the patches.

* Fix buildtag violations and ignore buildtag violations in external

* Introduce modernize analyzer package.

* Add modernize "any" analyzer.

* Fix violations of any analyzer

* Add modernize "appendclipped" analyzer.

* Fix violations of appendclipped

* Add modernize "bloop" analyzer.

* Add modernize "fmtappendf" analyzer.

* Add modernize "forvar" analyzer.

* Add modernize "mapsloop" analyzer.

* Add modernize "minmax" analyzer.

* Fix violations of minmax analyzer

* Add modernize "omitzero" analyzer.

* Add modernize "rangeint" analyzer.

* Fix violations of rangeint.

* Add modernize "reflecttypefor" analyzer.

* Fix violations of reflecttypefor analyzer.

* Add modernize "slicescontains" analyzer.

* Add modernize "slicessort" analyzer.

* Add modernize "slicesdelete" analyzer. This is disabled by default for now. See https://go.dev/issue/73686.

* Add modernize "stringscutprefix" analyzer.

* Add modernize "stringsbuilder" analyzer.

* Fix violations of stringsbuilder analyzer.

* Add modernize "stringsseq" analyzer.

* Add modernize "testingcontext" analyzer.

* Add modernize "waitgroup" analyzer.

* Changelog fragment

* gofmt

* gazelle

* Add modernize "newexpr" analyzer.

* Disable newexpr until go1.26

* Add more details in WORKSPACE on how to update the override

* @nalepae feedback on min()

* gofmt

* Fix violations of forvar
2025-11-14 01:27:22 +00:00

111 lines
1.8 KiB
Go

package threadsafe
import (
"sort"
"sync"
"testing"
"github.com/OffchainLabs/prysm/v7/testing/require"
)
type safeMap struct {
items map[int]string
lock sync.RWMutex
}
func (s *safeMap) Get(k int) (string, bool) {
s.lock.RLock()
defer s.lock.RUnlock()
v, ok := s.items[k]
return v, ok
}
func (s *safeMap) Put(i int, str string) {
s.lock.Lock()
defer s.lock.Unlock()
s.items[i] = str
}
func (s *safeMap) Delete(i int) {
s.lock.Lock()
defer s.lock.Unlock()
delete(s.items, i)
}
func BenchmarkMap_Concrete(b *testing.B) {
mm := &safeMap{
items: make(map[int]string),
}
for b.Loop() {
for j := range 1000 {
mm.Put(j, "foo")
mm.Get(j)
mm.Delete(j)
}
}
}
func BenchmarkMap_Generic(b *testing.B) {
items := make(map[int]string)
mm := NewThreadSafeMap(items)
for b.Loop() {
for j := range 1000 {
mm.Put(j, "foo")
mm.Get(j)
mm.Delete(j)
}
}
}
func BenchmarkMap_GenericTx(b *testing.B) {
items := make(map[int]string)
mm := NewThreadSafeMap(items)
for b.Loop() {
for j := range 1000 {
mm.Do(func(mp map[int]string) {
mp[j] = "foo"
_ = mp[j]
delete(mp, j)
})
}
}
}
func TestMap(t *testing.T) {
m := map[int]string{
1: "foo",
200: "bar",
10000: "baz",
}
tMap := NewThreadSafeMap(m)
keys := tMap.Keys()
sort.IntSlice(keys).Sort()
require.DeepEqual(t, []int{1, 200, 10000}, keys)
require.Equal(t, 3, tMap.Len())
var wg sync.WaitGroup
for range 100 {
wg.Add(1)
go func(w *sync.WaitGroup, scopedMap *Map[int, string]) {
defer w.Done()
v, ok := scopedMap.Get(1)
require.Equal(t, true, ok)
require.Equal(t, "foo", v)
scopedMap.Put(3, "nyan")
v, ok = scopedMap.Get(3)
require.Equal(t, true, ok)
require.Equal(t, "nyan", v)
}(&wg, tMap)
}
wg.Wait()
tMap.Delete(3)
_, ok := tMap.Get(3)
require.Equal(t, false, ok)
}