开启缓存时候加读写锁

Author: v_llxjliu

filter/eq_json.go

@@ -0,0 +1,45 @@
+package filter
+
+import (
+	"encoding/json"
+	"reflect"
+)
+
+func equalJSON(jsonStr1, jsonStr2 string) (bool, error) {
+	var i interface{}
+	var i2 interface{}
+	err := json.Unmarshal([]byte(jsonStr1), &i)
+	if err != nil {
+		return false, err
+	}
+	err = json.Unmarshal([]byte(jsonStr2), &i2)
+	if err != nil {
+		return false, err
+	}
+	return reflect.DeepEqual(i, i2), nil
+}
+
+// EqualJSON 判断两个或者多个json字符串是否等价（有相同的键值，不同的顺序）
+func EqualJSON(jsonStr1, jsonStr2 string, moreJson ...string) (bool, error) {
+	if len(moreJson) == 0 {
+		return equalJSON(jsonStr1, jsonStr2)
+	}
+	equal, err := equalJSON(jsonStr1, jsonStr2)
+	if err != nil {
+		return false, err
+	}
+	if !equal {
+		return false, nil
+	}
+	for _, js := range moreJson {
+		eq, err := equalJSON(jsonStr1, js)
+		if err != nil {
+			return false, err
+		}
+		if !eq {
+			return false, err
+		}
+	}
+	return true, nil
+
+}

filter/parser.go

@@ -104,10 +104,12 @@ func getOmitTag(scene string, pkgInfo string, i int, typeOf reflect.Type) tagInf
 	}
 	fieldName := typeOf.Field(i).Name
 	cacheKey := tagCache.key(pkgInfo, scene, fieldName, false)
-	tagEl, exist := tagCache.fields[cacheKey]
+	//tagEl, exist := tagCache.fields[cacheKey]
+	tagEl, exist := tagCache.GetField(cacheKey)
 	if !exist { //如果缓存里没取到
 		omitTag = getFieldOmitTag(typeOf.Field(i), scene)
-		tagCache.fields[cacheKey] = omitTag.tag
+		//tagCache.fields[cacheKey] = omitTag.tag
+		tagCache.SetField(cacheKey, omitTag.tag)
 		return omitTag
 	}
 	omitTag.tag = tagEl
@@ -124,10 +126,11 @@ func getSelectTag(scene string, pkgInfo string, i int, typeOf reflect.Type) tagI
 
 	fieldName := typeOf.Field(i).Name
 	cacheKey := tagCache.key(pkgInfo, scene, fieldName, true)
-	tagEl, exist := tagCache.fields[cacheKey]
+	//tagEl, exist := tagCache.fields[cacheKey]
+	tagEl, exist := tagCache.GetField(cacheKey)
 	if !exist { //如果缓存里没取到
 		selectTag = getFieldSelectTag(typeOf.Field(i), scene)
-		tagCache.fields[cacheKey] = selectTag.tag
+		tagCache.SetField(cacheKey, selectTag.tag)
 		return selectTag
 	}
 	selectTag.tag = tagEl

filter/tag_cache.go

@@ -1,17 +1,36 @@
 package filter
 
-var tagCache cache
+import "sync"
+
+var tagCache = cache{
+	fields: make(map[string]tag),
+	lock:   &sync.RWMutex{},
+}
 
 var enableCache = true
 
-func init() {
-	tagCache.fields = make(map[string]tag)
-}
+//func init() {
+//	tagCache.fields = make(map[string]tag)
+//}
 
 type cache struct {
+	lock   *sync.RWMutex
 	fields map[string]tag
 }
 
+func (c *cache) GetField(key string) (tag, bool) {
+	c.lock.RLock()
+	v, ok := c.fields[key]
+	c.lock.RUnlock()
+	return v, ok
+}
+
+func (c *cache) SetField(key string, tagEl tag) {
+	c.lock.Lock()
+	c.fields[key] = tagEl
+	c.lock.Unlock()
+}
+
 func (c *cache) key(pkgInfo string, scene string, fieldName string, isSelect bool) string {
 	s := ""
 	if !isSelect {

test/main.go

@@ -4,6 +4,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"github.com/liu-cn/json-filter/filter"
+	"time"
 )
 
 func mustJson(v interface{}) string {
@@ -39,8 +40,60 @@ func (u *Us) GetAvatar2() string {
 	return string(u.Avatar[:]) + ".jpg"
 }
 
+func goOmit() {
+	type (
+		Tag struct {
+			Icon string `json:"icon,omit(article)"`
+			Name string `json:"name,omit(profile)"`
+		}
+		Articles struct {
+			Password int   `json:"password,omit($any)"` //$any表示任何场景都排除该字段
+			Tags     []Tag `json:"tags"`
+			Hot      int   `json:"hot,select(img),func(GetHot)"` //热度 过滤时会调用GetHot方法获取该字段的值
+			Like     int   `json:"-"`
+			Collect  int   `json:"-"`
+		}
+	)
+
+	articles := Articles{Like: 100, Collect: 20, Tags: []Tag{{"icon", "foo"}, {"icon", "bar"}}}
+
+	for i := 0; i < 100; i++ {
+		go func() {
+			fmt.Println(filter.Omit("article", &articles)) //尽量传指针，不传指针func选择器中的用指针接收的方法无法被调用
+		}()
+	}
+
+}
+func goSelect() {
+	type (
+		Tag struct {
+			Icon string `json:"icon,omit(article)"`
+			Name string `json:"name,omit(profile)"`
+		}
+		Articles struct {
+			Password int   `json:"password,omit($any)"` //$any表示任何场景都排除该字段
+			Tags     []Tag `json:"tags"`
+			Hot      int   `json:"hot,select(img),func(GetHot)"` //热度 过滤时会调用GetHot方法获取该字段的值
+			Like     int   `json:"-"`
+			Collect  int   `json:"-"`
+		}
+	)
+
+	articles := Articles{Like: 100, Collect: 20, Tags: []Tag{{"icon", "foo"}, {"icon", "bar"}}}
+
+	for i := 0; i < 10000; i++ {
+		go func() {
+			fmt.Println(filter.Select("article", &articles)) //尽量传指针，不传指针func选择器中的用指针接收的方法无法被调用
+		}()
+	}
+
+}
+
 func main() {
 
+	//goOmit()
+	goSelect()
+	time.Sleep(time.Second * 10)
 	//var bb = []byte(`{"a":"1"}`)
 	//u := Us{
 	//	BB:         [3]byte{1, 2, 4},
@@ -55,8 +108,8 @@ func main() {
 	//fmt.Println(filter.Omit("1", &list))
 	//fmt.Println(mustJson(u))
 
-	TestMap()
-	TestMap()
+	//TestMap()
+	//TestMap()
 	//for i := 0; i < 3; i++ {
 	//	ExampleOmit()
 	//}