feat: add zipzset

Makefile

@@ -3,7 +3,7 @@ run-gc:
 
 test-cover:
 	make clean
-	go test . -race -coverprofile=coverage.txt -covermode=atomic
+	go test ./... -race -coverprofile=coverage.txt -covermode=atomic
 	go tool cover -html=coverage.txt -o coverage.html
 
 fuzz-test:

internal/hash/benchmark/main.go → internal/benchmark/main.go

@@ -3,6 +3,7 @@ package main
 import (
 	"flag"
 	"fmt"
+	"github.com/xgzlucario/rotom/internal/zset"
 	"runtime"
 	"runtime/debug"
 	"time"
@@ -26,6 +27,10 @@ func genKV(id int) (string, []byte) {
 	return k, []byte(k)
 }
 
+func genK(id int) string {
+	return fmt.Sprintf("%08x", id)
+}
+
 func main() {
 	c := ""
 	flag.StringVar(&c, "obj", "hashmap", "object to bench.")
@@ -45,7 +50,6 @@ func main() {
 			}
 			m[i] = hm
 		}
-
 	case "zipmap":
 		for i := 0; i < 10000; i++ {
 			hm := hash.NewZipMap()
@@ -55,9 +59,25 @@ func main() {
 			}
 			m[i] = hm
 		}
+	case "zset":
+		for i := 0; i < 10000; i++ {
+			zs := zset.New()
+			for i := 0; i < 512; i++ {
+				zs.Set(genK(i), float64(i))
+			}
+			m[i] = zs
+		}
+	case "zipzset":
+		for i := 0; i < 10000; i++ {
+			zs := zset.NewZipZSet()
+			for i := 0; i < 512; i++ {
+				zs.Set(genK(i), float64(i))
+			}
+			m[i] = zs
+		}
 	}
-	cost := time.Since(start)
 
+	cost := time.Since(start)
 	var mem runtime.MemStats
 	var stat debug.GCStats
 

internal/hash/bench_test.go

@@ -2,41 +2,42 @@ package hash
 
 import (
 	"fmt"
+	"github.com/xgzlucario/rotom/internal/iface"
 	"testing"
 )
 
 const N = 512
 
 func BenchmarkMap(b *testing.B) {
-	benchMapI("map", func() MapI { return NewMap() }, b)
-	benchMapI("zipmap", func() MapI { return NewZipMap() }, b)
+	benchMapI("map", func() iface.MapI { return NewMap() }, b)
+	benchMapI("zipmap", func() iface.MapI { return NewZipMap() }, b)
 }
 
 func BenchmarkSet(b *testing.B) {
-	benchSetI("set", func() SetI { return NewSet() }, b)
-	benchSetI("zipset", func() SetI { return NewZipSet() }, b)
+	benchSetI("set", func() iface.SetI { return NewSet() }, b)
+	benchSetI("zipset", func() iface.SetI { return NewZipSet() }, b)
 }
 
 func genKey(i int) string {
 	return fmt.Sprintf("%08x", i)
 }
 
