Skip to content

gh-91146: More reduce allocation size of list from str.split/rsplit #95493

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 6 commits into from
Aug 1, 2022
Merged

gh-91146: More reduce allocation size of list from str.split/rsplit #95493

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
48ad552
gh-91146: More reduce allocation size of list from str.split/rsplit
corona10 Jul 31, 2022
605e0cf
Update NEWS.d
corona10 Jul 31, 2022
cab2a61
Handle devide by zero
corona10 Jul 31, 2022
2ebc918
Add comment for len2 == 0
corona10 Jul 31, 2022
b5edcd8
Avoid overflow error
corona10 Jul 31, 2022
7f248ef
Handle overflow case
corona10 Jul 31, 2022
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
2 changes: 1 addition & 1 deletion Misc/NEWS.d/next/Core and Builtins/2022-07-31-03-22-58.gh-issue-91146.Y2Hziy.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Reduce allocation size of :class:`list` from :meth:`str.split`
and :meth:`str.rsplit`. Patch by Dong-hee Na.
and :meth:`str.rsplit`. Patch by Dong-hee Na and Inada Naoki.
31 changes: 22 additions & 9 deletions Objects/unicodeobject.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9698,11 +9698,11 @@ split(PyObject *self,
PyObject* out;
len1 = PyUnicode_GET_LENGTH(self);
kind1 = PyUnicode_KIND(self);
if (maxcount < 0) {
maxcount = len1;
}

if (substring == NULL)
if (substring == NULL) {
if (maxcount < 0) {
maxcount = (len1 - 1) / 2 + 1;
}
switch (kind1) {
case PyUnicode_1BYTE_KIND:
if (PyUnicode_IS_ASCII(self))
Expand All @@ -9728,9 +9728,16 @@ split(PyObject *self,
default:
Py_UNREACHABLE();
}
}

kind2 = PyUnicode_KIND(substring);
len2 = PyUnicode_GET_LENGTH(substring);
if (maxcount < 0) {
// if len2 == 0, it will raise ValueError.
maxcount = len2 == 0 ? 0 : (len1 / len2) + 1;
// handle expected overflow case: (Py_SSIZE_T_MAX / 1) + 1
maxcount = maxcount < 0 ? len1 : maxcount;
}
if (kind1 < kind2 || len1 < len2) {
out = PyList_New(1);
if (out == NULL)
Expand Down Expand Up @@ -9785,11 +9792,11 @@ rsplit(PyObject *self,

len1 = PyUnicode_GET_LENGTH(self);
kind1 = PyUnicode_KIND(self);
if (maxcount < 0) {
maxcount = len1;
}

if (substring == NULL)
if (substring == NULL) {
if (maxcount < 0) {
maxcount = (len1 - 1) / 2 + 1;
}
switch (kind1) {
case PyUnicode_1BYTE_KIND:
if (PyUnicode_IS_ASCII(self))
Expand All @@ -9815,9 +9822,15 @@ rsplit(PyObject *self,
default:
Py_UNREACHABLE();
}

}
kind2 = PyUnicode_KIND(substring);
len2 = PyUnicode_GET_LENGTH(substring);
if (maxcount < 0) {
// if len2 == 0, it will raise ValueError.
maxcount = len2 == 0 ? 0 : (len1 / len2) + 1;
// handle expected overflow case: (Py_SSIZE_T_MAX / 1) + 1
maxcount = maxcount < 0 ? len1 : maxcount;
}
if (kind1 < kind2 || len1 < len2) {
out = PyList_New(1);
if (out == NULL)
Expand Down