traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

bpo-41861: Convert _sqlite3 RowType and StatementType to heap types (GH-22444)

This commit is contained in:
Erlend Egeberg Aasland 2020-10-01 15:24:31 +02:00 committed by GitHub
parent fa7ce08017
commit 9031bd4fa4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 72 additions and 119 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Modules/_sqlite/cache.c
View File

@ -267,7 +267,7 @@ static PyType_Slot pysqlite_NodeType_slots[] = {
static PyType_Spec pysqlite_NodeType_spec = { static PyType_Spec pysqlite_NodeType_spec = {
.name = MODULE_NAME ".Node", .name = MODULE_NAME ".Node",
.basicsize = sizeof(pysqlite_Node), .basicsize = sizeof(pysqlite_Node),
.flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE | Py_TPFLAGS_HEAPTYPE, .flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE,
.slots = pysqlite_NodeType_slots, .slots = pysqlite_NodeType_slots,
}; };
PyTypeObject *pysqlite_NodeType = NULL; PyTypeObject *pysqlite_NodeType = NULL;
@ -291,7 +291,7 @@ static PyType_Slot pysqlite_CacheType_slots[] = {
static PyType_Spec pysqlite_CacheType_spec = { static PyType_Spec pysqlite_CacheType_spec = {
.name = MODULE_NAME ".Cache", .name = MODULE_NAME ".Cache",
.basicsize = sizeof(pysqlite_Cache), .basicsize = sizeof(pysqlite_Cache),
.flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE | Py_TPFLAGS_HEAPTYPE, .flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE,
.slots = pysqlite_CacheType_slots, .slots = pysqlite_CacheType_slots,
}; };
PyTypeObject *pysqlite_CacheType = NULL; PyTypeObject *pysqlite_CacheType = NULL;

2
Modules/_sqlite/connection.c
View File

@ -1234,7 +1234,7 @@ PyObject* pysqlite_connection_call(pysqlite_Connection* self, PyObject* args, Py
_pysqlite_drop_unused_statement_references(self); _pysqlite_drop_unused_statement_references(self);
statement = PyObject_New(pysqlite_Statement, &pysqlite_StatementType); statement = PyObject_New(pysqlite_Statement, pysqlite_StatementType);
if (!statement) { if (!statement) {
return NULL; return NULL;
} }

2
Modules/_sqlite/cursor.c
View File

@ -472,7 +472,7 @@ _pysqlite_query_execute(pysqlite_Cursor* self, int multiple, PyObject* args)
if (self->statement->in_use) { if (self->statement->in_use) {
Py_SETREF(self->statement, Py_SETREF(self->statement,
PyObject_New(pysqlite_Statement, &pysqlite_StatementType)); PyObject_New(pysqlite_Statement, pysqlite_StatementType));
if (!self->statement) { if (!self->statement) {
goto error; goto error;
} }

6
Modules/_sqlite/module.c
View File

@ -352,11 +352,11 @@ PyMODINIT_FUNC PyInit__sqlite3(void)
module = PyModule_Create(&_sqlite3module); module = PyModule_Create(&_sqlite3module);
if (!module || if (!module ||
(pysqlite_row_setup_types() < 0) || (pysqlite_row_setup_types(module) < 0) ||
(pysqlite_cursor_setup_types() < 0) || (pysqlite_cursor_setup_types() < 0) ||
(pysqlite_connection_setup_types() < 0) || (pysqlite_connection_setup_types() < 0) ||
(pysqlite_cache_setup_types(module) < 0) || (pysqlite_cache_setup_types(module) < 0) ||
(pysqlite_statement_setup_types() < 0) || (pysqlite_statement_setup_types(module) < 0) ||
(pysqlite_prepare_protocol_setup_types(module) < 0) (pysqlite_prepare_protocol_setup_types(module) < 0)
) { ) {
Py_XDECREF(module); Py_XDECREF(module);
@ -366,7 +366,7 @@ PyMODINIT_FUNC PyInit__sqlite3(void)
ADD_TYPE(module, pysqlite_ConnectionType); ADD_TYPE(module, pysqlite_ConnectionType);
ADD_TYPE(module, pysqlite_CursorType); ADD_TYPE(module, pysqlite_CursorType);
ADD_TYPE(module, *pysqlite_PrepareProtocolType); ADD_TYPE(module, *pysqlite_PrepareProtocolType);
ADD_TYPE(module, pysqlite_RowType); ADD_TYPE(module, *pysqlite_RowType);
if (!(dict = PyModule_GetDict(module))) { if (!(dict = PyModule_GetDict(module))) {
goto error; goto error;

2
Modules/_sqlite/prepare_protocol.c
View File

@ -46,7 +46,7 @@ static PyType_Slot type_slots[] = {
static PyType_Spec type_spec = { static PyType_Spec type_spec = {
.name = MODULE_NAME ".PrepareProtocol", .name = MODULE_NAME ".PrepareProtocol",
.basicsize = sizeof(pysqlite_PrepareProtocol), .basicsize = sizeof(pysqlite_PrepareProtocol),
.flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HEAPTYPE, .flags = Py_TPFLAGS_DEFAULT,
.slots = type_slots, .slots = type_slots,
}; };

96
Modules/_sqlite/row.c
View File

@ -26,10 +26,13 @@
void pysqlite_row_dealloc(pysqlite_Row* self) void pysqlite_row_dealloc(pysqlite_Row* self)
{ {
PyTypeObject *tp = Py_TYPE(self);
Py_XDECREF(self->data); Py_XDECREF(self->data);
Py_XDECREF(self->description); Py_XDECREF(self->description);
Py_TYPE(self)->tp_free((PyObject*)self); tp->tp_free(self);
Py_DECREF(tp);
} }
static PyObject * static PyObject *
@ -192,7 +195,7 @@ static PyObject* pysqlite_row_richcompare(pysqlite_Row *self, PyObject *_other,
if (opid != Py_EQ && opid != Py_NE) if (opid != Py_EQ && opid != Py_NE)
Py_RETURN_NOTIMPLEMENTED; Py_RETURN_NOTIMPLEMENTED;
if (PyObject_TypeCheck(_other, &pysqlite_RowType)) { if (PyObject_TypeCheck(_other, pysqlite_RowType)) {
pysqlite_Row *other = (pysqlite_Row *)_other; pysqlite_Row *other = (pysqlite_Row *)_other;
int eq = PyObject_RichCompareBool(self->description, other->description, Py_EQ); int eq = PyObject_RichCompareBool(self->description, other->description, Py_EQ);
if (eq < 0) { if (eq < 0) {
@ -206,73 +209,40 @@ static PyObject* pysqlite_row_richcompare(pysqlite_Row *self, PyObject *_other,
Py_RETURN_NOTIMPLEMENTED; Py_RETURN_NOTIMPLEMENTED;
} }
PyMappingMethods pysqlite_row_as_mapping = { static PyMethodDef row_methods[] = {
/* mp_length */ (lenfunc)pysqlite_row_length,
/* mp_subscript */ (binaryfunc)pysqlite_row_subscript,
/* mp_ass_subscript */ (objobjargproc)0,
};
static PySequenceMethods pysqlite_row_as_sequence = {
/* sq_length */ (lenfunc)pysqlite_row_length,
/* sq_concat */ 0,
/* sq_repeat */ 0,
/* sq_item */ (ssizeargfunc)pysqlite_row_item,
};
static PyMethodDef pysqlite_row_methods[] = {
{"keys", (PyCFunction)pysqlite_row_keys, METH_NOARGS, {"keys", (PyCFunction)pysqlite_row_keys, METH_NOARGS,
PyDoc_STR("Returns the keys of the row.")}, PyDoc_STR("Returns the keys of the row.")},
{NULL, NULL} {NULL, NULL}
}; };
static PyType_Slot row_slots[] = {
PyTypeObject pysqlite_RowType = { {Py_tp_dealloc, pysqlite_row_dealloc},
PyVarObject_HEAD_INIT(NULL, 0) {Py_tp_hash, pysqlite_row_hash},
MODULE_NAME ".Row", /* tp_name */ {Py_tp_methods, row_methods},
sizeof(pysqlite_Row), /* tp_basicsize */ {Py_tp_richcompare, pysqlite_row_richcompare},
0, /* tp_itemsize */ {Py_tp_iter, pysqlite_iter},
(destructor)pysqlite_row_dealloc, /* tp_dealloc */ {Py_mp_length, pysqlite_row_length},
0, /* tp_vectorcall_offset */ {Py_mp_subscript, pysqlite_row_subscript},
0, /* tp_getattr */ {Py_sq_length, pysqlite_row_length},
0, /* tp_setattr */ {Py_sq_item, pysqlite_row_item},
0, /* tp_as_async */ {Py_tp_new, pysqlite_row_new},
0, /* tp_repr */ {0, NULL},
0, /* tp_as_number */
0, /* tp_as_sequence */
0, /* tp_as_mapping */
(hashfunc)pysqlite_row_hash, /* tp_hash */
0, /* tp_call */
0, /* tp_str */
0, /* tp_getattro */
0, /* tp_setattro */
0, /* tp_as_buffer */
Py_TPFLAGS_DEFAULT|Py_TPFLAGS_BASETYPE, /* tp_flags */
0, /* tp_doc */
(traverseproc)0, /* tp_traverse */
0, /* tp_clear */
(richcmpfunc)pysqlite_row_richcompare, /* tp_richcompare */
0, /* tp_weaklistoffset */
(getiterfunc)pysqlite_iter, /* tp_iter */
0, /* tp_iternext */
pysqlite_row_methods, /* tp_methods */
0, /* tp_members */
0, /* tp_getset */
0, /* tp_base */
0, /* tp_dict */
0, /* tp_descr_get */
0, /* tp_descr_set */
0, /* tp_dictoffset */
0, /* tp_init */
0, /* tp_alloc */
0, /* tp_new */
0 /* tp_free */
}; };
extern int pysqlite_row_setup_types(void) static PyType_Spec row_spec = {
.name = MODULE_NAME ".Row",
.basicsize = sizeof(pysqlite_Row),
.flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE,
.slots = row_slots,
};
PyTypeObject *pysqlite_RowType = NULL;
extern int pysqlite_row_setup_types(PyObject *module)
{ {
pysqlite_RowType.tp_new = pysqlite_row_new; pysqlite_RowType = (PyTypeObject *)PyType_FromModuleAndSpec(module, &row_spec, NULL);
pysqlite_RowType.tp_as_mapping = &pysqlite_row_as_mapping; if (pysqlite_RowType == NULL) {
pysqlite_RowType.tp_as_sequence = &pysqlite_row_as_sequence; return -1;
return PyType_Ready(&pysqlite_RowType); }
return 0;
} }

4
Modules/_sqlite/row.h
View File

@ -33,8 +33,8 @@ typedef struct _Row
PyObject* description; PyObject* description;
} pysqlite_Row; } pysqlite_Row;
extern PyTypeObject pysqlite_RowType; extern PyTypeObject *pysqlite_RowType;
int pysqlite_row_setup_types(void); int pysqlite_row_setup_types(PyObject *module);
#endif #endif

71
Modules/_sqlite/statement.c
View File

@ -371,6 +371,8 @@ void pysqlite_statement_mark_dirty(pysqlite_Statement* self)
void pysqlite_statement_dealloc(pysqlite_Statement* self) void pysqlite_statement_dealloc(pysqlite_Statement* self)
{ {
PyTypeObject *tp = Py_TYPE(self);
if (self->st) { if (self->st) {
Py_BEGIN_ALLOW_THREADS Py_BEGIN_ALLOW_THREADS
sqlite3_finalize(self->st); sqlite3_finalize(self->st);
@ -385,7 +387,8 @@ void pysqlite_statement_dealloc(pysqlite_Statement* self)
PyObject_ClearWeakRefs((PyObject*)self); PyObject_ClearWeakRefs((PyObject*)self);
} }
Py_TYPE(self)->tp_free((PyObject*)self); tp->tp_free(self);
Py_DECREF(tp);
} }
/* /*
@ -458,50 +461,30 @@ static int pysqlite_check_remaining_sql(const char* tail)
return 0; return 0;
} }
PyTypeObject pysqlite_StatementType = { static PyMemberDef stmt_members[] = {
PyVarObject_HEAD_INIT(NULL, 0) {"__weaklistoffset__", T_PYSSIZET, offsetof(pysqlite_Statement, in_weakreflist), READONLY},
MODULE_NAME ".Statement", /* tp_name */ {NULL},
sizeof(pysqlite_Statement), /* tp_basicsize */ };
0, /* tp_itemsize */ static PyType_Slot stmt_slots[] = {
(destructor)pysqlite_statement_dealloc, /* tp_dealloc */ {Py_tp_members, stmt_members},
0, /* tp_vectorcall_offset */ {Py_tp_dealloc, pysqlite_statement_dealloc},
0, /* tp_getattr */ {Py_tp_new, PyType_GenericNew},
0, /* tp_setattr */ {0, NULL},
0, /* tp_as_async */
0, /* tp_repr */
0, /* tp_as_number */
0, /* tp_as_sequence */
0, /* tp_as_mapping */
0, /* tp_hash */
0, /* tp_call */
0, /* tp_str */
0, /* tp_getattro */
0, /* tp_setattro */
0, /* tp_as_buffer */
Py_TPFLAGS_DEFAULT, /* tp_flags */
0, /* tp_doc */
0, /* tp_traverse */
0, /* tp_clear */
0, /* tp_richcompare */
offsetof(pysqlite_Statement, in_weakreflist), /* tp_weaklistoffset */
0, /* tp_iter */
0, /* tp_iternext */
0, /* tp_methods */
0, /* tp_members */
0, /* tp_getset */
0, /* tp_base */
0, /* tp_dict */
0, /* tp_descr_get */
0, /* tp_descr_set */
0, /* tp_dictoffset */
(initproc)0, /* tp_init */
0, /* tp_alloc */
0, /* tp_new */
0 /* tp_free */
}; };
extern int pysqlite_statement_setup_types(void) static PyType_Spec stmt_spec = {
.name = MODULE_NAME ".Statement",
.basicsize = sizeof(pysqlite_Statement),
.flags = Py_TPFLAGS_DEFAULT,
.slots = stmt_slots,
};
PyTypeObject *pysqlite_StatementType = NULL;
extern int pysqlite_statement_setup_types(PyObject *module)
{ {
pysqlite_StatementType.tp_new = PyType_GenericNew; pysqlite_StatementType = (PyTypeObject *)PyType_FromModuleAndSpec(module, &stmt_spec, NULL);
return PyType_Ready(&pysqlite_StatementType); if (pysqlite_StatementType == NULL) {
return -1;
}
return 0;
} }

4
Modules/_sqlite/statement.h
View File

@ -43,7 +43,7 @@ typedef struct
PyObject* in_weakreflist; /* List of weak references */ PyObject* in_weakreflist; /* List of weak references */
} pysqlite_Statement; } pysqlite_Statement;
extern PyTypeObject pysqlite_StatementType; extern PyTypeObject *pysqlite_StatementType;
int pysqlite_statement_create(pysqlite_Statement* self, pysqlite_Connection* connection, PyObject* sql); int pysqlite_statement_create(pysqlite_Statement* self, pysqlite_Connection* connection, PyObject* sql);
void pysqlite_statement_dealloc(pysqlite_Statement* self); void pysqlite_statement_dealloc(pysqlite_Statement* self);
@ -55,6 +55,6 @@ int pysqlite_statement_finalize(pysqlite_Statement* self);
int pysqlite_statement_reset(pysqlite_Statement* self); int pysqlite_statement_reset(pysqlite_Statement* self);
void pysqlite_statement_mark_dirty(pysqlite_Statement* self); void pysqlite_statement_mark_dirty(pysqlite_Statement* self);
int pysqlite_statement_setup_types(void); int pysqlite_statement_setup_types(PyObject *module);
#endif #endif