Skip to content

THRIFT-3519 fastbinary does not work with -gen py:utf8strings #769

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
nsuke wants to merge 1 commit into from
Closed

THRIFT-3519 fastbinary does not work with -gen py:utf8strings #769

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions compiler/cpp/src/generate/t_py_generator.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2555,6 +2555,9 @@ string t_py_generator::type_to_spec_args(t_type* ttype) {

if (ttype->is_base_type() && reinterpret_cast<t_base_type*>(ttype)->is_binary()) {
return "'BINARY'";
} else if (gen_utf8strings_ && ttype->is_base_type()
&& reinterpret_cast<t_base_type*>(ttype)->is_string()) {
return "'UTF8'";
} else if (ttype->is_base_type() || ttype->is_enum()) {
return "None";
} else if (ttype->is_struct() || ttype->is_xception()) {
Expand Down
14 changes: 12 additions & 2 deletions lib/py/src/protocol/fastbinary.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,6 +226,10 @@ parse_pyint(PyObject* o, int32_t* ret, int32_t min, int32_t max) {
return true;
}

static bool
is_utf8(PyObject* typeargs) {
return PyString_Check(typeargs) && !strcmp(PyString_AS_STRING(typeargs), "UTF8");
}

/* --- FUNCTIONS TO PARSE STRUCT SPECIFICATOINS --- */

Expand Down Expand Up @@ -430,7 +434,10 @@ output_val(PyObject* output, PyObject* value, TType type, PyObject* typeargs) {
}

case T_STRING: {
Py_ssize_t len = PyString_Size(value);
Py_ssize_t len = 0;
if (is_utf8(typeargs) && PyUnicode_Check(value))
value = PyUnicode_AsUTF8String(value);
len = PyString_Size(value);

if (!check_ssize_t_32(len)) {
return false;
Expand Down Expand Up @@ -1053,7 +1060,10 @@ decode_val(DecodeBuffer* input, TType type, PyObject* typeargs) {
return NULL;
}

return PyString_FromStringAndSize(buf, len);
if (is_utf8(typeargs))
return PyUnicode_DecodeUTF8(buf, len, 0);
else
return PyString_FromStringAndSize(buf, len);
}

case T_LIST:
Expand Down