[Python-checkins] gh-92206: Improve scoping of sqlite3 reset statement helper (#92241)
JelleZijlstra
webhook-mailer at python.org
Tue May 3 13:48:37 EDT 2022
https://github.com/python/cpython/commit/415944379f9dae46e391315c9ccb17e45f9917da
commit: 415944379f9dae46e391315c9ccb17e45f9917da
branch: main
author: Erlend Egeberg Aasland <erlend.aasland at protonmail.com>
committer: JelleZijlstra <jelle.zijlstra at gmail.com>
date: 2022-05-03T11:48:24-06:00
summary:
gh-92206: Improve scoping of sqlite3 reset statement helper (#92241)
files:
M Modules/_sqlite/cursor.c
M Modules/_sqlite/statement.c
M Modules/_sqlite/statement.h
diff --git a/Modules/_sqlite/cursor.c b/Modules/_sqlite/cursor.c
index 84f481792ddd3..0e903ade5bdfb 100644
--- a/Modules/_sqlite/cursor.c
+++ b/Modules/_sqlite/cursor.c
@@ -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)
{
@@ -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);
}
@@ -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 */
@@ -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);
@@ -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.
@@ -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;
}
@@ -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);
}
@@ -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;
}
@@ -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,
@@ -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);
}
diff --git a/Modules/_sqlite/statement.c b/Modules/_sqlite/statement.c
index baa1b71a8daa4..2f2f4b2d85089 100644
--- a/Modules/_sqlite/statement.c
+++ b/Modules/_sqlite/statement.c
@@ -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;
diff --git a/Modules/_sqlite/statement.h b/Modules/_sqlite/statement.h
index b901c43c479ae..5b55e2fbcb8f9 100644
--- a/Modules/_sqlite/statement.h
+++ b/Modules/_sqlite/statement.h
@@ -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);
More information about the Python-checkins
mailing list