Merge branch 'master' of https://github.com/cgrates/cgrates

cache2go/cache.go

@@ -111,14 +111,14 @@ func RemKey(key string) {
 }
 
 func XRemKey(key string) {
-	mux.Lock()
-	defer mux.Unlock()
+	xMux.Lock()
+	defer xMux.Unlock()
 	if r, ok := xcache[key]; ok {
 		if r.timer() != nil {
 			r.timer().Stop()
 		}
 	}
-	delete(cache, key)
+	delete(xcache, key)
 }
 
 // Delete all keys from expiraton cache

cache2go/cache_test.go

@@ -73,3 +73,26 @@ func TestFlushNoTimout(t *testing.T) {
 		t.Error("Error expiring data")
 	}
 }
+
+func TestRemKey(t *testing.T) {
+	Cache("t1", "test")
+	if t1, err := GetCached("t1"); err != nil || t1 != "test" {
+		t.Error("Error setting cache")
+	}
+	RemKey("t1")
+	if t1, err := GetCached("t1"); err == nil || t1 == "test" {
+		t.Error("Error removing cached key")
+	}
+}
+
+func TestXRemKey(t *testing.T) {
+	a := &myStruct{data: "mama are mere"}
+	a.XCache("mama", 10*time.Second, a)
+	if t1, err := GetXCached("mama"); err != nil || t1 != a {
+		t.Error("Error setting xcache")
+	}
+	XRemKey("mama")
+	if t1, err := GetXCached("mama"); err == nil || t1 == a {
+		t.Error("Error removing xcached key: ", err, t1)
+	}
+}

engine/calldesc.go

