Skip to content

bpo-44958: Only reset sqlite3 statements when needed #27844

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 16 commits into from
Sep 21, 2021
Merged

bpo-44958: Only reset sqlite3 statements when needed #27844

Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
99adc05
bpo-44958: Only reset sqlite3 statements when needed
Aug 19, 2021
2f8cb23
We don't use the return value of pysqlite_statement_reset
Aug 20, 2021
e6e4973
If possible, avoid resetting unused statements
Aug 20, 2021
df769c3
SQLITE_STMTSTATUS_RUN is available from 3.20.0 and onwards
Aug 20, 2021
cbcd640
Use sqlite3_stmt pointer iso. deref'ing self when calling sqlite3_reset
Aug 20, 2021
fe0fd6f
Merge branch 'main' into sqlite-optimise-resets
Aug 22, 2021
0633095
Sync with 'main' bco. GH-27884
Aug 25, 2021
06e242c
pysqlite_statement_reset result() is never used => return void
Aug 25, 2021
747000c
Sync with `main` bco. GH-27942
Aug 25, 2021
4ad7e99
Make sure we reset statements both at cursor dealloc and when the
Sep 6, 2021
1bbb31f
Harden test_type_map_usage()
Sep 6, 2021
73e1ddb
Add regression tests for stmt exit from cursor
Sep 6, 2021
9684593
Merge branch 'main' into sqlite-optimise-resets
Sep 6, 2021
41410e0
Merge branch 'main' into sqlite-optimise-resets
Sep 14, 2021
ebebdb7
Merge branch 'main' into sqlite-optimise-resets
Sep 20, 2021
c84311e
Test that datamodifying select queries are marked readonly
Sep 20, 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
Next Next commit
bpo-44958: Only reset sqlite3 statements when needed
  • Loading branch information
Erlend E. Aasland committed Aug 19, 2021
commit 99adc054bbe35a9f681cf3e39b631d9140028b0a
40 changes: 7 additions & 33 deletions Modules/_sqlite/cursor.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,11 +106,7 @@ cursor_clear(pysqlite_Cursor *self)
Py_CLEAR(self->row_cast_map);
Py_CLEAR(self->lastrowid);
Py_CLEAR(self->row_factory);
if (self->statement) {
/* Reset the statement if the user has not closed the cursor */
pysqlite_statement_reset(self->statement);
Py_CLEAR(self->statement);
}
Py_CLEAR(self->statement);
Py_CLEAR(self->next_row);

return 0;
Expand All @@ -124,6 +120,9 @@ cursor_dealloc(pysqlite_Cursor *self)
if (self->in_weakreflist != NULL) {
PyObject_ClearWeakRefs((PyObject*)self);
}
if (self->statement) {
pysqlite_statement_reset(self->statement);
}
Comment thread
erlend-aasland marked this conversation as resolved.
tp->tp_clear((PyObject *)self);
tp->tp_free(self);
Py_DECREF(tp);
Expand Down Expand Up @@ -528,20 +527,11 @@ _pysqlite_query_execute(pysqlite_Cursor* self, int multiple, PyObject* operation
}
}

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

/* reset description and rowcount */
Py_INCREF(Py_None);
Py_SETREF(self->description, Py_None);
self->rowcount = 0L;

if (self->statement) {
(void)pysqlite_statement_reset(self->statement);
}

PyObject *stmt = get_statement_from_cache(self, operation);
Py_XSETREF(self->statement, (pysqlite_Statement *)stmt);
if (!self->statement) {
Expand All @@ -555,8 +545,6 @@ _pysqlite_query_execute(pysqlite_Cursor* self, int multiple, PyObject* operation
goto error;
}
}

pysqlite_statement_reset(self->statement);
pysqlite_statement_mark_dirty(self->statement);

/* We start a transaction implicitly before a DML statement.
Expand All @@ -577,6 +565,7 @@ _pysqlite_query_execute(pysqlite_Cursor* self, int multiple, PyObject* operation
break;
}

pysqlite_statement_reset(self->statement);
pysqlite_statement_mark_dirty(self->statement);

pysqlite_statement_bind_parameters(state, self->statement, parameters);
Expand All @@ -594,7 +583,6 @@ _pysqlite_query_execute(pysqlite_Cursor* self, int multiple, PyObject* operation
PyErr_Clear();
}
}
(void)pysqlite_statement_reset(self->statement);
_pysqlite_seterror(state, self->connection->db);
goto error;
}
Expand Down Expand Up @@ -664,13 +652,9 @@ _pysqlite_query_execute(pysqlite_Cursor* self, int multiple, PyObject* operation
if (self->next_row == NULL)
goto error;
} else if (rc == SQLITE_DONE && !multiple) {
pysqlite_statement_reset(self->statement);
Py_CLEAR(self->statement);
}

if (multiple) {
pysqlite_statement_reset(self->statement);
}
Py_XDECREF(parameters);
}

Expand Down Expand Up @@ -837,10 +821,7 @@ pysqlite_cursor_iternext(pysqlite_Cursor *self)
}

if (!self->next_row) {
if (self->statement) {
(void)pysqlite_statement_reset(self->statement);
Py_CLEAR(self->statement);
}
Py_CLEAR(self->statement);
return NULL;
}

Expand All @@ -862,12 +843,10 @@ pysqlite_cursor_iternext(pysqlite_Cursor *self)
if (self->statement) {
rc = pysqlite_step(self->statement->st);
if (PyErr_Occurred()) {
(void)pysqlite_statement_reset(self->statement);
Py_DECREF(next_row);
return NULL;
}
if (rc != SQLITE_DONE && rc != SQLITE_ROW) {
(void)pysqlite_statement_reset(self->statement);
Py_DECREF(next_row);
_pysqlite_seterror(self->connection->state, self->connection->db);
return NULL;
Expand All @@ -876,7 +855,6 @@ pysqlite_cursor_iternext(pysqlite_Cursor *self)
if (rc == SQLITE_ROW) {
self->next_row = _pysqlite_fetch_one_row(self);
if (self->next_row == NULL) {
(void)pysqlite_statement_reset(self->statement);
return NULL;
}
}
Expand Down Expand Up @@ -1037,11 +1015,7 @@ pysqlite_cursor_close_impl(pysqlite_Cursor *self, PyTypeObject *cls)
return NULL;
}

if (self->statement) {
(void)pysqlite_statement_reset(self->statement);
Py_CLEAR(self->statement);
}

Py_CLEAR(self->statement);
self->closed = 1;

Py_RETURN_NONE;
Expand Down