Skip to content

bpo-32494: Use gdbm_count for dbm_length if possible #19814

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
pitrou merged 6 commits into from
May 1, 2020
Merged

bpo-32494: Use gdbm_count for dbm_length if possible #19814

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
1e3dcb7
bpo-32494: Use gdbm_count for dbm_length if possible
corona10 Apr 30, 2020
73415d2
bpo-32494: Move to library
corona10 Apr 30, 2020
4c10595
bpo-32494: Apply code review
corona10 May 1, 2020
7b7a9fe
bpo-32494: nit
corona10 May 1, 2020
2e17a62
bpo-32494: nit for PEP 7
corona10 May 1, 2020
ffba163
bpo-32494: nit
corona10 May 1, 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
2 changes: 2 additions & 0 deletions Misc/NEWS.d/next/Library/2020-04-30-22-25-08.bpo-32494.1xaU5l.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Update :mod:`dbm.gnu` to use gdbm_count if possible when calling
:func:`len`. Patch by Dong-hee Na.
30 changes: 25 additions & 5 deletions Modules/_gdbmmodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ values() methods are not supported.");

typedef struct {
PyObject_HEAD
int di_size; /* -1 means recompute */
Py_ssize_t di_size; /* -1 means recompute */
GDBM_FILE di_dbm;
} dbmobject;

Expand Down Expand Up @@ -102,19 +102,39 @@ dbm_length(dbmobject *dp)
return -1;
}
if (dp->di_size < 0) {
#if GDBM_VERSION_MAJOR >= 1 && GDBM_VERSION_MINOR >= 11
errno = 0;
gdbm_count_t count;
if (gdbm_count(dp->di_dbm, &count) == -1) {
if (errno != 0) {
PyErr_SetFromErrno(DbmError);
}
else {
PyErr_SetString(DbmError, gdbm_strerror(gdbm_errno));
}
return -1;
}
if (count > PY_SSIZE_T_MAX) {
PyErr_SetString(PyExc_OverflowError, "count exceeds PY_SSIZE_T_MAX");
return -1;
}
dp->di_size = count;
#else
datum key,okey;
int size;
okey.dsize=0;
okey.dptr=NULL;

size = 0;
for (key=gdbm_firstkey(dp->di_dbm); key.dptr;
Py_ssize_t size = 0;
for (key = gdbm_firstkey(dp->di_dbm); key.dptr;
key = gdbm_nextkey(dp->di_dbm,okey)) {
size++;
if(okey.dsize) free(okey.dptr);
if (okey.dsize) {
free(okey.dptr);
}
okey=key;
}
dp->di_size = size;
#endif
}
return dp->di_size;
}
Expand Down