@@ -40,9 +40,6 @@ func init() {
 	m, _ := NewMapStorage()
 	//m, _ := NewMongoStorage(db_server, "27017", "cgrates_test", "", "")
 	//m, _ := NewRedisStorage(db_server+":6379", 11, "", utils.MSGPACK)
-	//m, _ := NewSRedisStorage(db_server+":6379", 11, "", utils.MSGPACK)
-	//fm, _ := NewRedigoStorage(db_server+":6379", 11, "")
-	//m, _ := NewRadixStorage(db_server+":6379", 11, "")
 	storageGetter, _ = m.(DataStorage)
 
 	storageLogger = storageGetter.(LogStorage)

engine/storage_map.go

@@ -21,6 +21,7 @@ package engine
 import (
 	"errors"
 	"fmt"
+
 	"github.com/cgrates/cgrates/cache2go"
 	"github.com/cgrates/cgrates/history"
 	"github.com/cgrates/cgrates/utils"
@@ -45,14 +46,18 @@ func (ms *MapStorage) Flush() error {
 }
 
 func (ms *MapStorage) PreCache(dKeys, rppKeys []string) error {
+	prefixLen := len(DESTINATION_PREFIX)
+	prefixLen1 := len(RATING_PLAN_PREFIX)
 	for k, _ := range ms.dict {
 		if strings.HasPrefix(k, DESTINATION_PREFIX) {
-			if _, err := ms.GetDestination(k[len(DESTINATION_PREFIX):]); err != nil {
+			cache2go.RemKey(k[prefixLen:])
+			if _, err := ms.GetDestination(k[prefixLen:]); err != nil {
 				return err
 			}
 		}
 		if strings.HasPrefix(k, RATING_PLAN_PREFIX) {
-			if _, err := ms.GetRatingPlan(k[len(RATING_PLAN_PREFIX):]); err != nil {
+			cache2go.RemKey(k[prefixLen1:])
+			if _, err := ms.GetRatingPlan(k[prefixLen1:]); err != nil {
 				return err
 			}
 		}

engine/storage_redis.go

@@ -72,9 +72,10 @@ func (rs *RedisStorage) PreCache(dKeys, rpKeys []string) (err error) {
 			return
 		}
 	}
+	prefixLen := len(DESTINATION_PREFIX)
 	for _, key := range dKeys {
-		cache2go.RemKey(key)
-		if _, err = rs.GetDestination(key[len(DESTINATION_PREFIX):]); err != nil {
+		cache2go.RemKey(key[prefixLen:])
+		if _, err = rs.GetDestination(key[prefixLen:]); err != nil {
 			return err
 		}
 	}
@@ -83,9 +84,10 @@ func (rs *RedisStorage) PreCache(dKeys, rpKeys []string) (err error) {
 			return
 		}
 	}
+	prefixLen = len(RATING_PLAN_PREFIX)
 	for _, key := range rpKeys {
-		cache2go.RemKey(key)
-		if _, err = rs.GetRatingPlan(key[len(RATING_PLAN_PREFIX):]); err != nil {
+		cache2go.RemKey(key[prefixLen:])
+		if _, err = rs.GetRatingPlan(key[prefixLen:]); err != nil {
 			return err
 		}
 	}

engine/storage_sredis.go

@@ -1,348 +0,0 @@
-/*
-Rating system designed to be used in VoIP Carriers World
-Copyright (C) 2013 ITsysCOM
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>
-*/
-
-package engine
-
-import (
-	"bytes"
-	"compress/zlib"
-	"errors"
-	"fmt"
-	"github.com/cgrates/cgrates/cache2go"
-	"github.com/cgrates/cgrates/history"
-	"github.com/cgrates/cgrates/utils"
-	"io/ioutil"
-	"menteslibres.net/gosexy/redis"
-	"strconv"
-	"strings"
-	"time"
-)
-
-type SRedisStorage struct {
-	dbNb int
-	db   *redis.Client
-	ms   Marshaler
-}
-
-func NewSRedisStorage(address string, db int, pass, mrshlerStr string) (DataStorage, error) {
-	addrSplit := strings.Split(address, ":")
-	host := addrSplit[0]
-	port := 6379
-	if len(addrSplit) == 2 {
-		port, _ = strconv.Atoi(addrSplit[1])
-	}
-	ndb := redis.New()
-	err := ndb.Connect(host, uint(port))
-	if err != nil {
-		return nil, err
-	}
-	if pass != "" {
-		if _, err = ndb.Auth(pass); err != nil {
-			return nil, err
-		}
-	}
-	if db > 0 {
-		if _, err = ndb.Select(int64(db)); err != nil {
-			return nil, err
-		}
-	}
-	var mrshler Marshaler
-	if mrshlerStr == utils.MSGPACK {
-		mrshler = NewCodecMsgpackMarshaler()
-	} else if mrshlerStr == utils.JSON {
-		mrshler = new(JSONMarshaler)
-	} else {
-		return nil, fmt.Errorf("Unsupported marshaler: %v", mrshlerStr)
-	}
-	return &SRedisStorage{db: ndb, dbNb: db, ms: mrshler}, nil
-}
-
-func (rs *SRedisStorage) Close() {
-	rs.db.Quit()
-}
-
-func (rs *SRedisStorage) Flush() (err error) {
-	_, err = rs.db.FlushDB()
-	return
-}
-
-func (rs *SRedisStorage) PreCache(dKeys, rpKeys []string) (err error) {
-	if dKeys == nil {
-		if dKeys, err = rs.db.Keys(DESTINATION_PREFIX + "*"); err != nil {
-			return
-		}
-	}
-	for _, key := range dKeys {
-		cache2go.RemKey(key)
-		if _, err = rs.GetDestination(key[len(DESTINATION_PREFIX):]); err != nil {
-			return err
-		}
-	}
-	if rpKeys == nil {
-		if rpKeys, err = rs.db.Keys(RATING_PLAN_PREFIX + "*"); err != nil {
-			return
-		}
-	}
-	for _, key := range rpKeys {
-		cache2go.RemKey(key)
-		if _, err = rs.GetRatingPlan(key[len(RATING_PLAN_PREFIX):]); err != nil {
-			return err
-		}
-	}
-	return
-}
-
-// Used to check if specific subject is stored using prefix key attached to entity
-func (rs *SRedisStorage) ExistsData(category, subject string) (bool, error) {
-	switch category {
-	case DESTINATION_PREFIX, RATING_PLAN_PREFIX, RATING_PROFILE_PREFIX, ACTION_PREFIX, ACTION_TIMING_PREFIX, USER_BALANCE_PREFIX:
-		return rs.db.Exists(category + subject)
-	}
-	return false, errors.New("Unsupported category in ExistsData")
-}
-
-func (rs *SRedisStorage) GetRatingPlan(key string) (rp *RatingPlan, err error) {
-	if x, err := cache2go.GetCached(key); err == nil {
-		return x.(*RatingPlan), nil
-	}
-	var values string
-	if values, err = rs.db.Get(RATING_PLAN_PREFIX + key); err == nil {
-		b := bytes.NewBufferString(values)
-		r, err := zlib.NewReader(b)
-		if err != nil {
-			return nil, err
-		}
-		out, err := ioutil.ReadAll(r)
-		if err != nil {
-			return nil, err
-		}
-		r.Close()
-		rp = new(RatingPlan)
-		err = rs.ms.Unmarshal(out, rp)
-		cache2go.Cache(key, rp)
-	}
-	return
-}
-
-func (rs *SRedisStorage) SetRatingPlan(rp *RatingPlan) (err error) {
-	result, err := rs.ms.Marshal(rp)
-	var b bytes.Buffer
-	w := zlib.NewWriter(&b)
-	w.Write(result)
-	w.Close()
-	_, err = rs.db.Set(RATING_PLAN_PREFIX+rp.Id, b.Bytes())
-	if err == nil && historyScribe != nil {
-		response := 0
-		historyScribe.Record(&history.Record{RATING_PLAN_PREFIX + rp.Id, rp}, &response)
-	}
-	return
-}
-
-func (rs *SRedisStorage) GetRatingProfile(key string) (rp *RatingProfile, err error) {
-	var values string
-	if values, err = rs.db.Get(RATING_PROFILE_PREFIX + key); err == nil {
-		rp = new(RatingProfile)
-		err = rs.ms.Unmarshal([]byte(values), rp)
-	}
-	return
-}
-
-func (rs *SRedisStorage) SetRatingProfile(rp *RatingProfile) (err error) {
-	result, err := rs.ms.Marshal(rp)
-	_, err = rs.db.Set(RATING_PROFILE_PREFIX+rp.Id, result)
-	if err == nil && historyScribe != nil {
-		response := 0
-		historyScribe.Record(&history.Record{RATING_PROFILE_PREFIX + rp.Id, rp}, &response)
-	}
-	return
-}
-
-func (rs *SRedisStorage) GetDestination(key string) (dest *Destination, err error) {
-	if x, err := cache2go.GetCached(key); err == nil {
-		return x.(*Destination), nil
-	}
-	var values string
-	if values, err = rs.db.Get(DESTINATION_PREFIX + key); len(values) > 0 && err == nil {
-		b := bytes.NewBufferString(values)
-		r, err := zlib.NewReader(b)
-		if err != nil {
-			return nil, err
-		}
-		out, err := ioutil.ReadAll(r)
-		if err != nil {
-			return nil, err
-		}
-		r.Close()
-		dest = new(Destination)
-		err = rs.ms.Unmarshal(out, dest)
-		cache2go.Cache(key, dest)
-	}
-	return
-}
-
-/*func (rs *SRedisStorage) DestinationContainsPrefix(key string, prefix string) (precision int, err error) {
-	if _, err := rs.db.SAdd(TEMP_DESTINATION_PREFIX+prefix, utils.SplitPrefixInterface(prefix)...); err != nil {
-		return 0, err
-	}
-	var values []string
-	if values, err = rs.db.SInter(DESTINATION_PREFIX+key, TEMP_DESTINATION_PREFIX+prefix); err == nil {
-		for _, p := range values {
-			if len(p) > precision {
-				precision = len(p)
-			}
-		}
-	}
-	if _, err := rs.db.Del(TEMP_DESTINATION_PREFIX + prefix); err != nil {
-		Logger.Err("Error removing temp ")
-	}
-	return
-}*/
-
-func (rs *SRedisStorage) SetDestination(dest *Destination) (err error) {
-	result, err := rs.ms.Marshal(dest)
-	if err != nil {
-		return err
-	}
-	var b bytes.Buffer
-	w := zlib.NewWriter(&b)
-	w.Write(result)
-	w.Close()
-	_, err = rs.db.Set(DESTINATION_PREFIX+dest.Id, b.Bytes())
-	if err == nil && historyScribe != nil {
-		response := 0
-		historyScribe.Record(&history.Record{DESTINATION_PREFIX + dest.Id, dest}, &response)
-	}
-	return
-}
-
-func (rs *SRedisStorage) GetActions(key string) (as Actions, err error) {
-	var values string
-	if values, err = rs.db.Get(ACTION_PREFIX + key); err == nil {
-		err = rs.ms.Unmarshal([]byte(values), &as)
-	}
-	return
-}
-
-func (rs *SRedisStorage) SetActions(key string, as Actions) (err error) {
-	result, err := rs.ms.Marshal(&as)
-	_, err = rs.db.Set(ACTION_PREFIX+key, result)
-	return
-}
-
-func (rs *SRedisStorage) GetUserBalance(key string) (ub *UserBalance, err error) {
-	var values string
-	if values, err = rs.db.Get(USER_BALANCE_PREFIX + key); err == nil {
-		ub = &UserBalance{Id: key}
-		err = rs.ms.Unmarshal([]byte(values), ub)
-	}
-
-	return
-}
-
-func (rs *SRedisStorage) SetUserBalance(ub *UserBalance) (err error) {
-	result, err := rs.ms.Marshal(ub)
-	_, err = rs.db.Set(USER_BALANCE_PREFIX+ub.Id, result)
-	return
-}
-
-func (rs *SRedisStorage) GetActionTimings(key string) (ats ActionTimings, err error) {
-	var values string
-	if values, err = rs.db.Get(ACTION_TIMING_PREFIX + key); err == nil {
-		err = rs.ms.Unmarshal([]byte(values), &ats)
-	}
-	return
-}
-
-func (rs *SRedisStorage) SetActionTimings(key string, ats ActionTimings) (err error) {
-	if len(ats) == 0 {
-		// delete the key
-		_, err = rs.db.Del(ACTION_TIMING_PREFIX + key)
-		return err
-	}
-	result, err := rs.ms.Marshal(&ats)
-	_, err = rs.db.Set(ACTION_TIMING_PREFIX+key, result)
-	return
-}
-
-func (rs *SRedisStorage) GetAllActionTimings() (ats map[string]ActionTimings, err error) {
-	keys, err := rs.db.Keys(ACTION_TIMING_PREFIX + "*")
-	if err != nil {
-		return nil, err
-	}
-	ats = make(map[string]ActionTimings, len(keys))
-	for _, key := range keys {
-		values, err := rs.db.Get(key)
-		if err != nil {
-			continue
-		}
-		var tempAts ActionTimings
-		err = rs.ms.Unmarshal([]byte(values), &tempAts)
-		ats[key[len(ACTION_TIMING_PREFIX):]] = tempAts
-	}
-
-	return
-}
-
-func (rs *SRedisStorage) LogCallCost(uuid, source string, cc *CallCost) (err error) {
-	var result []byte
-	result, err = rs.ms.Marshal(cc)
-	if err != nil {
-		return
-	}
-	_, err = rs.db.Set(LOG_CALL_COST_PREFIX+source+"_"+uuid, result)
-	return
-}
-
-func (rs *SRedisStorage) GetCallCostLog(uuid, source string) (cc *CallCost, err error) {
-	var values string
-	if values, err = rs.db.Get(LOG_CALL_COST_PREFIX + source + "_" + uuid); err == nil {
-		err = rs.ms.Unmarshal([]byte(values), cc)
-	}
-	return
-}
-
-func (rs *SRedisStorage) LogActionTrigger(ubId, source string, at *ActionTrigger, as Actions) (err error) {
-	mat, err := rs.ms.Marshal(at)
-	if err != nil {
-		return
-	}
-	mas, err := rs.ms.Marshal(as)
-	if err != nil {
-		return
-	}
-	rs.db.Set(LOG_ACTION_TRIGGER_PREFIX+source+"_"+time.Now().Format(time.RFC3339Nano), []byte(fmt.Sprintf("%v*%v*%v", ubId, string(mat), string(mas))))
-	return
-}
-
-func (rs *SRedisStorage) LogActionTiming(source string, at *ActionTiming, as Actions) (err error) {
-	mat, err := rs.ms.Marshal(at)
-	if err != nil {
-		return
-	}
-	mas, err := rs.ms.Marshal(as)
-	if err != nil {
-		return
-	}
-	_, err = rs.db.Set(LOG_ACTION_TIMMING_PREFIX+source+"_"+time.Now().Format(time.RFC3339Nano), []byte(fmt.Sprintf("%v*%v", string(mat), string(mas))))
-	return
-}
-
-func (rs *SRedisStorage) LogError(uuid, source, errstr string) (err error) {
-	_, err = rs.db.Set(LOG_ERR+source+"_"+uuid, errstr)
-	return
-}

engine/storage_test.go

@@ -95,6 +95,16 @@ func TestStorageDestinationContainsPrefixNotExisting(t *testing.T) {
 	}
 }
 
+func TestPreCacheRefresh(t *testing.T) {
+	storageGetter.SetDestination(&Destination{"T11", []string{"0"}})
+	storageGetter.GetDestination("T11")
+	storageGetter.SetDestination(&Destination{"T11", []string{"1"}})
+	storageGetter.PreCache(nil, nil)
+	if d, err := storageGetter.GetDestination("T11"); err != nil || d.Prefixes[0] != "1" {
+		t.Error("Error refreshing cache:", d)
+	}
+}
+
 /************************** Benchmarks *****************************/
 
 func GetUB() *UserBalance {

test.sh

@@ -6,6 +6,7 @@ go test -i github.com/cgrates/cgrates/config
 go test -i github.com/cgrates/cgrates/cmd/cgr-engine
 go test -i github.com/cgrates/cgrates/mediator
 go test -i github.com/cgrates/fsock
+go test -i github.com/cgrates/cgrates/cache2go
 go test -i github.com/cgrates/cgrates/cdrs
 go test -i github.com/cgrates/cgrates/utils
 go test -i github.com/cgrates/cgrates/history
@@ -29,8 +30,10 @@ go test github.com/cgrates/fsock
 fs=$?
 go test github.com/cgrates/cgrates/history
 hs=$?
+go test github.com/cgrates/cgrates/cache2go
+c2g=$?
 go test github.com/cgrates/cgrates/cdrexporter
 cdre=$?
 
 
-exit $en && $sm && $cfg && $bl && $cr && $md && $cdr && $fs && $ut && $hs && $cdre
+exit $en && $sm && $cfg && $bl && $cr && $md && $cdr && $fs && $ut && $hs && $c2g && $cdre

test_local.sh

@@ -7,6 +7,7 @@ go test -i github.com/cgrates/cgrates/config
 go test -i github.com/cgrates/cgrates/cmd/cgr-engine
 go test -i github.com/cgrates/cgrates/mediator
 go test -i github.com/cgrates/fsock
+go test -i github.com/cgrates/cgrates/cache2go
 go test -i github.com/cgrates/cgrates/cdrs
 go test -i github.com/cgrates/cgrates/utils
 go test -i github.com/cgrates/cgrates/history
@@ -32,8 +33,10 @@ go test github.com/cgrates/fsock
 fs=$?
 go test github.com/cgrates/cgrates/history
 hs=$?
+go test github.com/cgrates/cgrates/cache2go
+c2g=$?
 go test github.com/cgrates/cgrates/cdrexporter
 cdre=$?
 
 
-exit $ap && $en && $sm && $cfg && $bl && $cr && $md && $cdr && $fs && $ut && $hs && $cdre
+exit $ap && $en && $sm && $cfg && $bl && $cr && $md && $cdr && $fs && $ut && $hs && $c2g && $cdre