refactoring handle constrains of lru cache

adding benchmark tests

internal/celproc/celproc.go

@@ -74,7 +74,8 @@ func ProcCel(celModel model.CelModel) (model.CelResult, error) {
 	var prg cel.Program
 	id := celModel.Identifier
 	if id != "" {
-		entry, ok := lrucache.Get(id)
+		var entry LRUEntry
+		entry, ok = lrucache.Get(id)
 		if ok {
 			prg = entry.Program
 		}
@@ -115,26 +116,18 @@ func ProcCel(celModel model.CelModel) (model.CelResult, error) {
 				ID:      id,
 				Program: prg,
 			})
-			for {
-				id := lrucache.HandleContrains()
-				if id != "" {
-					lrucache.Delete(id)
-				} else {
-					break
-				}
-			}
-
+			go lrucache.HandleContrains()
 		}
 	}
 	out, details, err := prg.Eval(context)
-	fmt.Printf("result: %v\ndetails: %v\nerror: %v\n", out, details, err)
+	//fmt.Printf("result: %v\ndetails: %v\nerror: %v\n", out, details, err)
 
 	if err != nil {
 		log.Logger.Errorf("program evaluation error: %v", err)
 
 		return model.CelResult{
 			Error:   fmt.Sprintf("%v", err),
-			Message: fmt.Sprintf("program evaluation error: %s", err.Error()),
+			Message: fmt.Sprintf("program evaluation error: %s\r\ndetails: %s", err.Error(), details),
 		}, err
 	}
 	switch v := out.(type) {

internal/celproc/celproc_test.go

@@ -5,6 +5,7 @@ import (
 	"encoding/json"
 	"io/ioutil"
 	"testing"
+	"time"
 
 	"google.golang.org/protobuf/types/known/structpb"
 	"gopkg.in/yaml.v3"
@@ -44,11 +45,33 @@ func TestJson(t *testing.T) {
 	}
 }
 
-func TestJsonMany(t *testing.T) {
+func BenchmarkJsonManyWithoutCache(t *testing.B) {
 	ast := assert.New(t)
 
-	celModels := readJson("../../test/data/data1.json", t)
-	for i := 0; i < 1000; i++ {
+	celModels := readJsonB("../../test/data/data1.json", t)
+	stt := time.Now()
+	for i := 0; i < 10000; i++ {
+		for _, cm := range celModels {
+			cm.Request.Context = convertJson2Map(cm.Request.Context)
+			cm.Request.Identifier = "" //fmt.Sprintf("%d_%d", i, x)
+			result, err := ProcCel(cm.Request)
+			ast.Nil(err)
+			ast.NotNil(result)
+
+			ast.Equal(cm.Result, result.Result)
+		}
+	}
+	ste := time.Now()
+
+	t.Logf("execution: %d", ste.Sub(stt).Milliseconds())
+}
+
+func BenchmarkJsonManyWithCache(t *testing.B) {
+	ast := assert.New(t)
+
+	celModels := readJsonB("../../test/data/data1.json", t)
+	stt := time.Now()
+	for i := 0; i < 10000; i++ {
 		for _, cm := range celModels {
 			cm.Request.Context = convertJson2Map(cm.Request.Context)
 			result, err := ProcCel(cm.Request)
@@ -58,6 +81,9 @@ func TestJsonMany(t *testing.T) {
 			ast.Equal(cm.Result, result.Result)
 		}
 	}
+	ste := time.Now()
+
+	t.Logf("execution: %d", ste.Sub(stt).Milliseconds())
 }
 
 func TestGRPCJson(t *testing.T) {
@@ -104,3 +130,16 @@ func readJson(filename string, t *testing.T) []model.TestCelModel {
 	ast.Nil(err)
 	return celModels
 }
+
+func readJsonB(filename string, t *testing.B) []model.TestCelModel {
+	ast := assert.New(t)
+	ya, err := ioutil.ReadFile(filename)
+	ast.Nil(err)
+	var celModels []model.TestCelModel
+	decoder := json.NewDecoder(bytes.NewReader(ya))
+	decoder.UseNumber()
+	err = decoder.Decode(&celModels)
+	//err = json.Unmarshal(ya, &celModels)
+	ast.Nil(err)
+	return celModels
+}

internal/celproc/lrulist.go

@@ -18,6 +18,7 @@ type LRUList struct {
 	MaxCount int
 	entries  []LRUEntry
 	dmu      sync.Mutex
+	cstLock  sync.Mutex
 }
 
 func (l *LRUList) Init() {
@@ -66,7 +67,20 @@ func (l *LRUList) GetFullIDList() []string {
 	return ids
 }
 
-func (l *LRUList) HandleContrains() string {
+func (l *LRUList) HandleContrains() {
+	l.cstLock.Lock()
+	defer l.cstLock.Unlock()
+	for {
+		id := l.getSingleContrained()
+		if id != "" {
+			l.Delete(id)
+		} else {
+			break
+		}
+	}
+}
+
+func (l *LRUList) getSingleContrained() string {
 	var id string
 	l.dmu.Lock()
 	defer l.dmu.Unlock()