-func genMap(m MapI, n int) MapI {
+func genMap(m iface.MapI, n int) iface.MapI {
 	for i := 0; i < n; i++ {
 		k := genKey(i)
 		m.Set(k, []byte(k))
 	}
 	return m
 }
 
-func genSet(s SetI, n int) SetI {
+func genSet(s iface.SetI, n int) iface.SetI {
 	for i := 0; i < n; i++ {
 		s.Add(genKey(i))
 	}
 	return s
 }
 
-func benchMapI(name string, newf func() MapI, b *testing.B) {
+func benchMapI(name string, newf func() iface.MapI, b *testing.B) {
 	b.Run(name+"/get", func(b *testing.B) {
 		m := genMap(newf(), N)
 		b.ResetTimer()
@@ -68,7 +69,7 @@ func benchMapI(name string, newf func() MapI, b *testing.B) {
 	})
 }
 
-func benchSetI(name string, newf func() SetI, b *testing.B) {
+func benchSetI(name string, newf func() iface.SetI, b *testing.B) {
 	b.Run(name+"/add", func(b *testing.B) {
 		m := newf()
 		for i := 0; i < b.N; i++ {

internal/hash/map.go

@@ -7,16 +7,7 @@ import (
 	"github.com/xgzlucario/rotom/internal/resp"
 )
 
-type MapI interface {
-	iface.Encoder
-	Set(key string, val []byte) bool
-	Get(key string) ([]byte, bool)
-	Remove(key string) bool
-	Len() int
-	Scan(fn func(key string, val []byte))
-}
-
-var _ MapI = (*Map)(nil)
+var _ iface.MapI = (*Map)(nil)
 
 type Map struct {
 	data *swiss.Map[string, []byte]

internal/hash/set.go

@@ -10,17 +10,7 @@ const (
 	defaultSetSize = 512
 )
 
-type SetI interface {
-	iface.Encoder
-	Add(key string) bool
-	Exist(key string) bool
-	Remove(key string) bool
-	Pop() (key string, ok bool)
-	Scan(fn func(key string))
-	Len() int
-}
-
-var _ SetI = (*Set)(nil)
+var _ iface.SetI = (*Set)(nil)
 
 type Set struct {
 	mapset.Set[string]

internal/hash/zipmap.go

@@ -1,13 +1,14 @@
 package hash
 
 import (
+	"github.com/xgzlucario/rotom/internal/iface"
 	"github.com/xgzlucario/rotom/internal/resp"
 	"unsafe"
 
 	"github.com/xgzlucario/rotom/internal/list"
 )
 
-var _ MapI = (*ZipMap)(nil)
+var _ iface.MapI = (*ZipMap)(nil)
 
 // ZipMap store data as [val1, key1, val2, key2...] in listpack.
 type ZipMap struct {
@@ -18,7 +19,7 @@ func NewZipMap() *ZipMap {
 	return &ZipMap{list.NewListPack()}
 }
 
-func (zm *ZipMap) seekTo(key string) (it *list.LpIterator, val []byte) {
+func (zm *ZipMap) seek(key string) (it *list.LpIterator, val []byte) {
 	it = zm.data.Iterator().SeekLast()
 	for !it.IsFirst() {
 		kBytes := it.Prev()
@@ -31,7 +32,7 @@ func (zm *ZipMap) seekTo(key string) (it *list.LpIterator, val []byte) {
 }
 
 func (zm *ZipMap) Set(key string, val []byte) (newField bool) {
-	it, oldVal := zm.seekTo(key)
+	it, oldVal := zm.seek(key)
 	// update
 	if it != nil {
 		if len(val) == len(oldVal) {
@@ -47,15 +48,15 @@ func (zm *ZipMap) Set(key string, val []byte) (newField bool) {
 }
 
 func (zm *ZipMap) Get(key string) ([]byte, bool) {
-	_, val := zm.seekTo(key)
+	_, val := zm.seek(key)
 	if val != nil {
 		return val, true
 	}
 	return nil, false
 }
 
 func (zm *ZipMap) Remove(key string) bool {
-	it, _ := zm.seekTo(key)
+	it, _ := zm.seek(key)
 	if it != nil {
 		it.RemoveNexts(2, nil)
 		return true

internal/hash/zipset.go

@@ -1,11 +1,12 @@
 package hash
 
 import (
+	"github.com/xgzlucario/rotom/internal/iface"
 	"github.com/xgzlucario/rotom/internal/list"
 	"github.com/xgzlucario/rotom/internal/resp"
 )
 
-var _ SetI = (*ZipSet)(nil)
+var _ iface.SetI = (*ZipSet)(nil)
 
 // ZipSet store data as [key1, key2, key3...] in listpack.
 type ZipSet struct {

internal/iface/iface.go

@@ -0,0 +1,38 @@
+package iface
+
+import "github.com/xgzlucario/rotom/internal/resp"
+
+type Encoder interface {
+	Encode(writer *resp.Writer) error
+	Decode(reader *resp.Reader) error
+}
+
+type MapI interface {
+	Encoder
+	Set(key string, val []byte) bool
+	Get(key string) ([]byte, bool)
+	Remove(key string) bool
+	Len() int
+	Scan(fn func(key string, val []byte))
+}
+
+type SetI interface {
+	Encoder
+	Add(key string) bool
+	Exist(key string) bool
+	Remove(key string) bool
+	Pop() (key string, ok bool)
+	Scan(fn func(key string))
+	Len() int
+}
+
+type ListI interface {
+	Encoder
+}
+
+type ZSetI interface {
+	Encoder
+	Get(key string) (score float64, ok bool)
+	Set(key string, score float64) bool
+	Len() int
+}

net.go → internal/net/net.go

@@ -1,4 +1,4 @@
-package main
+package net
 
 import (
 	"golang.org/x/sys/unix"

net_test.go → internal/net/net_test.go

@@ -1,4 +1,4 @@
-package main
+package net
 
 import (
 	"fmt"