更新下cmap

Author: guonaihong

.gitignore

@@ -10,6 +10,7 @@
 
 # Output of the go coverage tool, specifically when used with LiteIDE
 *.out
+*.log
 
 # Dependency directories (remove the comment below to include it)
 # vendor/

README.md

@@ -13,7 +13,7 @@
 ```
 
 ## 三、`rhashmap`
-和标准库不同的地址是有序hash
+和标准库不同的地方是有序hash
 ```go
 ```
 

btree/btree_bench_test.go

@@ -63,7 +63,8 @@ func BenchmarkGetStd(b *testing.B) {
 
 	max := float64(b.N)
 	//max := 1000000.0 * 5
-	set := make(map[float64]float64, int(max))
+	set := make(map[float64]float64)
+	//set := make(map[float64]float64, int(max))
 	for i := 0.0; i < max; i++ {
 		set[i] = i
 	}

cmap/cmap.go

@@ -7,29 +7,29 @@ import (
 	"unsafe"
 
 	"github.com/antlabs/gstl/api"
-	"github.com/antlabs/gstl/mapex"
 	xxhash "github.com/cespare/xxhash/v2"
+	"golang.org/x/exp/constraints"
 )
 
 var _ api.CMaper[int, int] = (*CMap[int, int])(nil)
 
-type Pair[K comparable, V any] struct {
+type Pair[K constraints.Ordered, V any] struct {
 	Key K
 	Val V
 }
 
-type CMap[K comparable, V any] struct {
+type CMap[K constraints.Ordered, V any] struct {
 	bucket   []Item[K, V]
 	keySize  int
 	isKeyStr bool
 }
 
-type Item[K comparable, V any] struct {
+type Item[K constraints.Ordered, V any] struct {
 	rw sync.RWMutex
-	m  map[K]V
+	m  api.Map[K, V]
 }
 
-func New[K comparable, V any]() (c *CMap[K, V]) {
+func New[K constraints.Ordered, V any]() (c *CMap[K, V]) {
 	c = &CMap[K, V]{}
 	c.init(0)
 	return c
@@ -48,7 +48,7 @@ func (c *CMap[K, V]) init(n int) {
 	c.bucket = make([]Item[K, V], np)
 
 	for i := range c.bucket {
-		c.bucket[i].m = make(map[K]V)
+		c.bucket[i].m = newStdMap[K, V]()
 	}
 
 }
@@ -92,42 +92,43 @@ func (c *CMap[K, V]) findIndex(key K) *Item[K, V] {
 func (c *CMap[K, V]) Delete(key K) {
 	item := c.findIndex(key)
 	item.rw.Lock()
-	delete(item.m, key)
+	item.m.Delete(key)
 	item.rw.Unlock()
 }
 
 func (c *CMap[K, V]) Load(key K) (value V, ok bool) {
 	item := c.findIndex(key)
 	item.rw.RLock()
-	value, ok = item.m[key]
+	value, ok = item.m.GetWithBool(key)
 	item.rw.RUnlock()
 	return
 }
 
 func (c *CMap[K, V]) LoadAndDelete(key K) (value V, loaded bool) {
 	item := c.findIndex(key)
 	item.rw.Lock()
-	value, loaded = item.m[key]
+	value, loaded = item.m.GetWithBool(key)
 	if !loaded {
 		item.rw.Unlock()
 		return
 	}
-	delete(item.m, key)
+	item.m.Delete(key)
 	item.rw.Unlock()
 	return
 }
 
 func (c *CMap[K, V]) LoadOrStore(key K, value V) (actual V, loaded bool) {
 	item := c.findIndex(key)
 	item.rw.Lock()
-	actual, loaded = item.m[key]
+	actual, loaded = item.m.GetWithBool(key)
 	if !loaded {
 		actual = value
-		item.m[key] = actual
+		item.m.Set(key, actual)
 		item.rw.Unlock()
 		return
 	}
-	actual, loaded = item.m[key]
+
+	actual, loaded = item.m.GetWithBool(key)
 	item.rw.Unlock()
 	return
 }
@@ -136,12 +137,7 @@ func (c *CMap[K, V]) Range(f func(key K, value V) bool) {
 	for i := 0; i < len(c.bucket); i++ {
 		item := &c.bucket[i]
 		item.rw.RLock()
-		for k, v := range item.m {
-			if !f(k, v) {
-				item.rw.RUnlock()
-				return
-			}
-		}
+		item.m.Range(f)
 		item.rw.RUnlock()
 	}
 }
@@ -164,9 +160,10 @@ func (c *CMap[K, V]) Iter() (rv chan Pair[K, V]) {
 
 			defer wg.Done()
 			item.rw.RLock()
-			for k, v := range item.m {
-				rv <- Pair[K, V]{Key: k, Val: v}
-			}
+			item.m.Range(func(key K, value V) bool {
+				rv <- Pair[K, V]{Key: key, Val: value}
+				return true
+			})
 			item.rw.RUnlock()
 
 		}(item)
@@ -178,7 +175,7 @@ func (c *CMap[K, V]) Iter() (rv chan Pair[K, V]) {
 func (c *CMap[K, V]) Store(key K, value V) {
 	item := c.findIndex(key)
 	item.rw.Lock()
-	item.m[key] = value
+	item.m.Set(key, value)
 	item.rw.Unlock()
 	return
 }
@@ -195,7 +192,10 @@ func (c *CMap[K, V]) Keys() []K {
 
 		item := &c.bucket[i]
 		item.rw.RLock()
-		all = append(all, mapex.Keys(item.m)...)
+		item.m.Range(func(key K, value V) bool {
+			all = append(all, key)
+			return true
+		})
 		item.rw.RUnlock()
 	}
 	return all
@@ -212,7 +212,10 @@ func (c *CMap[K, V]) Values() []V {
 
 		item := &c.bucket[i]
 		item.rw.RLock()
-		all = append(all, mapex.Values(item.m)...)
+		item.m.Range(func(key K, value V) bool {
+			all = append(all, value)
+			return true
+		})
 		item.rw.RUnlock()
 	}
 	return all
@@ -223,7 +226,7 @@ func (c *CMap[K, V]) Len() int {
 	for i := 0; i < len(c.bucket); i++ {
 		item := &c.bucket[i]
 		item.rw.RLock()
-		l += len(item.m)
+		l += item.m.Len()
 		item.rw.RUnlock()
 	}
 	return l

cmap/cmap_bench_test.go

@@ -72,7 +72,7 @@ func benchMap(b *testing.B, bench bench[int, int]) {
 		b.Run(fmt.Sprintf("%T", m), func(b *testing.B) {
 			m = reflect.New(reflect.TypeOf(m).Elem()).Interface().(api.CMaper[int, int])
 			if m2, ok := m.(*CMap[int, int]); ok {
-				m2.init(1)
+				m2.init(64)
 			}
 
 			if bench.setup != nil {

cmap/cmap_stdmap.go

@@ -0,0 +1,58 @@
+package cmap
+
+import (
+	"github.com/antlabs/gstl/api"
+	"golang.org/x/exp/constraints"
+)
+
+var _ api.Map[int, int] = (*stdmap[int, int])(nil)
+
+type stdmap[K constraints.Ordered, V any] struct {
+	m map[K]V
+}
+
+func newStdMap[K constraints.Ordered, V any]() *stdmap[K, V] {
+	return &stdmap[K, V]{m: make(map[K]V)}
+}
+
+func (s *stdmap[K, V]) Get(key K) (elem V) {
+	elem, _ = s.m[key]
+	return
+}
+
+// 获取
+func (s *stdmap[K, V]) GetWithBool(key K) (elem V, ok bool) {
+	elem, ok = s.m[key]
+	return
+}
+
+// 删除
+func (s *stdmap[K, V]) Delete(key K) {
+	delete(s.m, key)
+}
+
+// 设置
+func (s *stdmap[K, V]) Set(key K, value V) {
+	s.m[key] = value
+}
+
+// 设置值
+func (s *stdmap[K, V]) SetWithPrev(key K, value V) (prev V, replaced bool) {
+	prev, replaced = s.m[key]
+	s.m[key] = value
+	return
+}
+
+// int
+func (s *stdmap[K, V]) Len() int {
+	return len(s.m)
+}
+
+// 遍历
+func (s *stdmap[K, V]) Range(callback func(k K, v V) bool) {
+	for k, v := range s.m {
+		if !callback(k, v) {
+			return
+		}
+	}
+}

rbtree/rbtree_bench_test.go

@@ -29,6 +29,16 @@ import (
 	"testing"
 )
 
+func BenchmarkSetAsc(b *testing.B) {
+	//max := 1000000.0 * 5
+	set := New[float64, float64]()
+	max := float64(b.N)
+	for i := 0.0; i < max; i++ {
+		set.Set(i, i)
+	}
+
+}
+
 func BenchmarkGetAsc(b *testing.B) {
 	//max := 1000000.0 * 5
 	set := New[float64, float64]()
@@ -83,3 +93,23 @@ func BenchmarkGetStd(b *testing.B) {
 		}
 	}
 }
+
+func BenchmarkSet(b *testing.B) {
+	max := float64(b.N)
+	//max := 1000000.0 * 5
+	set := New[float64, float64]()
+	for i := max; i >= 0; i-- {
+		set.Set(i, i)
+	}
+
+}
+
+func BenchmarkSetStd(b *testing.B) {
+	max := float64(b.N)
+	//max := 1000000.0 * 5
+	set := make(map[float64]float64)
+	for i := max; i >= 0.0; i-- {
+		set[i] = i
+	}
+
+}

rhashmap/rhashmap_bench_test.go

@@ -25,8 +25,22 @@ import (
 // PASS
 // ok  	github.com/antlabs/gstl/rhashmap	3.970s
 // 五百万数据的Get操作时间
+
+// TODO 再优化下性能
+// go1.19.1
+// 3kw
+// goos: darwin
+// goarch: arm64
+// pkg: github.com/antlabs/gstl/rhashmap
+// BenchmarkGet-8      	34664005	        62.20 ns/op
+// BenchmarkGetStd-8   	30007470	        49.40 ns/op
+// BenchmarkSet-8      	14623854	       178.9 ns/op
+// BenchmarkSetStd-8   	22709601	        74.71 ns/op
+// PASS
+// ok  	github.com/antlabs/gstl/rhashmap	16.521s
 func BenchmarkGet(b *testing.B) {
-	max := 1000000.0 * 5
+	//max := 1000000.0 * 5
+	max := float64(b.N)
 	set := NewWithOpt[float64, float64](WithCap(int(max)))
 	for i := 0.0; i < max; i++ {
 		set.Set(i, i)
@@ -44,7 +58,7 @@ func BenchmarkGet(b *testing.B) {
 
 func BenchmarkGetStd(b *testing.B) {
 
-	max := 1000000.0 * 5
+	max := float64(b.N)
 	set := make(map[float64]float64, int(max))
 	for i := 0.0; i < max; i++ {
 		set[i] = i
@@ -62,7 +76,7 @@ func BenchmarkGetStd(b *testing.B) {
 
 // gstl set
 func BenchmarkSet(b *testing.B) {
-	max := 1000000.0
+	max := float64(b.N)
 	set := NewWithOpt[float64, float64](WithCap(int(max)))
 	for i := 0.0; i < max; i++ {
 		set.Set(i, i)
@@ -73,7 +87,7 @@ func BenchmarkSet(b *testing.B) {
 // 标准库set
 func BenchmarkSetStd(b *testing.B) {
 
-	max := 1000000.0
+	max := float64(b.N)
 	set := make(map[float64]float64, int(max))
 	for i := 0.0; i < max; i++ {
 		set[i] = i