mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-22 22:53:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

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

Browse source 
Make sure statements that have run to completion or errored are
reset and cleared off the cursor for all paths in execute() and
executemany().
This commit is contained in:
Erlend Egeberg Aasland 2022-06-23 12:14:05 +02:00 • committed by GitHub
parent 11e865c74b
commit 89285314bd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

34
Modules/_sqlite/cursor.c
View file

@ -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 */ /* reset description */
Py_INCREF(Py_None); Py_INCREF(Py_None);
Py_SETREF(self->description, Py_None); Py_SETREF(self->description, Py_None);
if (self->statement) { if (self->statement) {
// Reset pending statements on this cursor.
(void)stmt_reset(self->statement); (void)stmt_reset(self->statement);
} }
@ -879,6 +875,7 @@ _pysqlite_query_execute(pysqlite_Cursor* self, int multiple, PyObject* operation
} }
} }
assert(!sqlite3_stmt_busy(self->statement->st));
while (1) { while (1) {
parameters = PyIter_Next(parameters_iter); parameters = PyIter_Next(parameters_iter);
if (!parameters) { if (!parameters) {
@ -902,7 +899,6 @@ _pysqlite_query_execute(pysqlite_Cursor* self, int multiple, PyObject* operation
PyErr_Clear(); PyErr_Clear();
} }
} }
(void)stmt_reset(self->statement);
_pysqlite_seterror(state, self->connection->db); _pysqlite_seterror(state, self->connection->db);
goto error; goto error;
} }
@ -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) { 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); self->rowcount += (long)sqlite3_changes(self->connection->db);
} }
stmt_reset(self->statement); stmt_reset(self->statement);
@ -980,11 +968,17 @@ error:
self->locked = 0; self->locked = 0;
if (PyErr_Occurred()) { if (PyErr_Occurred()) {
if (self->statement) {
(void)stmt_reset(self->statement);
Py_CLEAR(self->statement);
}
self->rowcount = -1L; self->rowcount = -1L;
return NULL; 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] /*[clinic input]
@ -1111,11 +1105,7 @@ pysqlite_cursor_iternext(pysqlite_Cursor *self)
sqlite3_stmt *stmt = self->statement->st; sqlite3_stmt *stmt = self->statement->st;
assert(stmt != NULL); assert(stmt != NULL);
if (sqlite3_data_count(stmt) == 0) { assert(sqlite3_data_count(stmt) != 0);
(void)stmt_reset(self->statement);
Py_CLEAR(self->statement);
return NULL;
}
self->locked = 1; // GH-80254: Prevent recursive use of cursors. self->locked = 1; // GH-80254: Prevent recursive use of cursors.
PyObject *row = _pysqlite_fetch_one_row(self); PyObject *row = _pysqlite_fetch_one_row(self);