pythongh-88239: Use sqlite3_stmt_busy() to determine if statements are in use (python#25984)

erlend-aasland · web-flow · commit f5c85aa3eea1 · 2022-06-27T09:58:56.000+02:00
diff --git a/Modules/_sqlite/cursor.c b/Modules/_sqlite/cursor.c
@@ -130,14 +130,10 @@ stmt_reset(pysqlite_Statement *self)
 {
     int rc = SQLITE_OK;
 
-    if (self->in_use && self->st) {
+    if (self->st != NULL) {
         Py_BEGIN_ALLOW_THREADS
         rc = sqlite3_reset(self->st);
         Py_END_ALLOW_THREADS
-
-        if (rc == SQLITE_OK) {
-            self->in_use = 0;
-        }
     }
 
     return rc;
@@ -770,12 +766,6 @@ bind_parameters(pysqlite_state *state, pysqlite_Statement *self,
     }
 }
 
-static inline void
-stmt_mark_dirty(pysqlite_Statement *self)
-{
-    self->in_use = 1;
-}
-
 PyObject *
 _pysqlite_query_execute(pysqlite_Cursor* self, int multiple, PyObject* operation, PyObject* second_argument)
 {
@@ -852,16 +842,15 @@ _pysqlite_query_execute(pysqlite_Cursor* self, int multiple, PyObject* operation
         goto error;
     }
 
-    if (self->statement->in_use) {
+    if (sqlite3_stmt_busy(self->statement->st)) {
         Py_SETREF(self->statement,
                   pysqlite_statement_create(self->connection, operation));
         if (self->statement == NULL) {
             goto error;
         }
     }
 
-    stmt_reset(self->statement);
-    stmt_mark_dirty(self->statement);
+    (void)stmt_reset(self->statement);
     self->rowcount = self->statement->is_dml ? 0L : -1L;
 
     /* We start a transaction implicitly before a DML statement.
@@ -882,8 +871,6 @@ _pysqlite_query_execute(pysqlite_Cursor* self, int multiple, PyObject* operation
             break;
         }
 
-        stmt_mark_dirty(self->statement);
-
         bind_parameters(state, self->statement, parameters);
         if (PyErr_Occurred()) {
             goto error;
diff --git a/Modules/_sqlite/statement.c b/Modules/_sqlite/statement.c
@@ -88,7 +88,6 @@ pysqlite_statement_create(pysqlite_Connection *connection, PyObject *sql)
     }
 
     self->st = stmt;
-    self->in_use = 0;
     self->is_dml = is_dml;
 
     PyObject_GC_Track(self);
diff --git a/Modules/_sqlite/statement.h b/Modules/_sqlite/statement.h
@@ -33,7 +33,6 @@ typedef struct
 {
     PyObject_HEAD
     sqlite3_stmt* st;
-    int in_use;
     int is_dml;
 } pysqlite_Statement;
 

Original file line number	Diff line number	Diff line change
`@@ -130,14 +130,10 @@ stmt_reset(pysqlite_Statement *self)`
`130`	`130`	`{`
`131`	`131`	`int rc = SQLITE_OK;`
`132`	`132`
`133`		`- if (self->in_use && self->st) {`
	`133`	`+ if (self->st != NULL) {`
`134`	`134`	`Py_BEGIN_ALLOW_THREADS`
`135`	`135`	`rc = sqlite3_reset(self->st);`
`136`	`136`	`Py_END_ALLOW_THREADS`
`137`		`-`
`138`		`- if (rc == SQLITE_OK) {`
`139`		`- self->in_use = 0;`
`140`		`- }`
`141`	`137`	`}`
`142`	`138`
`143`	`139`	`return rc;`
`@@ -770,12 +766,6 @@ bind_parameters(pysqlite_state state, pysqlite_Statement self,`
`770`	`766`	`}`
`771`	`767`	`}`
`772`	`768`
`773`		`-static inline void`
`774`		`-stmt_mark_dirty(pysqlite_Statement *self)`
`775`		`-{`
`776`		`- self->in_use = 1;`
`777`		`-}`
`778`		`-`
`779`	`769`	`PyObject *`
`780`	`770`	`_pysqlite_query_execute(pysqlite_Cursor* self, int multiple, PyObject* operation, PyObject* second_argument)`
`781`	`771`	`{`
`@@ -852,16 +842,15 @@ _pysqlite_query_execute(pysqlite_Cursor* self, int multiple, PyObject* operation`
`852`	`842`	`goto error;`
`853`	`843`	`}`
`854`	`844`
`855`		`- if (self->statement->in_use) {`
	`845`	`+ if (sqlite3_stmt_busy(self->statement->st)) {`
`856`	`846`	`Py_SETREF(self->statement,`
`857`	`847`	`pysqlite_statement_create(self->connection, operation));`
`858`	`848`	`if (self->statement == NULL) {`
`859`	`849`	`goto error;`
`860`	`850`	`}`
`861`	`851`	`}`
`862`	`852`
`863`		`- stmt_reset(self->statement);`
`864`		`- stmt_mark_dirty(self->statement);`
	`853`	`+ (void)stmt_reset(self->statement);`
`865`	`854`	`self->rowcount = self->statement->is_dml ? 0L : -1L;`
`866`	`855`
`867`	`856`	`/* We start a transaction implicitly before a DML statement.`
`@@ -882,8 +871,6 @@ _pysqlite_query_execute(pysqlite_Cursor* self, int multiple, PyObject* operation`
`882`	`871`	`break;`
`883`	`872`	`}`
`884`	`873`
`885`		`- stmt_mark_dirty(self->statement);`
`886`		`-`
`887`	`874`	`bind_parameters(state, self->statement, parameters);`
`888`	`875`	`if (PyErr_Occurred()) {`
`889`	`876`	`goto error;`
Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,6 @@ pysqlite_statement_create(pysqlite_Connection connection, PyObject sql)`
`88`	`88`	`}`
`89`	`89`
`90`	`90`	`self->st = stmt;`
`91`		`- self->in_use = 0;`
`92`	`91`	`self->is_dml = is_dml;`
`93`	`92`
`94`	`93`	`PyObject_GC_Track(self);`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,6 @@ typedef struct`
`33`	`33`	`{`
`34`	`34`	`PyObject_HEAD`
`35`	`35`	`sqlite3_stmt* st;`
`36`		`- int in_use;`
`37`	`36`	`int is_dml;`
`38`	`37`	`} pysqlite_Statement;`
`39`	`38`