Skip to content

gh-92206: Improve scoping of sqlite3 reset statement helper #92241

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
merged 2 commits into from
May 3, 2022
Merged

gh-92206: Improve scoping of sqlite3 reset statement helper #92241

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e93c485
gh-92206: Improve scoping of sqlite3 reset statement helper
erlend-aasland May 3, 2022
317a2b1
🤦🏻
erlend-aasland May 3, 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
38 changes: 28 additions & 10 deletions Modules/_sqlite/cursor.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,24 @@ pysqlite_cursor_init_impl(pysqlite_Cursor *self,
return 0;
}

static inline int
stmt_reset(pysqlite_Statement *self)
{
int rc = SQLITE_OK;

if (self->in_use && self->st) {
Py_BEGIN_ALLOW_THREADS
rc = sqlite3_reset(self->st);
Py_END_ALLOW_THREADS

if (rc == SQLITE_OK) {
self->in_use = 0;
}
}

return rc;
}

static int
cursor_traverse(pysqlite_Cursor *self, visitproc visit, void *arg)
{
Expand All @@ -124,7 +142,7 @@ cursor_clear(pysqlite_Cursor *self)
Py_CLEAR(self->row_factory);
if (self->statement) {
/* Reset the statement if the user has not closed the cursor */
pysqlite_statement_reset(self->statement);
stmt_reset(self->statement);
Py_CLEAR(self->statement);
}

Expand Down Expand Up @@ -544,7 +562,7 @@ _pysqlite_query_execute(pysqlite_Cursor* self, int multiple, PyObject* operation

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

/* reset description and rowcount */
Expand All @@ -553,7 +571,7 @@ _pysqlite_query_execute(pysqlite_Cursor* self, int multiple, PyObject* operation
self->rowcount = 0L;

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

PyObject *stmt = get_statement_from_cache(self, operation);
Expand All @@ -577,7 +595,7 @@ _pysqlite_query_execute(pysqlite_Cursor* self, int multiple, PyObject* operation
}
}

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

/* We start a transaction implicitly before a DML statement.
Expand Down Expand Up @@ -614,7 +632,7 @@ _pysqlite_query_execute(pysqlite_Cursor* self, int multiple, PyObject* operation
PyErr_Clear();
}
}
(void)pysqlite_statement_reset(self->statement);
(void)stmt_reset(self->statement);
_pysqlite_seterror(state, self->connection->db);
goto error;
}
Expand Down Expand Up @@ -663,12 +681,12 @@ _pysqlite_query_execute(pysqlite_Cursor* self, int multiple, PyObject* operation
}

if (rc == SQLITE_DONE && !multiple) {
pysqlite_statement_reset(self->statement);
stmt_reset(self->statement);
Py_CLEAR(self->statement);
}

if (multiple) {
pysqlite_statement_reset(self->statement);
stmt_reset(self->statement);
}
Py_XDECREF(parameters);
}
Expand Down Expand Up @@ -824,7 +842,7 @@ pysqlite_cursor_iternext(pysqlite_Cursor *self)
sqlite3_stmt *stmt = self->statement->st;
assert(stmt != NULL);
if (sqlite3_data_count(stmt) == 0) {
(void)pysqlite_statement_reset(self->statement);
(void)stmt_reset(self->statement);
Py_CLEAR(self->statement);
return NULL;
}
Expand All @@ -835,7 +853,7 @@ pysqlite_cursor_iternext(pysqlite_Cursor *self)
}
int rc = stmt_step(stmt);
if (rc == SQLITE_DONE) {
(void)pysqlite_statement_reset(self->statement);
(void)stmt_reset(self->statement);
}
else if (rc != SQLITE_ROW) {
(void)_pysqlite_seterror(self->connection->state,
Expand Down Expand Up @@ -1005,7 +1023,7 @@ pysqlite_cursor_close_impl(pysqlite_Cursor *self)
}

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

Expand Down
19 changes: 0 additions & 19 deletions Modules/_sqlite/statement.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -366,25 +366,6 @@ pysqlite_statement_bind_parameters(pysqlite_state *state,
}
}

int pysqlite_statement_reset(pysqlite_Statement* self)
{
int rc;

rc = SQLITE_OK;

if (self->in_use && self->st) {
Py_BEGIN_ALLOW_THREADS
rc = sqlite3_reset(self->st);
Py_END_ALLOW_THREADS

if (rc == SQLITE_OK) {
self->in_use = 0;
}
}

return rc;
}

void pysqlite_statement_mark_dirty(pysqlite_Statement* self)
{
self->in_use = 1;
Expand Down
1 change: 0 additions & 1 deletion Modules/_sqlite/statement.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ void pysqlite_statement_bind_parameters(pysqlite_state *state,
pysqlite_Statement *self,
PyObject *parameters);

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

int pysqlite_statement_setup_types(PyObject *module);
Expand Down