这是indexloc提供的服务，不要输入任何密码
Skip to content

[BUG FIX] Var Length Mixed Type Tuples #63

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

Merged
merged 4 commits into from
Dec 7, 2021
Merged

[BUG FIX] Var Length Mixed Type Tuples #63

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7850a9d
Bug fix for mixed type tuples
bgivertz Dec 6, 2021
918d25a
Bug fix for mixed type tuples
bgivertz Dec 6, 2021
3930e15
Bug fix for mixed type tuples
bgivertz Dec 6, 2021
b28f2c2
Bug fix for mixed type tuples
bgivertz Dec 6, 2021
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
19 changes: 16 additions & 3 deletions tuplex/python/src/PythonContext.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,9 +211,22 @@ namespace tuplex {
// first get how many bytes are required
size_t requiredBytes = baseRequiredBytes;
if(varLenField) {
for(int j = 0; j < numTupleElements; ++j)
if(typeStr[j] == 's')
requiredBytes += PyUnicode_GET_SIZE(PyTuple_GetItem(obj, j)) + 1; // +1 for '\0'
bool nonConforming = false;
for(int j = 0; j < numTupleElements; ++j) {
if (typeStr[j] == 's') {
auto tupleItem = PyTuple_GetItem(obj, j);
if (PyUnicode_Check(tupleItem)) {
requiredBytes += PyUnicode_GET_SIZE(tupleItem) + 1; // +1 for '\0'
} else {
nonConforming = true;
break;
}
}
}
if (nonConforming) {
_badParallelizeObjects.emplace_back(i, obj);
continue;
}
}

// get new partition if capacity exhausted
Expand Down
84 changes: 84 additions & 0 deletions tuplex/test/wrappers/WrapperTest.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,90 @@ TEST_F(WrapperTest, LambdaBackend) {

// Important detail: RAII of boost python requires call to all boost::python destructors before closing the interpreter.

TEST_F(WrapperTest, StringTuple) {
using namespace tuplex;

PythonContext c("");

PyObject *listObj = PyList_New(4);
PyObject *tupleObj1 = PyTuple_New(2);
PyTuple_SET_ITEM(tupleObj1, 0, python::PyString_FromString("a"));
PyTuple_SET_ITEM(tupleObj1, 1, python::PyString_FromString("a"));

PyObject *tupleObj2 = PyTuple_New(2);
PyTuple_SET_ITEM(tupleObj2, 0, python::PyString_FromString("b"));
PyTuple_SET_ITEM(tupleObj2, 1, python::PyString_FromString("b"));

PyObject *tupleObj3 = PyTuple_New(2);
PyTuple_SET_ITEM(tupleObj3, 0, python::PyString_FromString("c"));
PyTuple_SET_ITEM(tupleObj3, 1, python::PyString_FromString("c"));

PyObject *tupleObj4 = PyTuple_New(2);
PyTuple_SET_ITEM(tupleObj4, 0, python::PyString_FromString("d"));
PyTuple_SET_ITEM(tupleObj4, 1, python::PyString_FromString("d"));

PyList_SetItem(listObj, 0, tupleObj1);
PyList_SetItem(listObj, 1, tupleObj2);
PyList_SetItem(listObj, 2, tupleObj3);
PyList_SetItem(listObj, 3, tupleObj4);

{
auto list = boost::python::list(boost::python::handle<>(listObj));

auto res = c.parallelize(list).map("lambda x: x", "").collect();

auto resObj = res.ptr();

ASSERT_TRUE(PyList_Check(resObj));
// Change to 4 when parallelize changes are merged
ASSERT_EQ(PyList_GET_SIZE(resObj), 4);

PyObject_Print(resObj, stdout, 0);
}
}

TEST_F(WrapperTest, MixedSimpleTupleTuple) {
using namespace tuplex;

PythonContext c("");

PyObject *listObj = PyList_New(4);
PyObject *tupleObj1 = PyTuple_New(2);
PyTuple_SET_ITEM(tupleObj1, 0, python::PyString_FromString("a"));
PyTuple_SET_ITEM(tupleObj1, 1, PyLong_FromLong(1));

PyObject *tupleObj2 = PyTuple_New(2);
PyTuple_SET_ITEM(tupleObj2, 0, python::PyString_FromString("b"));
PyTuple_SET_ITEM(tupleObj2, 1, PyLong_FromLong(2));

PyObject *tupleObj3 = PyTuple_New(2);
PyTuple_SET_ITEM(tupleObj3, 0, python::PyString_FromString("c"));
PyTuple_SET_ITEM(tupleObj3, 1, PyLong_FromLong(3));

PyObject *tupleObj4 = PyTuple_New(2);
PyTuple_SET_ITEM(tupleObj4, 0, Py_None);
PyTuple_SET_ITEM(tupleObj4, 1, PyLong_FromLong(4));

PyList_SetItem(listObj, 0, tupleObj1);
PyList_SetItem(listObj, 1, tupleObj2);
PyList_SetItem(listObj, 2, tupleObj3);
PyList_SetItem(listObj, 3, tupleObj4);

{
auto list = boost::python::list(boost::python::handle<>(listObj));

auto res = c.parallelize(list).collect();

auto resObj = res.ptr();

ASSERT_TRUE(PyList_Check(resObj));
// Change to 4 when parallelize changes are merged
ASSERT_EQ(PyList_GET_SIZE(resObj), 3);

PyObject_Print(resObj, stdout, 0);
}
}

TEST_F(WrapperTest, StringParallelize) {
using namespace tuplex;

Expand Down