1
0
mirror of https://github.com/charlienet/go-mixed.git synced 2025-07-18 08:32:40 +08:00
This commit is contained in:
2022-05-12 09:35:20 +08:00
parent ffaf129ddb
commit 6731e53d7c
6 changed files with 126 additions and 20 deletions

View File

@ -60,6 +60,33 @@ func (m *ConcurrnetMap[K, V]) Iter() <-chan *Entry[K, V] {
return ch return ch
} }
func (m *ConcurrnetMap[K, V]) Keys() []K {
keys := make([]K, m.Count())
for _, b := range m.buckets {
keys = append(keys, b.Keys()...)
}
return keys
}
func (m *ConcurrnetMap[K, V]) Values() []V {
values := make([]V, 0, m.Count())
for _, v := range m.buckets {
values = append(values, v.Values()...)
}
return values
}
func (m *ConcurrnetMap[K, V]) ToMap() map[K]V {
mm := make(map[K]V, m.Count())
for _, v := range m.buckets {
mm = Merge(mm, v.ToMap())
}
return mm
}
func (m *ConcurrnetMap[K, V]) ForEach(f func(K, V)) { func (m *ConcurrnetMap[K, V]) ForEach(f func(K, V)) {
var wg sync.WaitGroup var wg sync.WaitGroup

View File

@ -12,8 +12,8 @@ func NewHashMap[K constraints.Ordered, V any]() *hashMap[K, V] {
return &hashMap[K, V]{m: make(map[K]V)} return &hashMap[K, V]{m: make(map[K]V)}
} }
func newHashMap[K constraints.Ordered, V any](m map[K]V) *hashMap[K, V] { func newHashMap[K constraints.Ordered, V any](maps ...map[K]V) *hashMap[K, V] {
return &hashMap[K, V]{m: m} return &hashMap[K, V]{m: Merge(maps...)}
} }
func (m *hashMap[K, V]) Set(key K, value V) { func (m *hashMap[K, V]) Set(key K, value V) {
@ -56,6 +56,33 @@ func (m *hashMap[K, V]) ForEach(f func(K, V)) {
} }
} }
func (m *hashMap[K, V]) Keys() []K {
keys := make([]K, 0, m.Count())
for k := range m.m {
keys = append(keys, k)
}
return keys
}
func (m *hashMap[K, V]) Values() []V {
values := make([]V, 0, m.Count())
for _, v := range m.m {
values = append(values, v)
}
return values
}
func (m *hashMap[K, V]) ToMap() map[K]V {
mm := make(map[K]V, m.Count())
for k, v := range m.m {
mm[k] = v
}
return mm
}
func (m *hashMap[K, V]) Clear() { func (m *hashMap[K, V]) Clear() {
m.m = make(map[K]V) m.m = make(map[K]V)
} }

View File

@ -3,13 +3,16 @@ package maps
import "golang.org/x/exp/constraints" import "golang.org/x/exp/constraints"
type Map[K constraints.Ordered, V any] interface { type Map[K constraints.Ordered, V any] interface {
Set(key K, value V) Set(key K, value V) // 设置值
Get(key K) (value V, ok bool) Get(key K) (value V, ok bool) // 获取值
Exist(key K) bool Exist(key K) bool // 键是否存在
Delete(key K) Delete(key K) // 删除值
Clone() Map[K, V] Keys() []K // 获取所有键
Clear() Values() []V // 获取所有值
Count() int ToMap() map[K]V // 转换为map
Clone() Map[K, V] // 复制
Clear() // 清空
Count() int // 数量
Iter() <-chan *Entry[K, V] Iter() <-chan *Entry[K, V]
ForEach(f func(K, V)) ForEach(f func(K, V))
} }
@ -18,3 +21,14 @@ type Entry[K constraints.Ordered, V any] struct {
Key K Key K
Value V Value V
} }
func Merge[K comparable, V any](mm ...map[K]V) map[K]V {
ret := make(map[K]V)
for _, m := range mm {
for k, v := range m {
ret[k] = v
}
}
return ret
}

View File

@ -16,3 +16,12 @@ func TestHashMap(t *testing.T) {
_ = m _ = m
} }
func TestIter(t *testing.T) {
m := maps.NewHashMap[string, string]()
m.Set("abc", "abc")
for e := range m.Iter() {
t.Log(e.Key, e.Value)
}
}

