Skip to content

Commit dc040e2

Browse files
qiluo-msftShuotian Cheng
authored and
Shuotian Cheng
committed
Move RedisClient class to sonic-swss-common repo (sonic-net#113)
1 parent 415c3e6 commit dc040e2

File tree

6 files changed

+4
-342
lines changed

6 files changed

+4
-342
lines changed

common/redisclient.cpp

-269
This file was deleted.

common/redisclient.h

-67
This file was deleted.

lib/inc/sai_redis.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
extern "C" {
1212
#include "sai.h"
1313
}
14-
#include "common/redisclient.h"
1514

15+
#include "swss/redisclient.h"
1616
#include "swss/dbconnector.h"
1717
#include "swss/producertable.h"
1818
#include "swss/consumertable.h"

lib/src/Makefile.am

+1-2
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,7 @@ libsairedis_la_SOURCES = \
4141
sai_redis_generic_set.cpp \
4242
sai_redis_generic_get.cpp \
4343
sai_redis_notifications.cpp \
44-
sai_redis_record.cpp \
45-
../../common/redisclient.cpp
44+
sai_redis_record.cpp
4645

4746
libsairedis_la_CPPFLAGS = $(DBGFLAGS) $(AM_CPPFLAGS) $(CFLAGS_COMMON)
4847
libsairedis_la_LIBADD = -lhiredis -lswsscommon

syncd/Makefile.am

+1-2
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,7 @@ syncd_SOURCES = \
2626
syncd_reinit.cpp \
2727
syncd_hard_reinit.cpp \
2828
syncd_notifications.cpp \
29-
syncd_counters.cpp \
30-
../common/redisclient.cpp
29+
syncd_counters.cpp
3130

3231
syncd_CPPFLAGS = $(DBGFLAGS) $(AM_CPPFLAGS) $(CFLAGS_COMMON) $(SAIFLAGS)
3332
syncd_LDADD = -lhiredis -lswsscommon -lsai -lpthread -L$(top_srcdir)/meta/.libs -lsaimetadata

syncd/syncd.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ extern "C" {
2525
#include "sai.h"
2626
}
2727

28-
#include "common/redisclient.h"
2928
#include "meta/saiserialize.h"
3029
#include "meta/saiattributelist.h"
30+
#include "swss/redisclient.h"
3131
#include "swss/dbconnector.h"
3232
#include "swss/producertable.h"
3333
#include "swss/consumertable.h"

0 commit comments

Comments
 (0)