From 781b24a4825eb95bece8e3c1e83e1d6c5b00cc83 Mon Sep 17 00:00:00 2001 From: TeoV Date: Fri, 15 Mar 2019 14:37:44 +0200 Subject: [PATCH] In DataManager Split the dataID and compose ID [1:] --- apier/v1/stats_it_test.go | 2 -- utils/coreutils.go | 6 +----- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/apier/v1/stats_it_test.go b/apier/v1/stats_it_test.go index 12d63b6ab..4f753213b 100644 --- a/apier/v1/stats_it_test.go +++ b/apier/v1/stats_it_test.go @@ -84,8 +84,6 @@ var sTestsStatSV1 = []func(t *testing.T){ testV1STSUpdateStatQueueProfile, testV1STSRemoveStatQueueProfile, testV1STSStatsPing, - // Need to make a decision about - // converter in filters testV1STSProcessMetricsWithFilter, testV1STSStopEngine, } diff --git a/utils/coreutils.go b/utils/coreutils.go index 3b2fe6dac..217544173 100644 --- a/utils/coreutils.go +++ b/utils/coreutils.go @@ -366,10 +366,6 @@ func SplitStats(key string) []string { return strings.Split(key, STATS_CHAR) } -func LCRKey(direction, tenant, category, account, subject string) string { - return ConcatenatedKey(direction, tenant, category, account, subject) -} - func InfieldJoin(vals ...string) string { return strings.Join(vals, INFIELD_SEP) } @@ -782,7 +778,7 @@ func NewTenantID(tntID string) *TenantID { if len(tIDSplt) == 1 { // only Tenant present return &TenantID{Tenant: tIDSplt[0]} } - return &TenantID{Tenant: tIDSplt[0], ID: tIDSplt[1]} + return &TenantID{Tenant: tIDSplt[0], ID: ConcatenatedKey(tIDSplt[1:]...)} } type TenantArg struct {