move cache to extension

agcache/cache.go

@@ -1,13 +1,5 @@
 package agcache
 
-var (
-	gobalCacheFactory CacheFactory
-)
-
-func init() {
-	gobalCacheFactory = &DefaultCacheFactory{}
-}
-
 //CacheInterface 自定义缓存组件接口
 type CacheInterface interface {
 	Set(key string, value []byte, expireSeconds int) (err error)
@@ -28,13 +20,3 @@ type CacheFactory interface {
 	//Create 创建缓存组件
 	Create() CacheInterface
 }
-
-//GetCacheFactory 获取CacheFactory
-func GetCacheFactory() CacheFactory {
-	return gobalCacheFactory
-}
-
-//UseCacheFactory 替换CacheFactory
-func UseCacheFactory(cacheFactory CacheFactory) {
-	gobalCacheFactory = cacheFactory
-}

agcache/default.go → agcache/memory/memory.go

@@ -1,10 +1,17 @@
-package agcache
+package memory
 
 import (
 	"errors"
 	"sync"
+
+	"github.com/zouyx/agollo/v3/agcache"
+	"github.com/zouyx/agollo/v3/extension"
 )
 
+func init() {
+	extension.SetCacheFactory(&DefaultCacheFactory{})
+}
+
 //DefaultCache 默认缓存
 type DefaultCache struct {
 	defaultCache sync.Map
@@ -56,6 +63,6 @@ type DefaultCacheFactory struct {
 }
 
 //Create 创建默认缓存组件
-func (d *DefaultCacheFactory) Create() CacheInterface {
+func (d *DefaultCacheFactory) Create() agcache.CacheInterface {
 	return &DefaultCache{}
 }

agcache/default_test.go → agcache/memory/memory_test.go

@@ -1,12 +1,13 @@
-package agcache
+package memory
 
 import (
 	"testing"
 
 	. "github.com/tevid/gohamcrest"
+	"github.com/zouyx/agollo/v3/agcache"
 )
 
-var testDefaultCache CacheInterface
+var testDefaultCache agcache.CacheInterface
 
 func init() {
 	factory := &DefaultCacheFactory{}

component/notify/change_event_test.go

@@ -8,6 +8,7 @@ import (
 	"time"
 
 	. "github.com/tevid/gohamcrest"
+	_ "github.com/zouyx/agollo/v3/agcache/memory"
 	"github.com/zouyx/agollo/v3/env"
 	jsonFile "github.com/zouyx/agollo/v3/env/file/json"
 	"github.com/zouyx/agollo/v3/extension"

extension/cache.go

@@ -0,0 +1,17 @@
+package extension
+
+import "github.com/zouyx/agollo/v3/agcache"
+
+var (
+	gobalCacheFactory agcache.CacheFactory
+)
+
+//GetCacheFactory 获取CacheFactory
+func GetCacheFactory() agcache.CacheFactory {
+	return gobalCacheFactory
+}
+
+//SetCacheFactory 替换CacheFactory
+func SetCacheFactory(cacheFactory agcache.CacheFactory) {
+	gobalCacheFactory = cacheFactory
+}

extension/cache_test.go

@@ -0,0 +1,80 @@
+package extension
+
+import (
+	"errors"
+	"sync"
+	"testing"
+
+	. "github.com/tevid/gohamcrest"
+	"github.com/zouyx/agollo/v3/agcache"
+)
+
+type TestCacheFactory struct {
+}
+
+func (d *TestCacheFactory) Create() agcache.CacheInterface {
+	return &defaultCache{}
+}
+
+//DefaultCache 默认缓存
+type defaultCache struct {
+	defaultCache sync.Map
+}
+
+//Set 获取缓存
+func (d *defaultCache) Set(key string, value []byte, expireSeconds int) (err error) {
+	d.defaultCache.Store(key, value)
+	return nil
+}
+
+//EntryCount 获取实体数量
+func (d *defaultCache) EntryCount() (entryCount int64) {
+	count := int64(0)
+	d.defaultCache.Range(func(key, value interface{}) bool {
+		count++
+		return true
+	})
+	return count
+}
+
+//Get 获取缓存
+func (d *defaultCache) Get(key string) (value []byte, err error) {
+	v, ok := d.defaultCache.Load(key)
+	if !ok {
+		return nil, errors.New("load default cache fail")
+	}
+	return v.([]byte), nil
+}
+
+//Range 遍历缓存
+func (d *defaultCache) Range(f func(key, value interface{}) bool) {
+	d.defaultCache.Range(f)
+}
+
+//Del 删除缓存
+func (d *defaultCache) Del(key string) (affected bool) {
+	d.defaultCache.Delete(key)
+	return true
+}
+
+//Clear 清除所有缓存
+func (d *defaultCache) Clear() {
+	d.defaultCache = sync.Map{}
+}
+
+//DefaultCacheFactory 构造默认缓存组件工厂类
+type DefaultCacheFactory struct {
+}
+
+//Create 创建默认缓存组件
+func (d *DefaultCacheFactory) Create() agcache.CacheInterface {
+	return &defaultCache{}
+}
+
+func TestUseCacheFactory(t *testing.T) {
+	SetCacheFactory(&TestCacheFactory{})
+
+	factory := GetCacheFactory()
+	cacheFactory := factory.(*TestCacheFactory)
+	Assert(t, cacheFactory, NotNilVal())
+}

start.go

@@ -2,6 +2,7 @@ package agollo
 
 import (
 	"github.com/zouyx/agollo/v3/agcache"
+	_ "github.com/zouyx/agollo/v3/agcache/memory"
 	"github.com/zouyx/agollo/v3/cluster"
 	_ "github.com/zouyx/agollo/v3/cluster/roundrobin"
 	"github.com/zouyx/agollo/v3/component"
@@ -54,7 +55,7 @@ func SetLogger(loggerInterface log.LoggerInterface) {
 //SetCache 设置自定义cache组件
 func SetCache(cacheFactory agcache.CacheFactory) {
 	if cacheFactory != nil {
-		agcache.UseCacheFactory(cacheFactory)
+		extension.SetCacheFactory(cacheFactory)
 		storage.InitConfigCache()
 	}
 }

start_test.go

@@ -8,7 +8,7 @@ import (
 	"time"
 
 	. "github.com/tevid/gohamcrest"
-	"github.com/zouyx/agollo/v3/agcache"
+	"github.com/zouyx/agollo/v3/agcache/memory"
 	"github.com/zouyx/agollo/v3/component/log"
 	"github.com/zouyx/agollo/v3/component/notify"
 	"github.com/zouyx/agollo/v3/env"
@@ -177,9 +177,9 @@ func TestSetLogger(t *testing.T) {
 }
 
 func TestSetCache(t *testing.T) {
-	defaultCacheFactory := &agcache.DefaultCacheFactory{}
+	defaultCacheFactory := &memory.DefaultCacheFactory{}
 	SetCache(defaultCacheFactory)
-	Assert(t, agcache.GetCacheFactory(), Equal(defaultCacheFactory))
+	Assert(t, extension.GetCacheFactory(), Equal(defaultCacheFactory))
 }
 
 func TestSetLoadBalance(t *testing.T) {

storage/repository.go

@@ -62,7 +62,7 @@ func CreateNamespaceConfig(namespace string) {
 		if _, ok := apolloConfigCache.Load(namespace); ok {
 			return
 		}
-		c := initConfig(namespace, agcache.GetCacheFactory())
+		c := initConfig(namespace, extension.GetCacheFactory())
 		apolloConfigCache.Store(namespace, c)
 	})
 }
@@ -210,7 +210,7 @@ func UpdateApolloConfig(apolloConfig *env.ApolloConfig, isBackupConfig bool) {
 func UpdateApolloConfigCache(configurations map[string]string, expireTime int, namespace string) map[string]*ConfigChange {
 	config := GetConfig(namespace)
 	if config == nil {
-		config = initConfig(namespace, agcache.GetCacheFactory())
+		config = initConfig(namespace, extension.GetCacheFactory())
 		apolloConfigCache.Store(namespace, config)
 	}
 

storage/repository_test.go

@@ -6,6 +6,7 @@ import (
 	"time"
 
 	. "github.com/tevid/gohamcrest"
+	_ "github.com/zouyx/agollo/v3/agcache/memory"
 	"github.com/zouyx/agollo/v3/env"
 	jsonFile "github.com/zouyx/agollo/v3/env/file/json"
 	"github.com/zouyx/agollo/v3/extension"

utils/parser_test.go

@@ -1,7 +1,9 @@
 package utils
 
 import (
+	"errors"
 	"strings"
+	"sync"
 	"testing"
 
 	. "github.com/tevid/gohamcrest"
@@ -14,8 +16,63 @@ var (
 	propertiesParser ContentParser
 )
 
+//DefaultCache 默认缓存
+type DefaultCache struct {
+	defaultCache sync.Map
+}
+
+//Set 获取缓存
+func (d *DefaultCache) Set(key string, value []byte, expireSeconds int) (err error) {
+	d.defaultCache.Store(key, value)
+	return nil
+}
+
+//EntryCount 获取实体数量
+func (d *DefaultCache) EntryCount() (entryCount int64) {
+	count := int64(0)
+	d.defaultCache.Range(func(key, value interface{}) bool {
+		count++
+		return true
+	})
+	return count
+}
+
+//Get 获取缓存
+func (d *DefaultCache) Get(key string) (value []byte, err error) {
+	v, ok := d.defaultCache.Load(key)
+	if !ok {
+		return nil, errors.New("load default cache fail")
+	}
+	return v.([]byte), nil
+}
+
+//Range 遍历缓存
+func (d *DefaultCache) Range(f func(key, value interface{}) bool) {
+	d.defaultCache.Range(f)
+}
+
+//Del 删除缓存
+func (d *DefaultCache) Del(key string) (affected bool) {
+	d.defaultCache.Delete(key)
+	return true
+}
+
+//Clear 清除所有缓存
+func (d *DefaultCache) Clear() {
+	d.defaultCache = sync.Map{}
+}
+
+//DefaultCacheFactory 构造默认缓存组件工厂类
+type DefaultCacheFactory struct {
+}
+
+//Create 创建默认缓存组件
+func (d *DefaultCacheFactory) Create() agcache.CacheInterface {
+	return &DefaultCache{}
+}
+
 func init() {
-	factory := &agcache.DefaultCacheFactory{}
+	factory := &DefaultCacheFactory{}
 	testDefaultCache = factory.Create()
 
 	defaultParser = &DefaultParser{}