From 421c193f6ae68723b28a4d2f9c4c978e077904d5 Mon Sep 17 00:00:00 2001 From: Trial97 Date: Mon, 7 Jun 2021 13:32:30 +0300 Subject: [PATCH] Removed unused RemoveKeysForPrefix --- engine/datadbmock.go | 4 ---- engine/storage_mongo_datadb.go | 33 --------------------------- engine/storage_redis.go | 13 ----------- engine/storage_sql.go | 4 ---- engine/thresholds_test.go | 4 ++-- general_tests/doubleremove_it_test.go | 32 +++++++++++++------------- 6 files changed, 18 insertions(+), 72 deletions(-) diff --git a/engine/datadbmock.go b/engine/datadbmock.go index a7af88a09..d46002ad0 100644 --- a/engine/datadbmock.go +++ b/engine/datadbmock.go @@ -76,10 +76,6 @@ func (dbM *DataDBMock) GetKeysForPrefix(ctx *context.Context, prf string) ([]str return nil, utils.ErrNotImplemented } -func (dbM *DataDBMock) RemoveKeysForPrefix(string) error { - return utils.ErrNotImplemented -} - func (dbM *DataDBMock) GetVersions(itm string) (vrs Versions, err error) { return nil, utils.ErrNotImplemented } diff --git a/engine/storage_mongo_datadb.go b/engine/storage_mongo_datadb.go index d01220db2..087bfe247 100644 --- a/engine/storage_mongo_datadb.go +++ b/engine/storage_mongo_datadb.go @@ -411,39 +411,6 @@ func (ms *MongoStorage) SelectDatabase(dbName string) (err error) { return } -func (ms *MongoStorage) RemoveKeysForPrefix(prefix string) (err error) { - var colName string - switch prefix { - case utils.LoadInstKey: - colName = ColLht - case utils.VersionPrefix: - colName = ColVer - case utils.ResourcesPrefix: - colName = ColRes - case utils.ResourceProfilesPrefix: - colName = ColRsP - case utils.ThresholdProfilePrefix: - colName = ColTps - case utils.StatQueueProfilePrefix: - colName = ColSqp - case utils.ThresholdPrefix: - colName = ColThs - case utils.FilterPrefix: - colName = ColFlt - case utils.RouteProfilePrefix: - colName = ColRts - case utils.AttributeProfilePrefix: - colName = ColAttr - default: - return utils.ErrInvalidKey - } - - return ms.query(context.TODO(), func(sctx mongo.SessionContext) error { - _, err := ms.getCol(colName).DeleteMany(sctx, bson.M{}) - return err - }) -} - // IsDBEmpty implementation func (ms *MongoStorage) IsDBEmpty() (resp bool, err error) { err = ms.query(context.TODO(), func(sctx mongo.SessionContext) error { diff --git a/engine/storage_redis.go b/engine/storage_redis.go index d278023b4..054f6d45a 100644 --- a/engine/storage_redis.go +++ b/engine/storage_redis.go @@ -196,19 +196,6 @@ func (rs *RedisStorage) IsDBEmpty() (resp bool, err error) { return true, nil } -func (rs *RedisStorage) RemoveKeysForPrefix(prefix string) (err error) { - var keys []string - if keys, err = rs.GetKeysForPrefix(context.TODO(), prefix); err != nil { - return - } - for _, key := range keys { - if err = rs.Cmd(nil, redisDEL, key); err != nil { - return - } - } - return -} - func (rs *RedisStorage) getKeysForFilterIndexesKeys(fkeys []string) (keys []string, err error) { for _, itemIDPrefix := range fkeys { mp := make(map[string]string) diff --git a/engine/storage_sql.go b/engine/storage_sql.go index 95a020d5d..8d4f16b72 100644 --- a/engine/storage_sql.go +++ b/engine/storage_sql.go @@ -75,10 +75,6 @@ func (sqls *SQLStorage) GetKeysForPrefix(ctx *context.Context, prefix string) ([ return nil, utils.ErrNotImplemented } -func (SQLStorage) RemoveKeysForPrefix(string) error { - return utils.ErrNotImplemented -} - func (sqls *SQLStorage) CreateTablesFromScript(scriptPath string) error { fileContent, err := os.ReadFile(scriptPath) if err != nil { diff --git a/engine/thresholds_test.go b/engine/thresholds_test.go index 7f3b56231..0b52493ab 100644 --- a/engine/thresholds_test.go +++ b/engine/thresholds_test.go @@ -1050,7 +1050,7 @@ func TestThresholdsUpdateThreshold(t *testing.T) { t.Errorf("Expected: %s, received: %s", utils.ToJSON(expTh), utils.ToJSON(th)) } - if err := dm.RemoveThreshold(context.Background(), th.Tenant, th.ID, ); err != nil { + if err := dm.RemoveThreshold(context.Background(), th.Tenant, th.ID); err != nil { t.Fatal(err) } if err := dm.SetThresholdProfile(context.Background(), thp, true); err != nil { @@ -1122,7 +1122,7 @@ func TestThresholdsUpdateThreshold(t *testing.T) { } else if !reflect.DeepEqual(expTh, th) { t.Errorf("Expected: %s, received: %s", utils.ToJSON(expTh), utils.ToJSON(th)) } - if err := dm.RemoveThresholdProfile(context.Background(), thp.Tenant, thp.ID, true); err != nil { + if err := dm.RemoveThresholdProfile(context.Background(), thp.Tenant, thp.ID, true); err != nil { t.Fatal(err) } if _, err := dm.GetThreshold(context.Background(), thp.Tenant, thp.ID, false, false, utils.NonTransactional); err != utils.ErrNotFound { diff --git a/general_tests/doubleremove_it_test.go b/general_tests/doubleremove_it_test.go index a4ba6af3f..a76ba3d7a 100644 --- a/general_tests/doubleremove_it_test.go +++ b/general_tests/doubleremove_it_test.go @@ -299,24 +299,24 @@ func testdoubleRemoveActionPlan(t *testing.T) { } else if len(aps) != 1 { t.Errorf("Expected: %v,\n received: %v", 1, len(aps)) } else if aps[0].Id != "ATMS_1" { - // remove - if err := sesRPC.Call(utils.APIerSv1RemoveActionPlan, &v1.AttrGetActionPlan{ - ID: "ATMS_1"}, &reply); err != nil { - t.Error(err) - } else if reply != utils.OK { - t.Error("Unexpected reply returned", reply) - } - //check again - /* - this should return ErrNotFound, right now it returns nil and an empty slice, - needs to be reviewed. - - if err := sesRPC.Call(utils.APIerSv1GetActionPlan, - v1.AttrGetActionPlan{ID: utils.EmptyString}, &aps); err == nil || err.Error() != utils.ErrNotFound.Error() { - t.Errorf("Error: %+v, rcv: %+v", err, utils.ToJSON(aps)) + // remove + if err := sesRPC.Call(utils.APIerSv1RemoveActionPlan, &v1.AttrGetActionPlan{ + ID: "ATMS_1"}, &reply); err != nil { + t.Error(err) + } else if reply != utils.OK { + t.Error("Unexpected reply returned", reply) } - */ + //check again + /* + this should return ErrNotFound, right now it returns nil and an empty slice, + needs to be reviewed. + if err := sesRPC.Call(utils.APIerSv1GetActionPlan, + v1.AttrGetActionPlan{ID: utils.EmptyString}, &aps); err == nil || err.Error() != utils.ErrNotFound.Error() { + t.Errorf("Error: %+v, rcv: %+v", err, utils.ToJSON(aps)) + } + */ + } } func testdoubleRemoveKillEngine(t *testing.T) {