Skip to content

Assorted ujson Cleanups #35064

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
WillAyd merged 4 commits into from
Jul 1, 2020
Merged

Assorted ujson Cleanups #35064

Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0b75013
Removed get_item static func
WillAyd Jun 30, 2020
7e21e08
removed unnecessary loop
WillAyd Jun 30, 2020
e3a00ad
dtype / goto cleanup
WillAyd Jun 30, 2020
57d3735
spaces no tabs
WillAyd Jun 30, 2020
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
27 changes: 4 additions & 23 deletions pandas/_libs/src/ujson/python/objToJSON.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -324,19 +324,6 @@ static npy_float64 total_seconds(PyObject *td) {
return double_val;
}

static PyObject *get_item(PyObject *obj, Py_ssize_t i) {
PyObject *tmp = PyLong_FromSsize_t(i);
PyObject *ret;

if (tmp == 0) {
return 0;
}
ret = PyObject_GetItem(obj, tmp);
Py_DECREF(tmp);

return ret;
}

static char *PyBytesToUTF8(JSOBJ _obj, JSONTypeContext *Py_UNUSED(tc),
size_t *_outLen) {
PyObject *obj = (PyObject *)_obj;
Expand Down Expand Up @@ -749,9 +736,6 @@ void PdBlock_iterBegin(JSOBJ _obj, JSONTypeContext *tc) {
GET_TC(tc)->iterNext = NpyArr_iterNextNone;
goto BLKRET;
}
for (i = 0; i < blkCtxt->ncols; i++) {
blkCtxt->npyCtxts[i] = NULL;
}

blkCtxt->cindices = PyObject_Malloc(sizeof(int) * blkCtxt->ncols);
if (!blkCtxt->cindices) {
Expand All @@ -764,13 +748,16 @@ void PdBlock_iterBegin(JSOBJ _obj, JSONTypeContext *tc) {
if (!blocks) {
GET_TC(tc)->iterNext = NpyArr_iterNextNone;
goto BLKRET;
} else if (!PyTuple_Check(blocks)) {
PyErr_SetString(PyExc_TypeError, "blocks must be a tuple!");
goto BLKRET;
}

// force transpose so each NpyArrContext strides down its column
GET_TC(tc)->transpose = 1;

for (i = 0; i < PyObject_Length(blocks); i++) {
block = get_item(blocks, i);
block = PyTuple_GET_ITEM(blocks, i);
if (!block) {
GET_TC(tc)->iterNext = NpyArr_iterNextNone;
goto BLKRET;
Expand All @@ -779,22 +766,19 @@ void PdBlock_iterBegin(JSOBJ _obj, JSONTypeContext *tc) {
tmp = PyObject_CallMethod(block, "get_block_values_for_json", NULL);
if (!tmp) {
((JSONObjectEncoder *)tc->encoder)->errorMsg = "";
Py_DECREF(block);
GET_TC(tc)->iterNext = NpyArr_iterNextNone;
goto BLKRET;
}

values = PyArray_Transpose((PyArrayObject *)tmp, NULL);
Py_DECREF(tmp);
if (!values) {
Py_DECREF(block);
GET_TC(tc)->iterNext = NpyArr_iterNextNone;
goto BLKRET;
}

locs = (PyArrayObject *)get_sub_attr(block, "mgr_locs", "as_array");
if (!locs) {
Py_DECREF(block);
Py_DECREF(values);
GET_TC(tc)->iterNext = NpyArr_iterNextNone;
goto BLKRET;
Expand All @@ -803,7 +787,6 @@ void PdBlock_iterBegin(JSOBJ _obj, JSONTypeContext *tc) {
iter = NpyIter_New(locs, NPY_ITER_READONLY, NPY_KEEPORDER,
NPY_NO_CASTING, dtype);
if (!iter) {
Py_DECREF(block);
Py_DECREF(values);
Py_DECREF(locs);
GET_TC(tc)->iterNext = NpyArr_iterNextNone;
Expand All @@ -812,7 +795,6 @@ void PdBlock_iterBegin(JSOBJ _obj, JSONTypeContext *tc) {
iternext = NpyIter_GetIterNext(iter, NULL);
if (!iternext) {
NpyIter_Deallocate(iter);
Py_DECREF(block);
Py_DECREF(values);
Py_DECREF(locs);
GET_TC(tc)->iterNext = NpyArr_iterNextNone;
Expand Down Expand Up @@ -846,7 +828,6 @@ void PdBlock_iterBegin(JSOBJ _obj, JSONTypeContext *tc) {
} while (iternext(iter));

NpyIter_Deallocate(iter);
Py_DECREF(block);
Py_DECREF(values);
Py_DECREF(locs);
}
Expand Down