Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

bpo-44079: Strip superfluous statement cache from sqlite3.Connection #25998

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
pablogsal merged 11 commits into from
Aug 18, 2021
Merged

bpo-44079: Strip superfluous statement cache from sqlite3.Connection #25998

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
ed9679d
bpo-44079: Strip superfluous statement cache from sqlite3.Connection
May 8, 2021
8c888dc
Statement instances are no longer weakly referencable
May 8, 2021
f443441
Merge branch 'main' into sqlite-remove-superfluous-stmt-cache
Jun 24, 2021
1f8d176
Adjust comment
Jun 24, 2021
78aa94e
Fix comment
Jul 6, 2021
8118450
Merge branch 'main' into sqlite-remove-superfluous-stmt-cache
Jul 29, 2021
d165369
Merge branch 'main' into sqlite-remove-superfluous-stmt-cache
Aug 8, 2021
8322fe2
Merge branch 'main' into sqlite-remove-superfluous-stmt-cache
Aug 13, 2021
5da438d
Remove obsolete members from connection object
Aug 13, 2021
d63d888
Remove now obsolete pysqlite_statement_finalize()
Aug 13, 2021
4596490
Also remove pysqlite_statement_finalize() declaration
Aug 14, 2021
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
102 changes: 17 additions & 85 deletions 102 Modules/_sqlite/connection.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,6 @@
#include "prepare_protocol.h"
#include "util.h"

#define ACTION_FINALIZE 1
#define ACTION_RESET 2

