diff options
Diffstat (limited to 'psycopg')
| -rw-r--r-- | psycopg/connection.h | 6 | ||||
| -rw-r--r-- | psycopg/connection_int.c | 99 | ||||
| -rw-r--r-- | psycopg/connection_type.c | 4 | ||||
| -rw-r--r-- | psycopg/cursor.h | 1 | ||||
| -rw-r--r-- | psycopg/cursor_int.c | 8 | ||||
| -rw-r--r-- | psycopg/lobject_int.c | 77 | ||||
| -rw-r--r-- | psycopg/pqpath.c | 298 | ||||
| -rw-r--r-- | psycopg/pqpath.h | 24 |
8 files changed, 196 insertions, 321 deletions
diff --git a/psycopg/connection.h b/psycopg/connection.h index b7344d7..bab8bf8 100644 --- a/psycopg/connection.h +++ b/psycopg/connection.h @@ -87,7 +87,7 @@ struct connectionObject { pthread_mutex_t lock; /* the global connection lock */ char *dsn; /* data source name */ - char *critical; /* critical error on this connection */ + char *error; /* temporarily stored error before raising */ char *encoding; /* current backend encoding */ long int closed; /* 1 means connection has been closed; @@ -160,7 +160,7 @@ HIDDEN int conn_get_server_version(PGconn *pgconn); HIDDEN void conn_notice_process(connectionObject *self); HIDDEN void conn_notice_clean(connectionObject *self); HIDDEN void conn_notifies_process(connectionObject *self); -RAISES_NEG HIDDEN int conn_setup(connectionObject *self, PGconn *pgconn); +RAISES_NEG HIDDEN int conn_setup(connectionObject *self); HIDDEN int conn_connect(connectionObject *self, long int async); HIDDEN void conn_close(connectionObject *self); HIDDEN void conn_close_locked(connectionObject *self); @@ -174,6 +174,8 @@ RAISES_NEG HIDDEN int conn_tpc_begin(connectionObject *self, xidObject *xid); RAISES_NEG HIDDEN int conn_tpc_command(connectionObject *self, const char *cmd, xidObject *xid); HIDDEN PyObject *conn_tpc_recover(connectionObject *self); +HIDDEN void conn_set_result(connectionObject *self, PGresult *pgres); +HIDDEN void conn_set_error(connectionObject *self, const char *msg); /* exception-raising macros */ #define EXC_IF_CONN_CLOSED(self) if ((self)->closed > 0) { \ diff --git a/psycopg/connection_int.c b/psycopg/connection_int.c index c05f48e..ad17e45 100644 --- a/psycopg/connection_int.c +++ b/psycopg/connection_int.c @@ -649,25 +649,23 @@ conn_is_datestyle_ok(PGconn *pgconn) /* conn_setup - setup and read basic information about the connection */ RAISES_NEG int -conn_setup(connectionObject *self, PGconn *pgconn) +conn_setup(connectionObject *self) { - PGresult *pgres = NULL; - char *error = NULL; int rv = -1; - self->equote = conn_get_standard_conforming_strings(pgconn); - self->server_version = conn_get_server_version(pgconn); + self->equote = conn_get_standard_conforming_strings(self->pgconn); + self->server_version = conn_get_server_version(self->pgconn); self->protocol = conn_get_protocol_version(self->pgconn); if (3 != self->protocol) { PyErr_SetString(InterfaceError, "only protocol 3 supported"); goto exit; } - if (0 > conn_read_encoding(self, pgconn)) { + if (0 > conn_read_encoding(self, self->pgconn)) { goto exit; } - if (0 > conn_setup_cancel(self, pgconn)) { + if (0 > conn_setup_cancel(self, self->pgconn)) { goto exit; } @@ -678,11 +676,10 @@ conn_setup(connectionObject *self, PGconn *pgconn) if (!dsn_has_replication(self->dsn) && !conn_is_datestyle_ok(self->pgconn)) { int res; Py_UNBLOCK_THREADS; - res = pq_set_guc_locked(self, "datestyle", "ISO", - &pgres, &error, &_save); + res = pq_set_guc_locked(self, "datestyle", "ISO", &_save); Py_BLOCK_THREADS; if (res < 0) { - pq_complete_error(self, &pgres, &error); + pq_complete_error(self); goto unlock; } } @@ -710,7 +707,6 @@ exit: static int _conn_sync_connect(connectionObject *self) { - PGconn *pgconn; int green; /* store this value to prevent inconsistencies due to a change @@ -718,31 +714,31 @@ _conn_sync_connect(connectionObject *self) green = psyco_green(); if (!green) { Py_BEGIN_ALLOW_THREADS; - self->pgconn = pgconn = PQconnectdb(self->dsn); + self->pgconn = PQconnectdb(self->dsn); Py_END_ALLOW_THREADS; - Dprintf("conn_connect: new postgresql connection at %p", pgconn); + Dprintf("conn_connect: new PG connection at %p", self->pgconn); } else { Py_BEGIN_ALLOW_THREADS; - self->pgconn = pgconn = PQconnectStart(self->dsn); + self->pgconn = PQconnectStart(self->dsn); Py_END_ALLOW_THREADS; - Dprintf("conn_connect: new green postgresql connection at %p", pgconn); + Dprintf("conn_connect: new green PG connection at %p", self->pgconn); } - if (pgconn == NULL) + if (!self->pgconn) { Dprintf("conn_connect: PQconnectdb(%s) FAILED", self->dsn); PyErr_SetString(OperationalError, "PQconnectdb() failed"); return -1; } - else if (PQstatus(pgconn) == CONNECTION_BAD) + else if (PQstatus(self->pgconn) == CONNECTION_BAD) { Dprintf("conn_connect: PQconnectdb(%s) returned BAD", self->dsn); - PyErr_SetString(OperationalError, PQerrorMessage(pgconn)); + PyErr_SetString(OperationalError, PQerrorMessage(self->pgconn)); return -1; } - PQsetNoticeProcessor(pgconn, conn_notice_callback, (void*)self); + PQsetNoticeProcessor(self->pgconn, conn_notice_callback, (void*)self); /* if the connection is green, wait to finish connection */ if (green) { @@ -759,7 +755,7 @@ _conn_sync_connect(connectionObject *self) */ self->status = CONN_STATUS_READY; - if (conn_setup(self, self->pgconn) == -1) { + if (conn_setup(self) == -1) { return -1; } @@ -1122,8 +1118,7 @@ conn_poll(connectionObject *self) break; } - PQclear(curs->pgres); - curs->pgres = self->pgres; + curs_set_result(curs, self->pgres); self->pgres = NULL; /* fetch the tuples (if there are any) and build the result. We @@ -1225,8 +1220,6 @@ conn_set_session(connectionObject *self, int autocommit, int isolevel, int readonly, int deferrable) { int rv = -1; - PGresult *pgres = NULL; - char *error = NULL; int want_autocommit = autocommit == SRV_STATE_UNCHANGED ? self->autocommit : autocommit; @@ -1256,21 +1249,21 @@ conn_set_session(connectionObject *self, int autocommit, if (isolevel != SRV_STATE_UNCHANGED) { if (0 > pq_set_guc_locked(self, "default_transaction_isolation", srv_isolevels[isolevel], - &pgres, &error, &_save)) { + &_save)) { goto endlock; } } if (readonly != SRV_STATE_UNCHANGED) { if (0 > pq_set_guc_locked(self, "default_transaction_read_only", srv_state_guc[readonly], - &pgres, &error, &_save)) { + &_save)) { goto endlock; } } if (deferrable != SRV_STATE_UNCHANGED) { if (0 > pq_set_guc_locked(self, "default_transaction_deferrable", srv_state_guc[deferrable], - &pgres, &error, &_save)) { + &_save)) { goto endlock; } } @@ -1281,21 +1274,21 @@ conn_set_session(connectionObject *self, int autocommit, if (self->isolevel != ISOLATION_LEVEL_DEFAULT) { if (0 > pq_set_guc_locked(self, "default_transaction_isolation", "default", - &pgres, &error, &_save)) { + &_save)) { goto endlock; } } if (self->readonly != STATE_DEFAULT) { if (0 > pq_set_guc_locked(self, "default_transaction_read_only", "default", - &pgres, &error, &_save)) { + &_save)) { goto endlock; } } if (self->server_version >= 90100 && self->deferrable != STATE_DEFAULT) { if (0 > pq_set_guc_locked(self, "default_transaction_deferrable", "default", - &pgres, &error, &_save)) { + &_save)) { goto endlock; } } @@ -1320,7 +1313,7 @@ endlock: Py_END_ALLOW_THREADS; if (rv < 0) { - pq_complete_error(self, &pgres, &error); + pq_complete_error(self); goto exit; } @@ -1339,8 +1332,6 @@ exit: RAISES_NEG int conn_set_client_encoding(connectionObject *self, const char *pgenc) { - PGresult *pgres = NULL; - char *error = NULL; int res = -1; char *clean_enc = NULL; @@ -1356,12 +1347,11 @@ conn_set_client_encoding(connectionObject *self, const char *pgenc) /* abort the current transaction, to set the encoding ouside of transactions */ - if ((res = pq_abort_locked(self, &pgres, &error, &_save))) { + if ((res = pq_abort_locked(self, &_save))) { goto endlock; } - if ((res = pq_set_guc_locked(self, "client_encoding", clean_enc, - &pgres, &error, &_save))) { + if ((res = pq_set_guc_locked(self, "client_encoding", clean_enc, &_save))) { goto endlock; } @@ -1370,7 +1360,7 @@ endlock: Py_END_ALLOW_THREADS; if (res < 0) { - pq_complete_error(self, &pgres, &error); + pq_complete_error(self); goto exit; } @@ -1396,18 +1386,15 @@ exit: RAISES_NEG int conn_tpc_begin(connectionObject *self, xidObject *xid) { - PGresult *pgres = NULL; - char *error = NULL; - Dprintf("conn_tpc_begin: starting transaction"); Py_BEGIN_ALLOW_THREADS; pthread_mutex_lock(&self->lock); - if (pq_begin_locked(self, &pgres, &error, &_save) < 0) { + if (pq_begin_locked(self, &_save) < 0) { pthread_mutex_unlock(&(self->lock)); Py_BLOCK_THREADS; - pq_complete_error(self, &pgres, &error); + pq_complete_error(self); return -1; } @@ -1430,8 +1417,6 @@ conn_tpc_begin(connectionObject *self, xidObject *xid) RAISES_NEG int conn_tpc_command(connectionObject *self, const char *cmd, xidObject *xid) { - PGresult *pgres = NULL; - char *error = NULL; PyObject *tid = NULL; const char *ctid; int rv = -1; @@ -1445,11 +1430,10 @@ conn_tpc_command(connectionObject *self, const char *cmd, xidObject *xid) Py_BEGIN_ALLOW_THREADS; pthread_mutex_lock(&self->lock); - if (0 > (rv = pq_tpc_command_locked(self, cmd, ctid, - &pgres, &error, &_save))) { + if (0 > (rv = pq_tpc_command_locked(self, cmd, ctid, &_save))) { pthread_mutex_unlock(&self->lock); Py_BLOCK_THREADS; - pq_complete_error(self, &pgres, &error); + pq_complete_error(self); goto exit; } @@ -1494,3 +1478,24 @@ exit: return rv; } + + +void +conn_set_result(connectionObject *self, PGresult *pgres) +{ + PQclear(self->pgres); + self->pgres = pgres; +} + + +void +conn_set_error(connectionObject *self, const char *msg) +{ + if (self->error) { + free(self->error); + self->error = NULL; + } + if (msg && *msg) { + self->error = strdup(msg); + } +} diff --git a/psycopg/connection_type.c b/psycopg/connection_type.c index 96e5647..f4d650b 100644 --- a/psycopg/connection_type.c +++ b/psycopg/connection_type.c @@ -1052,7 +1052,7 @@ psyco_conn_reset(connectionObject *self, PyObject *dummy) if (pq_reset(self) < 0) return NULL; - res = conn_setup(self, self->pgconn); + res = conn_setup(self); if (res < 0) return NULL; @@ -1430,7 +1430,7 @@ connection_dealloc(PyObject* obj) PyMem_Free(self->dsn); PyMem_Free(self->encoding); - if (self->critical) free(self->critical); + if (self->error) free(self->error); if (self->cancel) PQfreeCancel(self->cancel); PQclear(self->pgres); diff --git a/psycopg/cursor.h b/psycopg/cursor.h index 30d0d34..bc91cbb 100644 --- a/psycopg/cursor.h +++ b/psycopg/cursor.h @@ -96,6 +96,7 @@ HIDDEN void curs_reset(cursorObject *self); RAISES_NEG HIDDEN int psyco_curs_withhold_set(cursorObject *self, PyObject *pyvalue); RAISES_NEG HIDDEN int psyco_curs_scrollable_set(cursorObject *self, PyObject *pyvalue); HIDDEN PyObject *psyco_curs_validate_sql_basic(cursorObject *self, PyObject *sql); +HIDDEN void curs_set_result(cursorObject *self, PGresult *pgres); /* exception-raising macros */ #define EXC_IF_CURS_CLOSED(self) \ diff --git a/psycopg/cursor_int.c b/psycopg/cursor_int.c index bebbeaa..453bf61 100644 --- a/psycopg/cursor_int.c +++ b/psycopg/cursor_int.c @@ -160,3 +160,11 @@ exit: Py_XDECREF(comp); return rv; } + + +void +curs_set_result(cursorObject *self, PGresult *pgres) +{ + PQclear(self->pgres); + self->pgres = pgres; +} diff --git a/psycopg/lobject_int.c b/psycopg/lobject_int.c index ebfd697..a14faef 100644 --- a/psycopg/lobject_int.c +++ b/psycopg/lobject_int.c @@ -33,12 +33,9 @@ #include <string.h> static void -collect_error(connectionObject *conn, char **error) +collect_error(connectionObject *conn) { - const char *msg = PQerrorMessage(conn->pgconn); - - if (msg) - *error = strdup(msg); + conn_set_error(conn, PQerrorMessage(conn->pgconn)); } @@ -150,8 +147,6 @@ lobject_open(lobjectObject *self, connectionObject *conn, Oid oid, const char *smode, Oid new_oid, const char *new_file) { int retvalue = -1; - PGresult *pgres = NULL; - char *error = NULL; int pgmode = 0; int mode; @@ -162,7 +157,7 @@ lobject_open(lobjectObject *self, connectionObject *conn, Py_BEGIN_ALLOW_THREADS; pthread_mutex_lock(&(self->conn->lock)); - retvalue = pq_begin_locked(self->conn, &pgres, &error, &_save); + retvalue = pq_begin_locked(self->conn, &_save); if (retvalue < 0) goto end; @@ -185,7 +180,7 @@ lobject_open(lobjectObject *self, connectionObject *conn, self->oid); if (self->oid == InvalidOid) { - collect_error(self->conn, &error); + collect_error(self->conn); retvalue = -1; goto end; } @@ -205,7 +200,7 @@ lobject_open(lobjectObject *self, connectionObject *conn, pgmode, self->fd); if (self->fd == -1) { - collect_error(self->conn, &error); + collect_error(self->conn); retvalue = -1; goto end; } @@ -228,7 +223,7 @@ lobject_open(lobjectObject *self, connectionObject *conn, Py_END_ALLOW_THREADS; if (retvalue < 0) - pq_complete_error(self->conn, &pgres, &error); + pq_complete_error(self->conn); /* if retvalue > 0, an exception is already set */ return retvalue; @@ -237,7 +232,7 @@ lobject_open(lobjectObject *self, connectionObject *conn, /* lobject_close - close an existing lo */ RAISES_NEG static int -lobject_close_locked(lobjectObject *self, char **error) +lobject_close_locked(lobjectObject *self) { int retvalue; @@ -251,7 +246,7 @@ lobject_close_locked(lobjectObject *self, char **error) return 0; break; default: - *error = strdup("the connection is broken"); + conn_set_error(self->conn, "the connection is broken"); return -1; break; } @@ -264,7 +259,7 @@ lobject_close_locked(lobjectObject *self, char **error) retvalue = lo_close(self->conn->pgconn, self->fd); self->fd = -1; if (retvalue < 0) - collect_error(self->conn, error); + collect_error(self->conn); return retvalue; } @@ -272,20 +267,18 @@ lobject_close_locked(lobjectObject *self, char **error) RAISES_NEG int lobject_close(lobjectObject *self) { - PGresult *pgres = NULL; - char *error = NULL; int retvalue; Py_BEGIN_ALLOW_THREADS; pthread_mutex_lock(&(self->conn->lock)); - retvalue = lobject_close_locked(self, &error); + retvalue = lobject_close_locked(self); pthread_mutex_unlock(&(self->conn->lock)); Py_END_ALLOW_THREADS; if (retvalue < 0) - pq_complete_error(self->conn, &pgres, &error); + pq_complete_error(self->conn); return retvalue; } @@ -294,32 +287,30 @@ lobject_close(lobjectObject *self) RAISES_NEG int lobject_unlink(lobjectObject *self) { - PGresult *pgres = NULL; - char *error = NULL; int retvalue = -1; Py_BEGIN_ALLOW_THREADS; pthread_mutex_lock(&(self->conn->lock)); - retvalue = pq_begin_locked(self->conn, &pgres, &error, &_save); + retvalue = pq_begin_locked(self->conn, &_save); if (retvalue < 0) goto end; /* first we make sure the lobject is closed and then we unlink */ - retvalue = lobject_close_locked(self, &error); + retvalue = lobject_close_locked(self); if (retvalue < 0) goto end; retvalue = lo_unlink(self->conn->pgconn, self->oid); if (retvalue < 0) - collect_error(self->conn, &error); + collect_error(self->conn); end: pthread_mutex_unlock(&(self->conn->lock)); Py_END_ALLOW_THREADS; if (retvalue < 0) - pq_complete_error(self->conn, &pgres, &error); + pq_complete_error(self->conn); return retvalue; } @@ -329,8 +320,6 @@ RAISES_NEG Py_ssize_t lobject_write(lobjectObject *self, const char *buf, size_t len) { Py_ssize_t written; - PGresult *pgres = NULL; - char *error = NULL; Dprintf("lobject_writing: fd = %d, len = " FORMAT_CODE_SIZE_T, self->fd, len); @@ -340,13 +329,13 @@ lobject_write(lobjectObject *self, const char *buf, size_t len) written = lo_write(self->conn->pgconn, self->fd, buf, len); if (written < 0) - collect_error(self->conn, &error); + collect_error(self->conn); pthread_mutex_unlock(&(self->conn->lock)); Py_END_ALLOW_THREADS; if (written < 0) - pq_complete_error(self->conn, &pgres, &error); + pq_complete_error(self->conn); return written; } @@ -356,21 +345,19 @@ RAISES_NEG Py_ssize_t lobject_read(lobjectObject *self, char *buf, size_t len) { Py_ssize_t n_read; - PGresult *pgres = NULL; - char *error = NULL; Py_BEGIN_ALLOW_THREADS; pthread_mutex_lock(&(self->conn->lock)); n_read = lo_read(self->conn->pgconn, self->fd, buf, len); if (n_read < 0) - collect_error(self->conn, &error); + collect_error(self->conn); pthread_mutex_unlock(&(self->conn->lock)); Py_END_ALLOW_THREADS; if (n_read < 0) - pq_complete_error(self->conn, &pgres, &error); + pq_complete_error(self->conn); return n_read; } @@ -379,8 +366,6 @@ lobject_read(lobjectObject *self, char *buf, size_t len) RAISES_NEG Py_ssize_t lobject_seek(lobjectObject *self, Py_ssize_t pos, int whence) { - PGresult *pgres = NULL; - char *error = NULL; Py_ssize_t where; Dprintf("lobject_seek: fd = %d, pos = " FORMAT_CODE_PY_SSIZE_T ", whence = %d", @@ -400,13 +385,13 @@ lobject_seek(lobjectObject *self, Py_ssize_t pos, int whence) #endif Dprintf("lobject_seek: where = " FORMAT_CODE_PY_SSIZE_T, where); if (where < 0) - collect_error(self->conn, &error); + collect_error(self->conn); pthread_mutex_unlock(&(self->conn->lock)); Py_END_ALLOW_THREADS; if (where < 0) - pq_complete_error(self->conn, &pgres, &error); + pq_complete_error(self->conn); return where; } @@ -415,8 +400,6 @@ lobject_seek(lobjectObject *self, Py_ssize_t pos, int whence) RAISES_NEG Py_ssize_t lobject_tell(lobjectObject *self) { - PGresult *pgres = NULL; - char *error = NULL; Py_ssize_t where; Dprintf("lobject_tell: fd = %d", self->fd); @@ -435,13 +418,13 @@ lobject_tell(lobjectObject *self) #endif Dprintf("lobject_tell: where = " FORMAT_CODE_PY_SSIZE_T, where); if (where < 0) - collect_error(self->conn, &error); + collect_error(self->conn); pthread_mutex_unlock(&(self->conn->lock)); Py_END_ALLOW_THREADS; if (where < 0) - pq_complete_error(self->conn, &pgres, &error); + pq_complete_error(self->conn); return where; } @@ -450,27 +433,25 @@ lobject_tell(lobjectObject *self) RAISES_NEG int lobject_export(lobjectObject *self, const char *filename) { - PGresult *pgres = NULL; - char *error = NULL; int retvalue; Py_BEGIN_ALLOW_THREADS; pthread_mutex_lock(&(self->conn->lock)); - retvalue = pq_begin_locked(self->conn, &pgres, &error, &_save); + retvalue = pq_begin_locked(self->conn, &_save); if (retvalue < 0) goto end; retvalue = lo_export(self->conn->pgconn, self->oid, filename); if (retvalue < 0) - collect_error(self->conn, &error); + collect_error(self->conn); end: pthread_mutex_unlock(&(self->conn->lock)); Py_END_ALLOW_THREADS; if (retvalue < 0) - pq_complete_error(self->conn, &pgres, &error); + pq_complete_error(self->conn); return retvalue; } @@ -478,8 +459,6 @@ RAISES_NEG int lobject_truncate(lobjectObject *self, size_t len) { int retvalue; - PGresult *pgres = NULL; - char *error = NULL; Dprintf("lobject_truncate: fd = %d, len = " FORMAT_CODE_SIZE_T, self->fd, len); @@ -498,13 +477,13 @@ lobject_truncate(lobjectObject *self, size_t len) #endif Dprintf("lobject_truncate: result = %d", retvalue); if (retvalue < 0) - collect_error(self->conn, &error); + collect_error(self->conn); pthread_mutex_unlock(&(self->conn->lock)); Py_END_ALLOW_THREADS; if (retvalue < 0) - pq_complete_error(self->conn, &pgres, &error); + pq_complete_error(self->conn); return retvalue; } diff --git a/psycopg/pqpath.c b/psycopg/pqpath.c index 0789ab8..843b57d 100644 --- a/psycopg/pqpath.c +++ b/psycopg/pqpath.c @@ -194,68 +194,6 @@ pq_raise(connectionObject *conn, cursorObject *curs, PGresult **pgres) Py_XDECREF(pgcode); } -/* pq_set_critical, pq_resolve_critical - manage critical errors - - this function is invoked when a PQexec() call returns NULL, meaning a - critical condition like out of memory or lost connection. it save the error - message and mark the connection as 'wanting cleanup'. - - both functions do not call any Py_*_ALLOW_THREADS macros. - pq_resolve_critical should be called while holding the GIL. */ - -void -pq_set_critical(connectionObject *conn, const char *msg) -{ - if (msg == NULL) - msg = PQerrorMessage(conn->pgconn); - if (conn->critical) free(conn->critical); - Dprintf("pq_set_critical: setting %s", msg); - if (msg && msg[0] != '\0') conn->critical = strdup(msg); - else conn->critical = NULL; -} - -static void -pq_clear_critical(connectionObject *conn) -{ - /* sometimes we know that the notice analizer set a critical that - was not really as such (like when raising an error for a delayed - contraint violation. it would be better to analyze the notice - or avoid the set-error-on-notice stuff at all but given that we - can't, some functions at least clear the critical status after - operations they know would result in a wrong critical to be set */ - Dprintf("pq_clear_critical: clearing %s", conn->critical); - if (conn->critical) { - free(conn->critical); - conn->critical = NULL; - } -} - -/* return -1 if the exception is set (i.e. if conn->critical is set), - * else 0 */ -RAISES_NEG static int -pq_resolve_critical(connectionObject *conn, int close) -{ - Dprintf("pq_resolve_critical: resolving %s", conn->critical); - - if (conn->critical) { - char *msg = &(conn->critical[6]); - Dprintf("pq_resolve_critical: error = %s", msg); - /* we can't use pq_raise because the error has already been cleared - from the connection, so we just raise an OperationalError with the - critical message */ - PyErr_SetString(OperationalError, msg); - - /* we don't want to destroy this connection but just close it */ - if (close == 1) conn_close(conn); - - /* remember to clear the critical! */ - pq_clear_critical(conn); - - return -1; - } - return 0; -} - /* pq_clear_async - clear the effects of a previous async query note that this function does block because it needs to wait for the full @@ -273,9 +211,9 @@ pq_clear_async(connectionObject *conn) finalize asynchronous processing so the connection will be ready to accept another query */ - while ((pgres = PQgetResult(conn->pgconn)) != NULL) { + while ((pgres = PQgetResult(conn->pgconn))) { Dprintf("pq_clear_async: clearing PGresult at %p", pgres); - CLEARPGRES(pgres); + PQclear(pgres); } Py_CLEAR(conn->async_cursor); } @@ -305,7 +243,7 @@ pq_set_non_blocking(connectionObject *conn, int arg) This function should only be called on a locked connection without holding the global interpreter lock. - On error, -1 is returned, and the pgres argument will hold the + On error, -1 is returned, and the conn->pgres will hold the relevant result structure. The tstate parameter should be the pointer of the _save variable created by @@ -313,36 +251,31 @@ pq_set_non_blocking(connectionObject *conn, int arg) again the GIL if needed, i.e. if a Python wait callback must be invoked. */ int -pq_execute_command_locked(connectionObject *conn, const char *query, - PGresult **pgres, char **error, - PyThreadState **tstate) +pq_execute_command_locked( + connectionObject *conn, const char *query, PyThreadState **tstate) { int pgstatus, retvalue = -1; - Dprintf("pq_execute_command_locked: pgconn = %p, query = %s", conn->pgconn, query); - *error = NULL; if (!psyco_green()) { - *pgres = PQexec(conn->pgconn, query); + conn_set_result(conn, PQexec(conn->pgconn, query)); } else { PyEval_RestoreThread(*tstate); - *pgres = psyco_exec_green(conn, query); + conn_set_result(conn, psyco_exec_green(conn, query)); *tstate = PyEval_SaveThread(); } - if (*pgres == NULL) { + if (conn->pgres == NULL) { Dprintf("pq_execute_command_locked: PQexec returned NULL"); PyEval_RestoreThread(*tstate); if (!PyErr_Occurred()) { - const char *msg; - msg = PQerrorMessage(conn->pgconn); - if (msg && *msg) { *error = strdup(msg); } + conn_set_error(conn, PQerrorMessage(conn->pgconn)); } *tstate = PyEval_SaveThread(); goto cleanup; } - pgstatus = PQresultStatus(*pgres); + pgstatus = PQresultStatus(conn->pgres); if (pgstatus != PGRES_COMMAND_OK ) { Dprintf("pq_execute_command_locked: result was not COMMAND_OK (%d)", pgstatus); @@ -350,7 +283,7 @@ pq_execute_command_locked(connectionObject *conn, const char *query, } retvalue = 0; - CLEARPGRES(*pgres); + CLEARPGRES(conn->pgres); cleanup: return retvalue; @@ -365,17 +298,17 @@ cleanup: lock. */ RAISES void -pq_complete_error(connectionObject *conn, PGresult **pgres, char **error) +pq_complete_error(connectionObject *conn) { - Dprintf("pq_complete_error: pgconn = %p, pgres = %p, error = %s", - conn->pgconn, *pgres, *error ? *error : "(null)"); - if (*pgres != NULL) { - pq_raise(conn, NULL, pgres); - /* now *pgres is null */ + Dprintf("pq_complete_error: pgconn = %p, error = %s", + conn->pgconn, conn->error); + if (conn->pgres) { + pq_raise(conn, NULL, &conn->pgres); + /* now conn->pgres is null */ } else { - if (*error != NULL) { - PyErr_SetString(OperationalError, *error); + if (conn->error) { + PyErr_SetString(OperationalError, conn->error); } else if (PyErr_Occurred()) { /* There was a Python error (e.g. in the callback). Don't clobber * it with an unknown exception. (see #410) */ @@ -392,11 +325,7 @@ pq_complete_error(connectionObject *conn, PGresult **pgres, char **error) conn->closed = 2; } } - - if (*error) { - free(*error); - *error = NULL; - } + conn_set_error(conn, NULL); } @@ -405,12 +334,11 @@ pq_complete_error(connectionObject *conn, PGresult **pgres, char **error) This function should only be called on a locked connection without holding the global interpreter lock. - On error, -1 is returned, and the pgres argument will hold the + On error, -1 is returned, and the conn->pgres argument will hold the relevant result structure. */ int -pq_begin_locked(connectionObject *conn, PGresult **pgres, char **error, - PyThreadState **tstate) +pq_begin_locked(connectionObject *conn, PyThreadState **tstate) { const size_t bufsize = 256; char buf[256]; /* buf size must be same as bufsize */ @@ -441,7 +369,7 @@ pq_begin_locked(connectionObject *conn, PGresult **pgres, char **error, srv_deferrable[conn->deferrable]); } - result = pq_execute_command_locked(conn, buf, pgres, error, tstate); + result = pq_execute_command_locked(conn, buf, tstate); if (result == 0) conn->status = CONN_STATUS_BEGIN; @@ -458,8 +386,6 @@ int pq_commit(connectionObject *conn) { int retvalue = -1; - PGresult *pgres = NULL; - char *error = NULL; Py_BEGIN_ALLOW_THREADS; pthread_mutex_lock(&conn->lock); @@ -473,7 +399,7 @@ pq_commit(connectionObject *conn) } else { conn->mark += 1; - retvalue = pq_execute_command_locked(conn, "COMMIT", &pgres, &error, &_save); + retvalue = pq_execute_command_locked(conn, "COMMIT", &_save); } Py_BLOCK_THREADS; @@ -488,14 +414,13 @@ pq_commit(connectionObject *conn) Py_END_ALLOW_THREADS; if (retvalue < 0) - pq_complete_error(conn, &pgres, &error); + pq_complete_error(conn); return retvalue; } RAISES_NEG int -pq_abort_locked(connectionObject *conn, PGresult **pgres, char **error, - PyThreadState **tstate) +pq_abort_locked(connectionObject *conn, PyThreadState **tstate) { int retvalue = -1; @@ -508,7 +433,7 @@ pq_abort_locked(connectionObject *conn, PGresult **pgres, char **error, } conn->mark += 1; - retvalue = pq_execute_command_locked(conn, "ROLLBACK", pgres, error, tstate); + retvalue = pq_execute_command_locked(conn, "ROLLBACK", tstate); if (retvalue == 0) conn->status = CONN_STATUS_READY; @@ -524,8 +449,6 @@ RAISES_NEG int pq_abort(connectionObject *conn) { int retvalue = -1; - PGresult *pgres = NULL; - char *error = NULL; Dprintf("pq_abort: pgconn = %p, autocommit = %d, status = %d", conn->pgconn, conn->autocommit, conn->status); @@ -533,7 +456,7 @@ pq_abort(connectionObject *conn) Py_BEGIN_ALLOW_THREADS; pthread_mutex_lock(&conn->lock); - retvalue = pq_abort_locked(conn, &pgres, &error, &_save); + retvalue = pq_abort_locked(conn, &_save); Py_BLOCK_THREADS; conn_notice_process(conn); @@ -543,7 +466,7 @@ pq_abort(connectionObject *conn) Py_END_ALLOW_THREADS; if (retvalue < 0) - pq_complete_error(conn, &pgres, &error); + pq_complete_error(conn); return retvalue; } @@ -558,8 +481,7 @@ pq_abort(connectionObject *conn) */ RAISES_NEG int -pq_reset_locked(connectionObject *conn, PGresult **pgres, char **error, - PyThreadState **tstate) +pq_reset_locked(connectionObject *conn, PyThreadState **tstate) { int retvalue = -1; @@ -569,20 +491,20 @@ pq_reset_locked(connectionObject *conn, PGresult **pgres, char **error, conn->mark += 1; if (!conn->autocommit && conn->status == CONN_STATUS_BEGIN) { - retvalue = pq_execute_command_locked(conn, "ABORT", pgres, error, tstate); + retvalue = pq_execute_command_locked(conn, "ABORT", tstate); if (retvalue != 0) return retvalue; } if (conn->server_version >= 80300) { - retvalue = pq_execute_command_locked(conn, "DISCARD ALL", pgres, error, tstate); + retvalue = pq_execute_command_locked(conn, "DISCARD ALL", tstate); if (retvalue != 0) return retvalue; } else { - retvalue = pq_execute_command_locked(conn, "RESET ALL", pgres, error, tstate); + retvalue = pq_execute_command_locked(conn, "RESET ALL", tstate); if (retvalue != 0) return retvalue; retvalue = pq_execute_command_locked(conn, - "SET SESSION AUTHORIZATION DEFAULT", pgres, error, tstate); + "SET SESSION AUTHORIZATION DEFAULT", tstate); if (retvalue != 0) return retvalue; } @@ -596,8 +518,6 @@ int pq_reset(connectionObject *conn) { int retvalue = -1; - PGresult *pgres = NULL; - char *error = NULL; Dprintf("pq_reset: pgconn = %p, autocommit = %d, status = %d", conn->pgconn, conn->autocommit, conn->status); @@ -605,7 +525,7 @@ pq_reset(connectionObject *conn) Py_BEGIN_ALLOW_THREADS; pthread_mutex_lock(&conn->lock); - retvalue = pq_reset_locked(conn, &pgres, &error, &_save); + retvalue = pq_reset_locked(conn, &_save); Py_BLOCK_THREADS; conn_notice_process(conn); @@ -615,7 +535,7 @@ pq_reset(connectionObject *conn) Py_END_ALLOW_THREADS; if (retvalue < 0) { - pq_complete_error(conn, &pgres, &error); + pq_complete_error(conn); } else { Py_CLEAR(conn->tpc_xid); @@ -633,9 +553,7 @@ pq_reset(connectionObject *conn) */ char * -pq_get_guc_locked( - connectionObject *conn, const char *param, - PGresult **pgres, char **error, PyThreadState **tstate) +pq_get_guc_locked(connectionObject *conn, const char *param, PyThreadState **tstate) { char query[256]; int size; @@ -645,40 +563,37 @@ pq_get_guc_locked( size = PyOS_snprintf(query, sizeof(query), "SHOW %s", param); if (size < 0 || (size_t)size >= sizeof(query)) { - *error = strdup("SHOW: query too large"); + conn_set_error(conn, "SHOW: query too large"); goto cleanup; } Dprintf("pq_get_guc_locked: pgconn = %p, query = %s", conn->pgconn, query); - *error = NULL; if (!psyco_green()) { - *pgres = PQexec(conn->pgconn, query); + conn_set_result(conn, PQexec(conn->pgconn, query)); } else { PyEval_RestoreThread(*tstate); - *pgres = psyco_exec_green(conn, query); + conn_set_result(conn, psyco_exec_green(conn, query)); *tstate = PyEval_SaveThread(); } - if (*pgres == NULL) { + if (!conn->pgres) { Dprintf("pq_get_guc_locked: PQexec returned NULL"); PyEval_RestoreThread(*tstate); if (!PyErr_Occurred()) { - const char *msg; - msg = PQerrorMessage(conn->pgconn); - if (msg && *msg) { *error = strdup(msg); } + conn_set_error(conn, PQerrorMessage(conn->pgconn)); } *tstate = PyEval_SaveThread(); goto cleanup; } - if (PQresultStatus(*pgres) != PGRES_TUPLES_OK) { - Dprintf("pq_get_guc_locked: result was not TUPLES_OK (%d)", - PQresultStatus(*pgres)); + if (PQresultStatus(conn->pgres) != PGRES_TUPLES_OK) { + Dprintf("pq_get_guc_locked: result was not TUPLES_OK (%s)", + PQresStatus(PQresultStatus(conn->pgres))); goto cleanup; } - rv = strdup(PQgetvalue(*pgres, 0, 0)); - CLEARPGRES(*pgres); + rv = strdup(PQgetvalue(conn->pgres, 0, 0)); + CLEARPGRES(conn->pgres); cleanup: return rv; @@ -693,7 +608,7 @@ cleanup: int pq_set_guc_locked( connectionObject *conn, const char *param, const char *value, - PGresult **pgres, char **error, PyThreadState **tstate) + PyThreadState **tstate) { char query[256]; int size; @@ -710,11 +625,13 @@ pq_set_guc_locked( "SET %s TO '%s'", param, value); } if (size < 0 || (size_t)size >= sizeof(query)) { - *error = strdup("SET: query too large"); + conn_set_error(conn, "SET: query too large"); + goto exit; } - rv = pq_execute_command_locked(conn, query, pgres, error, tstate); + rv = pq_execute_command_locked(conn, query, tstate); +exit: return rv; } @@ -724,8 +641,9 @@ pq_set_guc_locked( * holding the global interpreter lock. */ int -pq_tpc_command_locked(connectionObject *conn, const char *cmd, const char *tid, - PGresult **pgres, char **error, PyThreadState **tstate) +pq_tpc_command_locked( + connectionObject *conn, const char *cmd, const char *tid, + PyThreadState **tstate) { int rv = -1; char *etid = NULL, *buf = NULL; @@ -752,7 +670,7 @@ pq_tpc_command_locked(connectionObject *conn, const char *cmd, const char *tid, /* run the command and let it handle the error cases */ *tstate = PyEval_SaveThread(); - rv = pq_execute_command_locked(conn, buf, pgres, error, tstate); + rv = pq_execute_command_locked(conn, buf, tstate); PyEval_RestoreThread(*tstate); exit: @@ -767,7 +685,7 @@ exit: /* pq_get_result_async - read an available result without blocking. * * Return 0 if the result is ready, 1 if it will block, -1 on error. - * The last result will be returned in pgres. + * The last result will be returned in conn->pgres. * * The function should be called with the lock and holding the GIL. */ @@ -827,8 +745,7 @@ pq_get_result_async(connectionObject *conn) PQclear(res); } else { - PQclear(conn->pgres); - conn->pgres = res; + conn_set_result(conn, res); } switch (status) { @@ -889,42 +806,41 @@ pq_flush(connectionObject *conn) RAISES_NEG int _pq_execute_sync(cursorObject *curs, const char *query, int no_result, int no_begin) { - PGresult *pgres = NULL; - char *error = NULL; + connectionObject *conn = curs->conn; CLEARPGRES(curs->pgres); Py_BEGIN_ALLOW_THREADS; - pthread_mutex_lock(&(curs->conn->lock)); + pthread_mutex_lock(&(conn->lock)); - if (!no_begin && pq_begin_locked(curs->conn, &pgres, &error, &_save) < 0) { - pthread_mutex_unlock(&(curs->conn->lock)); + if (!no_begin && pq_begin_locked(conn, &_save) < 0) { + pthread_mutex_unlock(&(conn->lock)); Py_BLOCK_THREADS; - pq_complete_error(curs->conn, &pgres, &error); + pq_complete_error(conn); return -1; } - Dprintf("pq_execute: executing SYNC query: pgconn = %p", curs->conn->pgconn); + Dprintf("pq_execute: executing SYNC query: pgconn = %p", conn->pgconn); Dprintf(" %-.200s", query); if (!psyco_green()) { - pgres = PQexec(curs->conn->pgconn, query); + conn_set_result(conn, PQexec(conn->pgconn, query)); } else { Py_BLOCK_THREADS; - pgres = psyco_exec_green(curs->conn, query); + conn_set_result(conn, psyco_exec_green(conn, query)); Py_UNBLOCK_THREADS; } /* don't let pgres = NULL go to pq_fetch() */ - if (pgres == NULL) { - if (CONNECTION_BAD == PQstatus(curs->conn->pgconn)) { - curs->conn->closed = 2; + if (!conn->pgres) { + if (CONNECTION_BAD == PQstatus(conn->pgconn)) { + conn->closed = 2; } - pthread_mutex_unlock(&(curs->conn->lock)); + pthread_mutex_unlock(&(conn->lock)); Py_BLOCK_THREADS; if (!PyErr_Occurred()) { PyErr_SetString(OperationalError, - PQerrorMessage(curs->conn->pgconn)); + PQerrorMessage(conn->pgconn)); } return -1; } @@ -932,18 +848,18 @@ _pq_execute_sync(cursorObject *curs, const char *query, int no_result, int no_be Py_BLOCK_THREADS; /* assign the result back to the cursor now that we have the GIL */ - curs->pgres = pgres; - pgres = NULL; + curs_set_result(curs, conn->pgres); + conn->pgres = NULL; /* Process notifies here instead of when fetching the tuple as we are * into the same critical section that received the data. Without this * care, reading notifies may disrupt other thread communications. * (as in ticket #55). */ - conn_notifies_process(curs->conn); - conn_notice_process(curs->conn); + conn_notifies_process(conn); + conn_notice_process(conn); Py_UNBLOCK_THREADS; - pthread_mutex_unlock(&(curs->conn->lock)); + pthread_mutex_unlock(&(conn->lock)); Py_END_ALLOW_THREADS; /* if the execute was sync, we call pq_fetch() immediately, @@ -958,29 +874,30 @@ RAISES_NEG int _pq_execute_async(cursorObject *curs, const char *query, int no_result) { int async_status = ASYNC_WRITE; + connectionObject *conn = curs->conn; int ret; CLEARPGRES(curs->pgres); Py_BEGIN_ALLOW_THREADS; - pthread_mutex_lock(&(curs->conn->lock)); + pthread_mutex_lock(&(conn->lock)); - Dprintf("pq_execute: executing ASYNC query: pgconn = %p", curs->conn->pgconn); + Dprintf("pq_execute: executing ASYNC query: pgconn = %p", conn->pgconn); Dprintf(" %-.200s", query); - if (PQsendQuery(curs->conn->pgconn, query) == 0) { - if (CONNECTION_BAD == PQstatus(curs->conn->pgconn)) { - curs->conn->closed = 2; + if (PQsendQuery(conn->pgconn, query) == 0) { + if (CONNECTION_BAD == PQstatus(conn->pgconn)) { + conn->closed = 2; } - pthread_mutex_unlock(&(curs->conn->lock)); + pthread_mutex_unlock(&(conn->lock)); Py_BLOCK_THREADS; PyErr_SetString(OperationalError, - PQerrorMessage(curs->conn->pgconn)); + PQerrorMessage(conn->pgconn)); return -1; } Dprintf("pq_execute: async query sent to backend"); - ret = PQflush(curs->conn->pgconn); + ret = PQflush(conn->pgconn); if (ret == 0) { /* the query got fully sent to the server */ Dprintf("pq_execute: query got flushed immediately"); @@ -993,18 +910,18 @@ _pq_execute_async(cursorObject *curs, const char *query, int no_result) } else { /* there was an error */ - pthread_mutex_unlock(&(curs->conn->lock)); + pthread_mutex_unlock(&(conn->lock)); Py_BLOCK_THREADS; PyErr_SetString(OperationalError, - PQerrorMessage(curs->conn->pgconn)); + PQerrorMessage(conn->pgconn)); return -1; } - pthread_mutex_unlock(&(curs->conn->lock)); + pthread_mutex_unlock(&(conn->lock)); Py_END_ALLOW_THREADS; - curs->conn->async_status = async_status; - if (!(curs->conn->async_cursor + conn->async_status = async_status; + if (!(conn->async_cursor = PyWeakref_NewRef((PyObject *)curs, NULL))) { return -1; } @@ -1015,12 +932,6 @@ _pq_execute_async(cursorObject *curs, const char *query, int no_result) RAISES_NEG int pq_execute(cursorObject *curs, const char *query, int async, int no_result, int no_begin) { - /* if the status of the connection is critical raise an exception and - definitely close the connection */ - if (curs->conn->critical) { - return pq_resolve_critical(curs->conn, 1); - } - /* check status of connection, raise error if not OK */ if (PQstatus(curs->conn->pgconn) != CONNECTION_OK) { Dprintf("pq_execute: connection NOT OK"); @@ -1421,7 +1332,7 @@ _pq_copy_in_v3(cursorObject *curs) /* and finally we grab the operation result from the backend */ for (;;) { Py_BEGIN_ALLOW_THREADS; - curs->pgres = PQgetResult(curs->conn->pgconn); + curs_set_result(curs, PQgetResult(curs->conn->pgconn)); Py_END_ALLOW_THREADS; if (NULL == curs->pgres) @@ -1502,10 +1413,9 @@ _pq_copy_out_v3(cursorObject *curs) } /* and finally we grab the operation result from the backend */ - CLEARPGRES(curs->pgres); for (;;) { Py_BEGIN_ALLOW_THREADS; - curs->pgres = PQgetResult(curs->conn->pgconn); + curs_set_result(curs, PQgetResult(curs->conn->pgconn)); Py_END_ALLOW_THREADS; if (NULL == curs->pgres) @@ -1584,7 +1494,7 @@ retry: } if (len == -1) { /* EOF */ - curs->pgres = PQgetResult(pgconn); + curs_set_result(curs, PQgetResult(pgconn)); if (curs->pgres && PQresultStatus(curs->pgres) == PGRES_FATAL_ERROR) { pq_raise(conn, curs, NULL); @@ -1805,20 +1715,6 @@ pq_fetch(cursorObject *curs, int no_result) /* even if we fail, we remove any information about the previous query */ curs_reset(curs); - /* check for PGRES_FATAL_ERROR result */ - /* FIXME: I am not sure we need to check for critical error here. - if (curs->pgres == NULL) { - Dprintf("pq_fetch: got a NULL pgres, checking for critical"); - pq_set_critical(curs->conn); - if (curs->conn->critical) { - return pq_resolve_critical(curs->conn); - } - else { - return 0; - } - } - */ - if (curs->pgres == NULL) return 0; pgstatus = PQresultStatus(curs->pgres); @@ -1916,13 +1812,5 @@ pq_fetch(cursorObject *curs, int no_result) break; } - /* error checking, close the connection if necessary (some critical errors - are not really critical, like a COPY FROM error: if that's the case we - raise the exception but we avoid to close the connection) */ - Dprintf("pq_fetch: fetching done; check for critical errors"); - if (curs->conn->critical) { - return pq_resolve_critical(curs->conn, ex == -1 ? 1 : 0); - } - return ex; } diff --git a/psycopg/pqpath.h b/psycopg/pqpath.h index 0ad74d9..9d73224 100644 --- a/psycopg/pqpath.h +++ b/psycopg/pqpath.h @@ -39,24 +39,19 @@ RAISES_NEG HIDDEN int pq_fetch(cursorObject *curs, int no_result); RAISES_NEG HIDDEN int pq_execute(cursorObject *curs, const char *query, int async, int no_result, int no_begin); HIDDEN int pq_send_query(connectionObject *conn, const char *query); -HIDDEN int pq_begin_locked(connectionObject *conn, PGresult **pgres, - char **error, PyThreadState **tstate); +HIDDEN int pq_begin_locked(connectionObject *conn, PyThreadState **tstate); HIDDEN int pq_commit(connectionObject *conn); -RAISES_NEG HIDDEN int pq_abort_locked(connectionObject *conn, PGresult **pgres, - char **error, PyThreadState **tstate); +RAISES_NEG HIDDEN int pq_abort_locked(connectionObject *conn, + PyThreadState **tstate); RAISES_NEG HIDDEN int pq_abort(connectionObject *conn); -HIDDEN int pq_reset_locked(connectionObject *conn, PGresult **pgres, - char **error, PyThreadState **tstate); +HIDDEN int pq_reset_locked(connectionObject *conn, PyThreadState **tstate); RAISES_NEG HIDDEN int pq_reset(connectionObject *conn); HIDDEN char *pq_get_guc_locked(connectionObject *conn, const char *param, - PGresult **pgres, - char **error, PyThreadState **tstate); + PyThreadState **tstate); HIDDEN int pq_set_guc_locked(connectionObject *conn, const char *param, - const char *value, PGresult **pgres, - char **error, PyThreadState **tstate); + const char *value, PyThreadState **tstate); HIDDEN int pq_tpc_command_locked(connectionObject *conn, const char *cmd, const char *tid, - PGresult **pgres, char **error, PyThreadState **tstate); RAISES_NEG HIDDEN int pq_get_result_async(connectionObject *conn); HIDDEN int pq_flush(connectionObject *conn); @@ -65,12 +60,9 @@ RAISES_NEG HIDDEN int pq_set_non_blocking(connectionObject *conn, int arg); HIDDEN void pq_set_critical(connectionObject *conn, const char *msg); -HIDDEN int pq_execute_command_locked(connectionObject *conn, - const char *query, - PGresult **pgres, char **error, +HIDDEN int pq_execute_command_locked(connectionObject *conn, const char *query, PyThreadState **tstate); -RAISES HIDDEN void pq_complete_error(connectionObject *conn, PGresult **pgres, - char **error); +RAISES HIDDEN void pq_complete_error(connectionObject *conn); /* replication protocol support */ HIDDEN int pq_copy_both(replicationCursorObject *repl, PyObject *consumer, |