Merge branch 'master' into smart_switch_db

sonic-net · Jan 12, 2024 · cd71777 · cd71777
2 parents 9a2424d + b563580
commit cd71777
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/pyext/swsscommon.i b/pyext/swsscommon.i
@@ -30,6 +30,7 @@
 #include "decoratortable.h"
 #include "countertable.h"
 #include "redispipeline.h"
+#include "redisreply.h"
 #include "redisselect.h"
 #include "redistran.h"
 #include "producerstatetable.h"
@@ -258,6 +259,7 @@ T castSelectableObj(swss::Selectable *temp)
 %include "select.h"
 %include "rediscommand.h"
 %include "redispipeline.h"
+%include "redisreply.h"
 %include "redisselect.h"
 %include "redistran.h"
 %include "configdb.h"

diff --git a/tests/redis_ut.cpp b/tests/redis_ut.cpp
@@ -851,8 +851,8 @@ TEST(Table, binary_data_get)
     DBConnector db("TEST_DB", 0, true);
     Table table(&db, "binary_data");
 
-    const char* bindata1 = "\x11\x00\x22\x33\x44";
-    const char* bindata2 = "\x11\x22\x33\x00\x44";
+    const char bindata1[] = "\x11\x00\x22\x33\x44";
+    const char bindata2[] = "\x11\x22\x33\x00\x44";
     auto v1 = std::string(bindata1, sizeof(bindata1));
     auto v2 = std::string(bindata2, sizeof(bindata2));
     vector<FieldValueTuple> values_set = {