Deprecate RedisClient and remove unused header file (#399)

sonic-net · Oct 23, 2020 · 3ec30ef · 3ec30ef
1 parent 165a679
commit 3ec30ef
Show file tree

Hide file tree

Showing 8 changed files with 2 additions and 11 deletions.
diff --git a/common/dbinterface.h b/common/dbinterface.h
@@ -5,7 +5,6 @@
 #include <stdexcept>
 
 #include "dbconnector.h"
-#include "redisclient.h"
 #include "logger.h"
 
 namespace swss

diff --git a/common/logger.cpp b/common/logger.cpp
@@ -11,7 +11,6 @@
 #include "schema.h"
 #include "select.h"
 #include "dbconnector.h"
-#include "redisclient.h"
 #include "consumerstatetable.h"
 #include "producerstatetable.h"
 

diff --git a/common/loglevel.cpp b/common/loglevel.cpp
@@ -7,7 +7,6 @@
 #include "schema.h"
 #include "logger.h"
 #include "dbconnector.h"
-#include "redisclient.h"
 #include "producerstatetable.h"
 
 using namespace swss;

diff --git a/common/redisclient.h b/common/redisclient.h
@@ -60,10 +60,8 @@ class RedisClient
 
     private:
         swss::DBConnector *m_db;
-};
-
-// TODO: mark above class: __attribute__ ((__deprecated__));
-// After remove all the caller code
+} __attribute__ ((__deprecated__));
+// This class is deprecated. Please use DBConnector class instead.
 
 }
 

diff --git a/tests/fdb_flush.cpp b/tests/fdb_flush.cpp
@@ -4,7 +4,6 @@
 #include "common/producertable.h"
 #include "common/consumertable.h"
 #include "common/redisapi.h"
-#include "common/redisclient.h"
 
 #include <inttypes.h>
 #include <iostream>

diff --git a/tests/logger_ut.cpp b/tests/logger_ut.cpp
@@ -1,5 +1,4 @@
 #include "common/dbconnector.h"
-#include "common/redisclient.h"
 #include "common/producerstatetable.h"
 #include "common/consumerstatetable.h"
 #include "common/select.h"

diff --git a/tests/redis_state_ut.cpp b/tests/redis_state_ut.cpp
@@ -11,7 +11,6 @@
 #include "common/table.h"
 #include "common/producerstatetable.h"
 #include "common/consumerstatetable.h"
-#include "common/redisclient.h"
 
 using namespace std;
 using namespace swss;

diff --git a/tests/redis_ut.cpp b/tests/redis_ut.cpp
@@ -12,7 +12,6 @@
 #include "common/selectableevent.h"
 #include "common/selectabletimer.h"
 #include "common/table.h"
-#include "common/redisclient.h"
 #include "common/dbinterface.h"
 #include "common/sonicv2connector.h"