Skip to content
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

Jump to bottom

gh-89121: Keep the number of pending SQLite statements to a minimum #30379

Merged
merged 8 commits into from
Jun 23, 2022
Merged

gh-89121: Keep the number of pending SQLite statements to a minimum #30379

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
de2299c
bpo-44958: Always reset SQLite statements when we're done with them
Sep 23, 2021
04c6739
Merge branch 'main' into sqlite-reset
Jan 22, 2022
1bbfff0
Merge branch 'main' into sqlite-reset
Feb 27, 2022
6d46307
Sync with main
erlend-aasland May 3, 2022
7d8cbe2
Merge branch 'main' into sqlite-reset
erlend-aasland Jun 20, 2022
317607b
Fix merge
erlend-aasland Jun 20, 2022
12bb96e
Reset in iternext on error path
erlend-aasland Jun 20, 2022
89727fe
Merge branch 'main' into sqlite-reset
erlend-aasland Jun 21, 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
34 changes: 12 additions & 22 deletions Modules/_sqlite/cursor.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -830,16 +830,12 @@ _pysqlite_query_execute(pysqlite_Cursor* self, int multiple, PyObject* operation
}
}

if (self->statement != NULL) {
/* There is an active statement */
stmt_reset(self->statement);
}

/* reset description */
Py_INCREF(Py_None);
Py_SETREF(self->description, Py_None);

if (self->statement) {
// Reset pending statements on this cursor.
(void)stmt_reset(self->statement);
}

Expand Down Expand Up @@ -879,6 +875,7 @@ _pysqlite_query_execute(pysqlite_Cursor* self, int multiple, PyObject* operation
}
}

assert(!sqlite3_stmt_busy(self->statement->st));
while (1) {
parameters = PyIter_Next(parameters_iter);
if (!parameters) {
Expand All @@ -902,7 +899,6 @@ _pysqlite_query_execute(pysqlite_Cursor* self, int multiple, PyObject* operation
PyErr_Clear();
}
}
(void)stmt_reset(self->statement);
_pysqlite_seterror(state, self->connection->db);
goto error;
}
Expand Down Expand Up @@ -944,16 +940,8 @@ _pysqlite_query_execute(pysqlite_Cursor* self, int multiple, PyObject* operation
}
}

if (rc == SQLITE_DONE && !multiple) {
if (rc == SQLITE_DONE) {
if (self->statement->is_dml) {
self->rowcount = (long)sqlite3_changes(self->connection->db);
}
stmt_reset(self->statement);
Py_CLEAR(self->statement);
}

if (multiple) {
if (self->statement->is_dml && rc == SQLITE_DONE) {
self->rowcount += (long)sqlite3_changes(self->connection->db);
}
stmt_reset(self->statement);
Expand All @@ -980,11 +968,17 @@ _pysqlite_query_execute(pysqlite_Cursor* self, int multiple, PyObject* operation
self->locked = 0;

if (PyErr_Occurred()) {
if (self->statement) {
(void)stmt_reset(self->statement);
Py_CLEAR(self->statement);
}
self->rowcount = -1L;
return NULL;
} else {
return Py_NewRef((PyObject *)self);
}
if (self->statement && !sqlite3_stmt_busy(self->statement->st)) {
Py_CLEAR(self->statement);
}
return Py_NewRef((PyObject *)self);
}

/*[clinic input]
Expand Down Expand Up @@ -1111,11 +1105,7 @@ pysqlite_cursor_iternext(pysqlite_Cursor *self)

sqlite3_stmt *stmt = self->statement->st;
assert(stmt != NULL);
if (sqlite3_data_count(stmt) == 0) {
(void)stmt_reset(self->statement);
Py_CLEAR(self->statement);
return NULL;
}
assert(sqlite3_data_count(stmt) != 0);

self->locked = 1; // GH-80254: Prevent recursive use of cursors.
PyObject *row = _pysqlite_fetch_one_row(self);
Expand Down