Skip to content

Commit

Permalink
Revert "Deprecate RedisClient and remove unused header file (sonic-ne…
Browse files Browse the repository at this point in the history
…t#399)"

This reverts commit 3ec30ef.
  • Loading branch information
qiluo-msft committed Nov 3, 2020
1 parent 0bcd615 commit 506cce4
Show file tree
Hide file tree
Showing 8 changed files with 11 additions and 2 deletions.
1 change: 1 addition & 0 deletions common/dbinterface.h
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
#include <stdexcept>

#include "dbconnector.h"
#include "redisclient.h"
#include "logger.h"

namespace swss
Expand Down
1 change: 1 addition & 0 deletions common/logger.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
#include "schema.h"
#include "select.h"
#include "dbconnector.h"
#include "redisclient.h"
#include "consumerstatetable.h"
#include "producerstatetable.h"

Expand Down
1 change: 1 addition & 0 deletions common/loglevel.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
#include "schema.h"
#include "logger.h"
#include "dbconnector.h"
#include "redisclient.h"
#include "producerstatetable.h"

using namespace swss;
Expand Down
6 changes: 4 additions & 2 deletions common/redisclient.h
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,10 @@ class RedisClient

private:
swss::DBConnector *m_db;
} __attribute__ ((__deprecated__));
// This class is deprecated. Please use DBConnector class instead.
};

// TODO: mark above class: __attribute__ ((__deprecated__));
// After remove all the caller code

}

Expand Down
1 change: 1 addition & 0 deletions tests/fdb_flush.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
#include "common/producertable.h"
#include "common/consumertable.h"
#include "common/redisapi.h"
#include "common/redisclient.h"

#include <inttypes.h>
#include <iostream>
Expand Down
1 change: 1 addition & 0 deletions tests/logger_ut.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#include "common/dbconnector.h"
#include "common/redisclient.h"
#include "common/producerstatetable.h"
#include "common/consumerstatetable.h"
#include "common/select.h"
Expand Down
1 change: 1 addition & 0 deletions tests/redis_state_ut.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
#include "common/table.h"
#include "common/producerstatetable.h"
#include "common/consumerstatetable.h"
#include "common/redisclient.h"

using namespace std;
using namespace swss;
Expand Down
1 change: 1 addition & 0 deletions tests/redis_ut.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
#include "common/selectableevent.h"
#include "common/selectabletimer.h"
#include "common/table.h"
#include "common/redisclient.h"
#include "common/dbinterface.h"
#include "common/sonicv2connector.h"

Expand Down

0 comments on commit 506cce4

Please sign in to comment.