psycopg/psycopg2
1
1
Fork 0
mirror of https://github.com/psycopg/psycopg2.git synced 2025-02-16 17:10:32 +03:00
Code Issues Packages Projects Releases Wiki Activity

Assign the PGresult to the cursor in the execute critical section

Browse Source 
Possible cause of the issue reported in #346 (in concurrent
environments).
This commit is contained in:
Daniele Varrazzo 2019-01-22 11:02:09 +00:00
parent 32d1e0966d
commit 44999f9c63
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
psycopg/pqpath.c
View File

@ -971,16 +971,16 @@ _pq_execute_sync(cursorObject *curs, const char *query, int no_result, int no_be
Dprintf("pq_execute: executing SYNC query: pgconn = %p", curs->conn->pgconn); Dprintf("pq_execute: executing SYNC query: pgconn = %p", curs->conn->pgconn);
Dprintf(" %-.200s", query); Dprintf(" %-.200s", query);
if (!psyco_green()) { if (!psyco_green()) {
curs->pgres = PQexec(curs->conn->pgconn, query); pgres = PQexec(curs->conn->pgconn, query);
} }
else { else {
Py_BLOCK_THREADS; Py_BLOCK_THREADS;
curs->pgres = psyco_exec_green(curs->conn, query); pgres = psyco_exec_green(curs->conn, query);
Py_UNBLOCK_THREADS; Py_UNBLOCK_THREADS;
} }
/* don't let pgres = NULL go to pq_fetch() */ /* don't let pgres = NULL go to pq_fetch() */
if (curs->pgres == NULL) { if (pgres == NULL) {
if (CONNECTION_BAD == PQstatus(curs->conn->pgconn)) { if (CONNECTION_BAD == PQstatus(curs->conn->pgconn)) {
curs->conn->closed = 2; curs->conn->closed = 2;
} }
@ -993,11 +993,16 @@ _pq_execute_sync(cursorObject *curs, const char *query, int no_result, int no_be
return -1; return -1;
} }
Py_BLOCK_THREADS;
/* assign the result back to the cursor now that we have the GIL */
curs->pgres = pgres;
pgres = NULL;
/* Process notifies here instead of when fetching the tuple as we are /* Process notifies here instead of when fetching the tuple as we are
* into the same critical section that received the data. Without this * into the same critical section that received the data. Without this
* care, reading notifies may disrupt other thread communications. * care, reading notifies may disrupt other thread communications.
* (as in ticket #55). */ * (as in ticket #55). */
Py_BLOCK_THREADS;
conn_notifies_process(curs->conn); conn_notifies_process(curs->conn);
conn_notice_process(curs->conn); conn_notice_process(curs->conn);
Py_UNBLOCK_THREADS; Py_UNBLOCK_THREADS;