#if SQLITE_VERSION_NUMBER >= 3014000
#define HAVE_TRACE_V2
#endif
Expand Down Expand Up @@ -114,7 +111,6 @@ pysqlite_connection_init_impl(pysqlite_Connection *self,
self->begin_statement = NULL;

Py_CLEAR(self->statement_cache);
Py_CLEAR(self->statements);
Py_CLEAR(self->cursors);

Py_INCREF(Py_None);
Expand Down Expand Up @@ -159,13 +155,11 @@ pysqlite_connection_init_impl(pysqlite_Connection *self,
return -1;
}

self->created_statements = 0;
self->created_cursors = 0;

/* Create lists of weak references to statements/cursors */
self->statements = PyList_New(0);
/* Create list of weak references to cursors */
self->cursors = PyList_New(0);
if (!self->statements || !self->cursors) {
if (self->cursors == NULL) {
return -1;
}

Expand Down Expand Up @@ -198,37 +192,24 @@ pysqlite_connection_init_impl(pysqlite_Connection *self,
return 0;
}

/* action in (ACTION_RESET, ACTION_FINALIZE) */
static void
pysqlite_do_all_statements(pysqlite_Connection *self, int action,
int reset_cursors)
pysqlite_do_all_statements(pysqlite_Connection *self)
{
int i;
PyObject* weakref;
PyObject* statement;
pysqlite_Cursor* cursor;

for (i = 0; i < PyList_Size(self->statements); i++) {
weakref = PyList_GetItem(self->statements, i);
statement = PyWeakref_GetObject(weakref);
if (statement != Py_None) {
Py_INCREF(statement);
if (action == ACTION_RESET) {
(void)pysqlite_statement_reset((pysqlite_Statement*)statement);
} else {
(void)pysqlite_statement_finalize((pysqlite_Statement*)statement);
}
Py_DECREF(statement);
// Reset all statements
sqlite3_stmt *stmt = NULL;
while ((stmt = sqlite3_next_stmt(self->db, stmt))) {
if (sqlite3_stmt_busy(stmt)) {
(void)sqlite3_reset(stmt);
}
}

if (reset_cursors) {
for (i = 0; i < PyList_Size(self->cursors); i++) {
weakref = PyList_GetItem(self->cursors, i);
cursor = (pysqlite_Cursor*)PyWeakref_GetObject(weakref);
if ((PyObject*)cursor != Py_None) {
cursor->reset = 1;
}
// Reset all cursors
for (int i = 0; i < PyList_Size(self->cursors); i++) {
PyObject *weakref = PyList_GetItem(self->cursors, i);
PyObject *object = PyWeakref_GetObject(weakref);
if (object != Py_None) {
pysqlite_Cursor *cursor = (pysqlite_Cursor *)object;
cursor->reset = 1;
}
}
}
Expand All @@ -239,7 +220,6 @@ connection_traverse(pysqlite_Connection *self, visitproc visit, void *arg)
Py_VISIT(Py_TYPE(self));
Py_VISIT(self->isolation_level);
Py_VISIT(self->statement_cache);
Py_VISIT(self->statements);
Py_VISIT(self->cursors);
Py_VISIT(self->row_factory);
Py_VISIT(self->text_factory);
Expand All @@ -254,7 +234,6 @@ connection_clear(pysqlite_Connection *self)
{
Py_CLEAR(self->isolation_level);
Py_CLEAR(self->statement_cache);
Py_CLEAR(self->statements);
Py_CLEAR(self->cursors);
Py_CLEAR(self->row_factory);
Py_CLEAR(self->text_factory);
Expand Down Expand Up @@ -378,7 +357,7 @@ pysqlite_connection_close_impl(pysqlite_Connection *self)
return NULL;
}

pysqlite_do_all_statements(self, ACTION_FINALIZE, 1);
Py_CLEAR(self->statement_cache);
connection_close(self);

Py_RETURN_NONE;
Expand Down Expand Up @@ -474,7 +453,7 @@ pysqlite_connection_rollback_impl(pysqlite_Connection *self)
}

if (!sqlite3_get_autocommit(self->db)) {
pysqlite_do_all_statements(self, ACTION_RESET, 1);
pysqlite_do_all_statements(self);

Py_BEGIN_ALLOW_THREADS
rc = sqlite3_prepare_v2(self->db, "ROLLBACK", 9, &statement, NULL);
Expand Down Expand Up @@ -774,37 +753,6 @@ _pysqlite_final_callback(sqlite3_context *context)
PyGILState_Release(threadstate);
}

static void _pysqlite_drop_unused_statement_references(pysqlite_Connection* self)
{
PyObject* new_list;
PyObject* weakref;
int i;

/* we only need to do this once in a while */
if (self->created_statements++ < 200) {
return;
}

self->created_statements = 0;

new_list = PyList_New(0);
if (!new_list) {
return;
}

for (i = 0; i < PyList_Size(self->statements); i++) {
weakref = PyList_GetItem(self->statements, i);
if (PyWeakref_GetObject(weakref) != Py_None) {
if (PyList_Append(new_list, weakref) != 0) {
Py_DECREF(new_list);
return;
}
}
}

Py_SETREF(self->statements, new_list);
}

static void _pysqlite_drop_unused_cursor_references(pysqlite_Connection* self)
{
PyObject* new_list;
Expand Down Expand Up @@ -1358,7 +1306,6 @@ pysqlite_connection_call(pysqlite_Connection *self, PyObject *args,
{
PyObject* sql;
pysqlite_Statement* statement;
PyObject* weakref;

if (!pysqlite_check_thread(self) || !pysqlite_check_connection(self)) {
return NULL;
Expand All @@ -1370,27 +1317,12 @@ pysqlite_connection_call(pysqlite_Connection *self, PyObject *args,
if (!PyArg_ParseTuple(args, "U", &sql))
return NULL;

_pysqlite_drop_unused_statement_references(self);

statement = pysqlite_statement_create(self, sql);
if (statement == NULL) {
return NULL;
}

weakref = PyWeakref_NewRef((PyObject*)statement, NULL);
if (weakref == NULL)
goto error;
if (PyList_Append(self->statements, weakref) != 0) {
Py_DECREF(weakref);
goto error;
}
Py_DECREF(weakref);

return (PyObject*)statement;

error:
Py_DECREF(statement);
return NULL;
}

/*[clinic input]
Expand Down
4 changes: 1 addition & 3 deletions 4 Modules/_sqlite/connection.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,12 +60,10 @@ typedef struct
PyObject *statement_cache;

/* Lists of weak references to statements and cursors used within this connection */
PyObject* statements;
PyObject* cursors;

/* Counters for how many statements/cursors were created in the connection. May be
/* Counters for how many cursors were created in the connection. May be
* reset to 0 at certain intervals */
int created_statements;
int created_cursors;

PyObject* row_factory;
Expand Down
26 changes: 0 additions & 26 deletions 26 Modules/_sqlite/statement.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,6 @@ pysqlite_statement_create(pysqlite_Connection *connection, PyObject *sql)
self->st = stmt;
self->in_use = 0;
self->is_dml = is_dml;
self->in_weakreflist = NULL;

PyObject_GC_Track(self);
return self;
Expand Down Expand Up @@ -361,23 +360,6 @@ pysqlite_statement_bind_parameters(pysqlite_state *state,
}
}

int pysqlite_statement_finalize(pysqlite_Statement* self)
{
int rc;

rc = SQLITE_OK;
if (self->st) {
Py_BEGIN_ALLOW_THREADS
rc = sqlite3_finalize(self->st);
Py_END_ALLOW_THREADS
self->st = NULL;
}

self->in_use = 0;

return rc;
}

int pysqlite_statement_reset(pysqlite_Statement* self)
{
int rc;
Expand Down Expand Up @@ -407,9 +389,6 @@ stmt_dealloc(pysqlite_Statement *self)
{
PyTypeObject *tp = Py_TYPE(self);
PyObject_GC_UnTrack(self);
if (self->in_weakreflist != NULL) {
PyObject_ClearWeakRefs((PyObject*)self);
}
if (self->st) {
Py_BEGIN_ALLOW_THREADS
sqlite3_finalize(self->st);
Expand Down Expand Up @@ -497,12 +476,7 @@ static int pysqlite_check_remaining_sql(const char* tail)
return 0;
}

static PyMemberDef stmt_members[] = {
{"__weaklistoffset__", T_PYSSIZET, offsetof(pysqlite_Statement, in_weakreflist), READONLY},
{NULL},
};
static PyType_Slot stmt_slots[] = {
{Py_tp_members, stmt_members},
{Py_tp_dealloc, stmt_dealloc},
{Py_tp_traverse, stmt_traverse},
{0, NULL},
Expand Down
2 changes: 0 additions & 2 deletions 2 Modules/_sqlite/statement.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ typedef struct
sqlite3_stmt* st;
int in_use;
int is_dml;
PyObject* in_weakreflist; /* List of weak references */
} pysqlite_Statement;

pysqlite_Statement *pysqlite_statement_create(pysqlite_Connection *connection, PyObject *sql);
Expand All @@ -45,7 +44,6 @@ void pysqlite_statement_bind_parameters(pysqlite_state *state,
pysqlite_Statement *self,
PyObject *parameters);

int pysqlite_statement_finalize(pysqlite_Statement* self);
int pysqlite_statement_reset(pysqlite_Statement* self);
void pysqlite_statement_mark_dirty(pysqlite_Statement* self);

Expand Down
Morty Proxy This is a proxified and sanitized view of the page, visit original site.