Binary support

Signed-off-by: Ze Gan <ganze718@gmail.com>
sonic-net · Jun 28, 2023 · 466a131 · 466a131
1 parent 9622c76
commit 466a131
Show file tree

Hide file tree

Showing 2 changed files with 59 additions and 3 deletions.
diff --git a/common/consumerstatetable.cpp b/common/consumerstatetable.cpp
@@ -68,16 +68,16 @@ void ConsumerStateTable::pops(std::deque<KeyOpFieldsValuesTuple> &vkco, const st
 
         auto& ctx = ctx0->element[ie];
         assert(ctx->element[0]->type == REDIS_REPLY_STRING);
-        std::string key = ctx->element[0]->str;
+        std::string key(ctx->element[0]->str, ctx->element[0]->len);
         kfvKey(kco) = key;
 
         assert(ctx->element[1]->type == REDIS_REPLY_ARRAY);
         auto ctx1 = ctx->element[1];
         for (size_t i = 0; i < ctx1->elements / 2; i++)
         {
             FieldValueTuple e;
-            fvField(e) = ctx1->element[i * 2]->str;
-            fvValue(e) = ctx1->element[i * 2 + 1]->str;
+            fvField(e).assign(ctx1->element[i * 2]->str, ctx1->element[i * 2]->len);
+            fvValue(e).assign(ctx1->element[i * 2 + 1]->str, ctx1->element[i * 2 + 1]->len);
             values.push_back(e);
         }
 

diff --git a/pyext/swsscommon.i b/pyext/swsscommon.i
@@ -151,6 +151,62 @@
     temp = SWIG_NewPointerObj(*$1, SWIGTYPE_p_swss__Selectable, 0);
     SWIG_Python_AppendOutput($result, temp);
 }
+
+%typemap(in, fragment="SWIG_AsPtr_std_string")
+    const std::vector<std::pair< std::string,std::string >,std::allocator< std::pair< std::string,std::string > > > &
+        (std::vector< std::pair< std::string,std::string >,std::allocator< std::pair< std::string,std::string > > > temp,
+        int res) {
+    res = SWIG_OK;
+    for (int i = 0; i < PySequence_Length($input); ++i) {
+        temp.push_back(std::pair< std::string,std::string >());
+        PyObject *item = PySequence_GetItem($input, i);
+        if (!PyTuple_Check(item) || PyTuple_Size(item) != 2) {
+            SWIG_fail;
+        }
+        PyObject *key = PyTuple_GetItem(item, 0);
+        PyObject *value = PyTuple_GetItem(item, 1);
+        std::string *ptr = (std::string *)0;
+        if (PyBytes_Check(key)) {
+            temp.back().first.assign(PyBytes_AsString(key), PyBytes_Size(key));
+        } else if (SWIG_AsPtr_std_string(key, &ptr)) {
+            temp.back().first = *ptr;
+        } else {
+            SWIG_fail;
+        }
+        if (PyBytes_Check(value)) {
+            temp.back().second.assign(PyBytes_AsString(value), PyBytes_Size(value));
+        } else if (SWIG_AsPtr_std_string(value, &ptr)) {
+            temp.back().second = *ptr;
+        } else {
+            SWIG_fail;
+        }
+    }
+    $1 = &temp;
+}
+
+%typemap(typecheck) const std::vector< std::pair< std::string,std::string >,std::allocator< std::pair< std::string,std::string > > > &{
+    $1 = 1;
+    for (int i = 0; i < PySequence_Length($input); ++i) {
+        PyObject *item = PySequence_GetItem($input, i);
+        if (!PyTuple_Check(item) || PyTuple_Size(item) != 2) {
+            $1 = 0;
+            break;
+        }
+        PyObject *key = PyTuple_GetItem(item, 0);
+        PyObject *value = PyTuple_GetItem(item, 1);
+        if (!PyBytes_Check(key)
+            && !PyUnicode_Check(key)
+            && !PyString_Check(key)
+            && !PyBytes_Check(value)
+            && !PyUnicode_Check(value)
+            && !PyString_Check(value)) {
+            $1 = 0;
+            break;
+        }
+    }
+}
+
+
 #endif
 
 #ifdef SWIGGO