View File

@ -13,8 +13,9 @@ type rw_map[K constraints.Ordered, V any] struct {
mu sync.RWMutex mu sync.RWMutex
} }
func NewRWMap[K constraints.Ordered, V any]() *rw_map[K, V] { func NewRWMap[K constraints.Ordered, V any](maps ...map[K]V) *rw_map[K, V] {
return &rw_map[K, V]{} merged := Merge(maps...)
return &rw_map[K, V]{m: newHashMap(merged)}
} }
func newRWMap[K constraints.Ordered, V any](m Map[K, V]) *rw_map[K, V] { func newRWMap[K constraints.Ordered, V any](m Map[K, V]) *rw_map[K, V] {
@ -41,6 +42,26 @@ func (m *rw_map[K, V]) Delete(key K) {
m.m.Delete(key) m.m.Delete(key)
} }
func (m *rw_map[K, V]) Keys() []K {
m.mu.RLock()
defer m.mu.RUnlock()
return m.m.Keys()
}
func (m *rw_map[K, V]) Values() []V {
m.mu.RLock()
defer m.mu.RUnlock()
return m.m.Values()
}
func (m *rw_map[K, V]) ToMap() map[K]V {
m.mu.RLock()
defer m.mu.RUnlock()
return m.m.ToMap()
}
func (m *rw_map[K, V]) Exist(key K) bool { func (m *rw_map[K, V]) Exist(key K) bool {
return m.m.Exist(key) return m.m.Exist(key)
} }

View File

@ -23,12 +23,17 @@ type sorted_map[K constraints.Ordered, V any] struct {
maps Map[K, V] maps Map[K, V]
} }
func NewSortedMap[K constraints.Ordered, V any]() *sorted_map[K, V] { func NewSortedMap[K constraints.Ordered, V any](maps ...map[K]V) *sorted_map[K, V] {
return &sorted_map[K, V]{keys: make([]K, 0), maps: NewHashMap[K, V]()} merged := Merge(maps...)
return &sorted_map[K, V]{
keys: keys(merged),
maps: newHashMap(merged),
}
} }
func NewSortedByMap[K constraints.Ordered, V any](m Map[K, V]) *sorted_map[K, V] { func NewSortedByMap[K constraints.Ordered, V any](m Map[K, V]) *sorted_map[K, V] {
return &sorted_map[K, V]{maps: m, keys: getKeys(m)}
return &sorted_map[K, V]{maps: m, keys: m.Keys()}
} }
func (m *sorted_map[K, V]) Get(key K) (V, bool) { func (m *sorted_map[K, V]) Get(key K) (V, bool) {
@ -61,7 +66,7 @@ func (m *sorted_map[K, V]) Clear() {
} }
func (m *sorted_map[K, V]) Clone() Map[K, V] { func (m *sorted_map[K, V]) Clone() Map[K, V] {
return &sorted_map[K, V]{maps: m.maps.Clone(), keys: getKeys(m.maps)} return &sorted_map[K, V]{maps: m.maps.Clone(), keys: m.Keys()}
} }
func (m *sorted_map[K, V]) Iter() <-chan *Entry[K, V] { func (m *sorted_map[K, V]) Iter() <-chan *Entry[K, V] {
@ -113,6 +118,10 @@ func (s *sorted_map[K, V]) Values() []V {
return ret return ret
} }
func (s *sorted_map[K, V]) ToMap() map[K]V {
return s.maps.ToMap()
}
func (m *sorted_map[K, V]) String() string { func (m *sorted_map[K, V]) String() string {
return fmt.Sprintf("map[%s]", m.Join(" ", func(k K, v V) string { return fmt.Sprintf("map[%s]", m.Join(" ", func(k K, v V) string {
return fmt.Sprintf("%v:%v", k, v) return fmt.Sprintf("%v:%v", k, v)
@ -142,12 +151,11 @@ func (m *sorted_map[K, V]) Desc() SortedMap[K, V] {
} }
} }
func getKeys[K constraints.Ordered, V any](m Map[K, V]) []K { func keys[K comparable, V any](m map[K]V) []K {
keys := make([]K, 0, m.Count()) keys := make([]K, 0, len(m))
for k := range m {
m.ForEach(func(k K, v V) {
keys = append(keys, k) keys = append(keys, k)
}) }
return keys return keys
} }