diff --git a/pkg/maps/generic.go b/pkg/maps/generic.go index 7d67b95..e308a24 100644 --- a/pkg/maps/generic.go +++ b/pkg/maps/generic.go @@ -2,15 +2,15 @@ package maps import "sync" -type GenericMap[K comparable, V any] struct { - m sync.Map +type Map[K comparable, V any] struct { + m *sync.Map } -func (gm *GenericMap[K, V]) Store(key K, value V) { +func (gm *Map[K, V]) Store(key K, value V) { gm.m.Store(key, value) } -func (gm *GenericMap[K, V]) Load(key K) (V, bool) { +func (gm *Map[K, V]) Load(key K) (V, bool) { value, ok := gm.m.Load(key) if !ok { var zero V @@ -19,39 +19,54 @@ func (gm *GenericMap[K, V]) Load(key K) (V, bool) { return value.(V), true } -func (gm *GenericMap[K, V]) Delete(key K) { +func (gm *Map[K, V]) Delete(key K) { gm.m.Delete(key) } -func (gm *GenericMap[K, V]) Range(f func(key K, value V) bool) { +func (gm *Map[K, V]) Range(f func(key K, value V) bool) { gm.m.Range(func(key, value any) bool { return f(key.(K), value.(V)) }) } -func (gm *GenericMap[K, V]) Swap(key K, value V) (previous V, loaded bool) { +func (gm *Map[K, V]) Swap(key K, value V) (previous V, loaded bool) { actual, swapped := gm.m.Swap(key, value) return actual.(V), swapped } -func (gm *GenericMap[K, V]) LoadOrStore(key K, value V) (V, bool) { +func (gm *Map[K, V]) Len() int { + var n int + gm.m.Range(func(key, value any) bool { + n++ + return true + }) + return n +} + +func (gm *Map[K, V]) Clear() { + gm.m.Clear() +} + +func (gm *Map[K, V]) LoadOrStore(key K, value V) (V, bool) { actual, loaded := gm.m.LoadOrStore(key, value) return actual.(V), loaded } -func (gm *GenericMap[K, V]) LoadAndDelete(key K) (value V, loaded bool) { +func (gm *Map[K, V]) LoadAndDelete(key K) (value V, loaded bool) { actual, loaded := gm.m.LoadAndDelete(key) return actual.(V), loaded } -func (gm *GenericMap[K, V]) CompareAndSwap(key K, old V, new V) (swapped bool) { +func (gm *Map[K, V]) CompareAndSwap(key K, old V, new V) (swapped bool) { return gm.m.CompareAndSwap(key, old, new) } -func (gm *GenericMap[K, V]) CompareAndDelete(key K, old V) (deleted bool) { +func (gm *Map[K, V]) CompareAndDelete(key K, old V) (deleted bool) { return gm.m.CompareAndDelete(key, old) } -func New[K comparable, V any]() *GenericMap[K, V] { - return &GenericMap[K, V]{m: sync.Map{}} +func New[K comparable, V any]() *Map[K, V] { + return &Map[K, V]{ + m: new(sync.Map), + } }