Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
cpython
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
cpython
Commits
2397dd58
Commit
2397dd58
authored
Nov 04, 2010
by
Antoine Pitrou
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Issue #10314: improve performance of JSON encoding with sort_keys=True
parent
5ee89cf1
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
25 additions
and
20 deletions
+25
-20
Modules/_json.c
Modules/_json.c
+25
-20
No files found.
Modules/_json.c
View file @
2397dd58
...
...
@@ -1387,8 +1387,6 @@ encoder_listencode_dict(PyEncoderObject *s, PyObject *rval, PyObject *dct, Py_ss
PyObject
*
item
=
NULL
;
int
skipkeys
;
Py_ssize_t
idx
;
PyObject
*
mapping
;
static
PyObject
*
code
=
NULL
;
if
(
open_dict
==
NULL
||
close_dict
==
NULL
||
empty_dict
==
NULL
)
{
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
(
code
==
NULL
)
{
code
=
Py_CompileString
(
"sorted(d.items(), key=lambda kv: kv[0])"
,
"_json.c"
,
Py_eval_input
);
if
(
code
==
NULL
)
goto
bail
;
}
mapping
=
PyDict_New
();
if
(
mapping
==
NULL
)
/* First sort the keys then replace them with (key, value) tuples. */
Py_ssize_t
i
,
nitems
;
items
=
PyMapping_Keys
(
dct
);
if
(
items
==
NULL
)
goto
bail
;
if
(
PyDict_SetItemString
(
mapping
,
"d"
,
dct
)
==
-
1
)
{
Py
_DECREF
(
mapping
);
if
(
!
PyList_Check
(
items
)
)
{
Py
Err_SetString
(
PyExc_ValueError
,
"keys must return list"
);
goto
bail
;
}
items
=
PyEval_EvalCode
((
PyCodeObject
*
)
code
,
PyEval_GetGlobals
(),
mapping
);
Py_DECREF
(
mapping
);
}
else
{
items
=
PyMapping_Items
(
dct
);
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
);
}
if
(
items
==
NULL
)
}
else
{
items
=
PyMapping_Items
(
dct
);
}
if
(
items
==
NULL
)
goto
bail
;
it
=
PyObject_GetIter
(
items
);
Py_DECREF
(
items
);
if
(
it
==
NULL
)
Py_DECREF
(
items
);
if
(
it
==
NULL
)
goto
bail
;
skipkeys
=
PyObject_IsTrue
(
s
->
skipkeys
);
idx
=
0
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment