ilusha/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython synced 2026-09-28 10:28:18 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

GH-46412: More efficient bool() for ndbm/_gdbmmodule (#96692)

Browse source
This commit is contained in:
Guido van Rossum 2022-09-08 19:32:40 -07:00 • committed by GitHub
parent 95d6330a3e
commit df50938f58
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 91 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

32
Modules/_dbmmodule.c
View file

@ -130,6 +130,37 @@ dbm_length(dbmobject *dp)
return dp->di_size;
}
static int
dbm_bool(dbmobject *dp)
{
_dbm_state *state = PyType_GetModuleState(Py_TYPE(dp));
assert(state != NULL);
if (dp->di_dbm == NULL) {
PyErr_SetString(state->dbm_error, "DBM object has already been closed");
return -1;
}
if (dp->di_size > 0) {
/* Known non-zero size. */
return 1;
}
if (dp->di_size == 0) {
/* Known zero size. */
return 0;
}
/* Unknown size. Ensure DBM object has an entry. */
datum key = dbm_firstkey(dp->di_dbm);
if (key.dptr == NULL) {
/* Empty. Cache this fact. */
dp->di_size = 0;
return 0;
}
/* Non-empty. Don't cache the length since we don't know. */
return 1;
}
static PyObject *
dbm_subscript(dbmobject *dp, PyObject *key)
{
@ -416,6 +447,7 @@ static PyType_Slot dbmtype_spec_slots[] = {
{Py_mp_length, dbm_length},
{Py_mp_subscript, dbm_subscript},
{Py_mp_ass_subscript, dbm_ass_sub},
{Py_nb_bool, dbm_bool},
{0, 0}
};

30
Modules/_gdbmmodule.c
View file

@ -162,6 +162,35 @@ gdbm_length(gdbmobject *dp)
return dp->di_size;
}
static int
gdbm_bool(gdbmobject *dp)
{
_gdbm_state *state = PyType_GetModuleState(Py_TYPE(dp));
if (dp->di_dbm == NULL) {
PyErr_SetString(state->gdbm_error, "GDBM object has already been closed");
return -1;
}
if (dp->di_size > 0) {
/* Known non-zero size. */
return 1;
}
if (dp->di_size == 0) {
/* Known zero size. */
return 0;
}
/* Unknown size. Ensure DBM object has an entry. */
datum key = gdbm_firstkey(dp->di_dbm);
if (key.dptr == NULL) {
/* Empty. Cache this fact. */
dp->di_size = 0;
return 0;
}
/* Non-empty. Don't cache the length since we don't know. */
free(key.dptr);
return 1;
}
// Wrapper function for PyArg_Parse(o, "s#", &d.dptr, &d.size).
// This function is needed to support PY_SSIZE_T_CLEAN.
// Return 1 on success, same to PyArg_Parse().
@ -569,6 +598,7 @@ static PyType_Slot gdbmtype_spec_slots[] = {
{Py_mp_length, gdbm_length},
{Py_mp_subscript, gdbm_subscript},
{Py_mp_ass_subscript, gdbm_ass_sub},
{Py_nb_bool, gdbm_bool},
{Py_tp_doc, (char*)gdbm_object__doc__},
{0, 0}
};