refactor: move cachebatchkv/cache.go to cachekv/batchkv.go

chenyanchen · Jan 12, 2024 · 705bf2d · 705bf2d
1 parent 3e139cf
commit 705bf2d
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/cachebatchkv/cache.go → cachekv/batchkv.go b/cachebatchkv/cache.go → cachekv/batchkv.go
@@ -1,12 +1,11 @@
-package cachebatchkv
+package cachekv
 
 import (
 	"context"
 	"errors"
 	"fmt"
 
 	"github.com/chenyanchen/db"
-	"github.com/chenyanchen/db/cachekv"
 )
 
 // cacheBatchKV is a struct that contains a cache and a source BatchKV.
@@ -19,13 +18,13 @@ type cacheBatchKV[K comparable, V any] struct {
 	source db.BatchKV[K, V]
 }
 
-// New creates a new cacheBatchKV instance with the given source and options.
-func New[K comparable, V any](
+// NewBatch creates a new cacheBatchKV instance with the given source and options.
+func NewBatch[K comparable, V any](
 	source db.BatchKV[K, V],
-	options ...cachekv.Option[K, V],
+	options ...Option[K, V],
 ) *cacheBatchKV[K, V] {
 	return &cacheBatchKV[K, V]{
-		cache:  cachekv.New(options...),
+		cache:  New(options...),
 		source: source,
 	}
 }

diff --git a/cachekv/cache.go → cachekv/kv.go b/cachekv/cache.go → cachekv/kv.go
diff --git a/cachekv/cache_test.go → cachekv/kv_test.go b/cachekv/cache_test.go → cachekv/kv_test.go