mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-12 07:02:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Issue #10314: improve performance of JSON encoding with sort_keys=True

Browse source
This commit is contained in:
Antoine Pitrou 2010-11-04 16:51:32 +00:00
parent 5ee89cf13e
commit 2397dd58b7
1 changed files with 28 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

51
Modules/_json.c
View file

@ -1387,8 +1387,6 @@ encoder_listencode_dict(PyEncoderObject *s, PyObject *rval, PyObject *dct, Py_ss
PyObject *item = NULL; PyObject *item = NULL;
int skipkeys; int skipkeys;
Py_ssize_t idx; Py_ssize_t idx;
PyObject *mapping;
static PyObject *code = NULL;
if (open_dict == NULL || close_dict == NULL || empty_dict == NULL) { if (open_dict == NULL || close_dict == NULL || empty_dict == NULL) {
open_dict = PyUnicode_InternFromString("{"); open_dict = PyUnicode_InternFromString("{");
@ -1430,30 +1428,37 @@ encoder_listencode_dict(PyEncoderObject *s, PyObject *rval, PyObject *dct, Py_ss
} }
if (PyObject_IsTrue(s->sort_keys)) { if (PyObject_IsTrue(s->sort_keys)) {
if (code == NULL) { /* First sort the keys then replace them with (key, value) tuples. */
code = Py_CompileString("sorted(d.items(), key=lambda kv: kv[0])", Py_ssize_t i, nitems;
"_json.c", Py_eval_input); items = PyMapping_Keys(dct);
if (code == NULL)
goto bail;
}
mapping = PyDict_New();
if (mapping == NULL)
goto bail;
if (PyDict_SetItemString(mapping, "d", dct) == -1) {
Py_DECREF(mapping);
goto bail;
}
items = PyEval_EvalCode((PyCodeObject *)code, PyEval_GetGlobals(), mapping);
Py_DECREF(mapping);
} else {
items = PyMapping_Items(dct);
}
if (items == NULL) if (items == NULL)
goto bail;
if (!PyList_Check(items)) {
PyErr_SetString(PyExc_ValueError, "keys must return list");
goto bail;
}
if (PyList_Sort(items) < 0)
goto bail;
nitems = PyList_GET_SIZE(items);
for (i = 0; i < nitems; i++) {
PyObject *key, *value;
key = PyList_GET_ITEM(items, i);
value = PyDict_GetItem(dct, key);
item = PyTuple_Pack(2, key, value);
if (item == NULL)
goto bail;
PyList_SET_ITEM(items, i, item);
Py_DECREF(key);
}
}
else {
items = PyMapping_Items(dct);
}
if (items == NULL)
goto bail; goto bail;
it = PyObject_GetIter(items); it = PyObject_GetIter(items);
Py_DECREF(items); Py_DECREF(items);
if (it == NULL) if (it == NULL)
goto bail; goto bail;
skipkeys = PyObject_IsTrue(s->skipkeys); skipkeys = PyObject_IsTrue(s->skipkeys);
idx = 0; idx = 0;