agora inbox for [email protected]help / color / mirror / Atom feed
[PATCH] chomp PQerrorMessage() in backend uses 19+ messages / 2 participants [nested] [flat]
* [PATCH] chomp PQerrorMessage() in backend uses @ 2017-02-08 14:31 Peter Eisentraut <[email protected]> 0 siblings, 0 replies; 19+ messages in thread From: Peter Eisentraut @ 2017-02-08 14:31 UTC (permalink / raw) PQerrorMessage() returns an error message with a trailing newline, but in backend use (dblink, postgres_fdw, libpqwalreceiver), we want to have the error message without that for emitting via ereport(). To simplify that, add a function pchomp() that returns a pstrdup'ed string with the trailing newline characters removed. --- contrib/dblink/dblink.c | 16 ++++++------ contrib/dblink/expected/dblink.out | 2 -- contrib/postgres_fdw/connection.c | 14 ++-------- .../libpqwalreceiver/libpqwalreceiver.c | 30 +++++++++++----------- src/backend/utils/mmgr/mcxt.c | 14 ++++++++++ src/include/utils/palloc.h | 2 ++ 6 files changed, 41 insertions(+), 37 deletions(-) diff --git a/contrib/dblink/dblink.c b/contrib/dblink/dblink.c index ac43c458cb..db0a8ba72d 100644 --- a/contrib/dblink/dblink.c +++ b/contrib/dblink/dblink.c @@ -166,7 +166,7 @@ typedef struct remoteConnHashEnt #define DBLINK_RES_INTERNALERROR(p2) \ do { \ - msg = pstrdup(PQerrorMessage(conn)); \ + msg = pchomp(PQerrorMessage(conn)); \ if (res) \ PQclear(res); \ elog(ERROR, "%s: %s", p2, msg); \ @@ -204,7 +204,7 @@ typedef struct remoteConnHashEnt conn = PQconnectdb(connstr); \ if (PQstatus(conn) == CONNECTION_BAD) \ { \ - msg = pstrdup(PQerrorMessage(conn)); \ + msg = pchomp(PQerrorMessage(conn)); \ PQfinish(conn); \ ereport(ERROR, \ (errcode(ERRCODE_SQLCLIENT_UNABLE_TO_ESTABLISH_SQLCONNECTION), \ @@ -278,7 +278,7 @@ dblink_connect(PG_FUNCTION_ARGS) if (PQstatus(conn) == CONNECTION_BAD) { - msg = pstrdup(PQerrorMessage(conn)); + msg = pchomp(PQerrorMessage(conn)); PQfinish(conn); if (rconn) pfree(rconn); @@ -651,7 +651,7 @@ dblink_send_query(PG_FUNCTION_ARGS) /* async query send */ retval = PQsendQuery(conn, sql); if (retval != 1) - elog(NOTICE, "could not send query: %s", PQerrorMessage(conn)); + elog(NOTICE, "could not send query: %s", pchomp(PQerrorMessage(conn))); PG_RETURN_INT32(retval); } @@ -1087,7 +1087,7 @@ storeQueryResult(volatile storeInfo *sinfo, PGconn *conn, const char *sql) PGresult *res; if (!PQsendQuery(conn, sql)) - elog(ERROR, "could not send query: %s", PQerrorMessage(conn)); + elog(ERROR, "could not send query: %s", pchomp(PQerrorMessage(conn))); if (!PQsetSingleRowMode(conn)) /* shouldn't fail */ elog(ERROR, "failed to set single-row mode for dblink query"); @@ -1366,8 +1366,8 @@ dblink_error_message(PG_FUNCTION_ARGS) DBLINK_INIT; DBLINK_GET_NAMED_CONN; - msg = PQerrorMessage(conn); - if (msg == NULL || msg[0] == '\0') + msg = pchomp(PQerrorMessage(conn)); + if (msg[0] == '\0') PG_RETURN_TEXT_P(cstring_to_text("OK")); else PG_RETURN_TEXT_P(cstring_to_text(msg)); @@ -2709,7 +2709,7 @@ dblink_res_error(PGconn *conn, const char *conname, PGresult *res, * return NULL, not a PGresult at all. */ if (message_primary == NULL) - message_primary = PQerrorMessage(conn); + message_primary = pchomp(PQerrorMessage(conn)); if (res) PQclear(res); diff --git a/contrib/dblink/expected/dblink.out b/contrib/dblink/expected/dblink.out index 5acaaf225a..4b6d26e574 100644 --- a/contrib/dblink/expected/dblink.out +++ b/contrib/dblink/expected/dblink.out @@ -377,7 +377,6 @@ FROM dblink('myconn','SELECT * FROM foo') AS t(a int, b text, c text[]) WHERE t.a > 7; ERROR: could not establish connection DETAIL: missing "=" after "myconn" in connection info string - -- create a named persistent connection SELECT dblink_connect('myconn',connection_parameters()); dblink_connect @@ -604,7 +603,6 @@ FROM dblink('myconn','SELECT * FROM foo') AS t(a int, b text, c text[]) WHERE t.a > 7; ERROR: could not establish connection DETAIL: missing "=" after "myconn" in connection info string - -- create a named persistent connection SELECT dblink_connect('myconn',connection_parameters()); dblink_connect diff --git a/contrib/postgres_fdw/connection.c b/contrib/postgres_fdw/connection.c index 7f7a744ac0..c6e3d44515 100644 --- a/contrib/postgres_fdw/connection.c +++ b/contrib/postgres_fdw/connection.c @@ -226,21 +226,11 @@ connect_pg_server(ForeignServer *server, UserMapping *user) conn = PQconnectdbParams(keywords, values, false); if (!conn || PQstatus(conn) != CONNECTION_OK) - { - char *connmessage; - int msglen; - - /* libpq typically appends a newline, strip that */ - connmessage = pstrdup(PQerrorMessage(conn)); - msglen = strlen(connmessage); - if (msglen > 0 && connmessage[msglen - 1] == '\n') - connmessage[msglen - 1] = '\0'; ereport(ERROR, (errcode(ERRCODE_SQLCLIENT_UNABLE_TO_ESTABLISH_SQLCONNECTION), errmsg("could not connect to server \"%s\"", server->servername), - errdetail_internal("%s", connmessage))); - } + errdetail_internal("%s", pchomp(PQerrorMessage(conn))))); /* * Check that non-superuser has used password to establish connection; @@ -563,7 +553,7 @@ pgfdw_report_error(int elevel, PGresult *res, PGconn *conn, * return NULL, not a PGresult at all. */ if (message_primary == NULL) - message_primary = PQerrorMessage(conn); + message_primary = pchomp(PQerrorMessage(conn)); ereport(elevel, (errcode(sqlstate), diff --git a/src/backend/replication/libpqwalreceiver/libpqwalreceiver.c b/src/backend/replication/libpqwalreceiver/libpqwalreceiver.c index 44a89c73fd..b88760fb68 100644 --- a/src/backend/replication/libpqwalreceiver/libpqwalreceiver.c +++ b/src/backend/replication/libpqwalreceiver/libpqwalreceiver.c @@ -141,7 +141,7 @@ libpqrcv_connect(const char *conninfo, bool logical, const char *appname, conn->streamConn = PQconnectdbParams(keys, vals, /* expand_dbname = */ true); if (PQstatus(conn->streamConn) != CONNECTION_OK) { - *err = pstrdup(PQerrorMessage(conn->streamConn)); + *err = pchomp(PQerrorMessage(conn->streamConn)); return NULL; } @@ -239,7 +239,7 @@ libpqrcv_identify_system(WalReceiverConn *conn, TimeLineID *primary_tli, ereport(ERROR, (errmsg("could not receive database system identifier and timeline ID from " "the primary server: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); } if (PQnfields(res) < 3 || PQntuples(res) != 1) { @@ -316,13 +316,13 @@ libpqrcv_startstreaming(WalReceiverConn *conn, if (!pubnames_str) ereport(ERROR, (errmsg("could not start WAL streaming: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); pubnames_literal = PQescapeLiteral(conn->streamConn, pubnames_str, strlen(pubnames_str)); if (!pubnames_literal) ereport(ERROR, (errmsg("could not start WAL streaming: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); appendStringInfo(&cmd, ", publication_names %s", pubnames_literal); PQfreemem(pubnames_literal); pfree(pubnames_str); @@ -347,7 +347,7 @@ libpqrcv_startstreaming(WalReceiverConn *conn, PQclear(res); ereport(ERROR, (errmsg("could not start WAL streaming: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); } PQclear(res); return true; @@ -366,7 +366,7 @@ libpqrcv_endstreaming(WalReceiverConn *conn, TimeLineID *next_tli) PQflush(conn->streamConn)) ereport(ERROR, (errmsg("could not send end-of-streaming message to primary: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); *next_tli = 0; @@ -410,7 +410,7 @@ libpqrcv_endstreaming(WalReceiverConn *conn, TimeLineID *next_tli) if (PQresultStatus(res) != PGRES_COMMAND_OK) ereport(ERROR, (errmsg("error reading result of streaming command: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); PQclear(res); /* Verify that there are no more results */ @@ -418,7 +418,7 @@ libpqrcv_endstreaming(WalReceiverConn *conn, TimeLineID *next_tli) if (res != NULL) ereport(ERROR, (errmsg("unexpected result after CommandComplete: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); } /* @@ -445,7 +445,7 @@ libpqrcv_readtimelinehistoryfile(WalReceiverConn *conn, ereport(ERROR, (errmsg("could not receive timeline history file from " "the primary server: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); } if (PQnfields(res) != 2 || PQntuples(res) != 1) { @@ -603,7 +603,7 @@ libpqrcv_receive(WalReceiverConn *conn, char **buffer, if (PQconsumeInput(conn->streamConn) == 0) ereport(ERROR, (errmsg("could not receive data from WAL stream: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); /* Now that we've consumed some input, try again */ rawlen = PQgetCopyData(conn->streamConn, &conn->recvBuf, 1); @@ -630,13 +630,13 @@ libpqrcv_receive(WalReceiverConn *conn, char **buffer, PQclear(res); ereport(ERROR, (errmsg("could not receive data from WAL stream: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); } } if (rawlen < -1) ereport(ERROR, (errmsg("could not receive data from WAL stream: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); /* Return received messages to caller */ *buffer = conn->recvBuf; @@ -655,7 +655,7 @@ libpqrcv_send(WalReceiverConn *conn, const char *buffer, int nbytes) PQflush(conn->streamConn)) ereport(ERROR, (errmsg("could not send data to WAL stream: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); } /* @@ -689,7 +689,7 @@ libpqrcv_create_slot(WalReceiverConn *conn, const char *slotname, PQclear(res); ereport(ERROR, (errmsg("could not create replication slot \"%s\": %s", - slotname, PQerrorMessage(conn->streamConn)))); + slotname, pchomp(PQerrorMessage(conn->streamConn))))); } *lsn = DatumGetLSN(DirectFunctionCall1Coll(pg_lsn_in, InvalidOid, @@ -720,7 +720,7 @@ libpqrcv_command(WalReceiverConn *conn, const char *cmd, char **err) if (PQresultStatus(res) != PGRES_COMMAND_OK) { PQclear(res); - *err = pstrdup(PQerrorMessage(conn->streamConn)); + *err = pchomp(PQerrorMessage(conn->streamConn)); return false; } diff --git a/src/backend/utils/mmgr/mcxt.c b/src/backend/utils/mmgr/mcxt.c index 6ad0bb47b6..c21dfcb96b 100644 --- a/src/backend/utils/mmgr/mcxt.c +++ b/src/backend/utils/mmgr/mcxt.c @@ -1181,3 +1181,17 @@ pnstrdup(const char *in, Size len) out[len] = '\0'; return out; } + +/* + * Make copy of string with all trailing newline characters removed. + */ +char * +pchomp(const char *in) +{ + size_t n; + + n = strlen(in); + while (n > 0 && in[n - 1] == '\n') + n--; + return pnstrdup(in, n); +} diff --git a/src/include/utils/palloc.h b/src/include/utils/palloc.h index b72fe4aee8..2e07bd57ad 100644 --- a/src/include/utils/palloc.h +++ b/src/include/utils/palloc.h @@ -127,6 +127,8 @@ extern char *MemoryContextStrdup(MemoryContext context, const char *string); extern char *pstrdup(const char *in); extern char *pnstrdup(const char *in, Size len); +extern char *pchomp(const char *in); + /* sprintf into a palloc'd buffer --- these are in psprintf.c */ extern char *psprintf(const char *fmt,...) pg_attribute_printf(1, 2); extern size_t pvsnprintf(char *buf, size_t len, const char *fmt, va_list args) pg_attribute_printf(3, 0); -- 2.11.1 --------------8DBA76FBC0D2E1B20F0C5D8D Content-Type: text/plain Content-Disposition: inline Content-Transfer-Encoding: 8bit MIME-Version: 1.0 -- Sent via pgsql-hackers mailing list ([email protected]) To make changes to your subscription: http://www.postgresql.org/mailpref/pgsql-hackers --------------8DBA76FBC0D2E1B20F0C5D8D-- ^ permalink raw reply [nested|flat] 19+ messages in thread
* [PATCH] chomp PQerrorMessage() in backend uses @ 2017-02-08 14:31 Peter Eisentraut <[email protected]> 0 siblings, 0 replies; 19+ messages in thread From: Peter Eisentraut @ 2017-02-08 14:31 UTC (permalink / raw) PQerrorMessage() returns an error message with a trailing newline, but in backend use (dblink, postgres_fdw, libpqwalreceiver), we want to have the error message without that for emitting via ereport(). To simplify that, add a function pchomp() that returns a pstrdup'ed string with the trailing newline characters removed. --- contrib/dblink/dblink.c | 16 ++++++------ contrib/dblink/expected/dblink.out | 2 -- contrib/postgres_fdw/connection.c | 14 ++-------- .../libpqwalreceiver/libpqwalreceiver.c | 30 +++++++++++----------- src/backend/utils/mmgr/mcxt.c | 14 ++++++++++ src/include/utils/palloc.h | 2 ++ 6 files changed, 41 insertions(+), 37 deletions(-) diff --git a/contrib/dblink/dblink.c b/contrib/dblink/dblink.c index ac43c458cb..db0a8ba72d 100644 --- a/contrib/dblink/dblink.c +++ b/contrib/dblink/dblink.c @@ -166,7 +166,7 @@ typedef struct remoteConnHashEnt #define DBLINK_RES_INTERNALERROR(p2) \ do { \ - msg = pstrdup(PQerrorMessage(conn)); \ + msg = pchomp(PQerrorMessage(conn)); \ if (res) \ PQclear(res); \ elog(ERROR, "%s: %s", p2, msg); \ @@ -204,7 +204,7 @@ typedef struct remoteConnHashEnt conn = PQconnectdb(connstr); \ if (PQstatus(conn) == CONNECTION_BAD) \ { \ - msg = pstrdup(PQerrorMessage(conn)); \ + msg = pchomp(PQerrorMessage(conn)); \ PQfinish(conn); \ ereport(ERROR, \ (errcode(ERRCODE_SQLCLIENT_UNABLE_TO_ESTABLISH_SQLCONNECTION), \ @@ -278,7 +278,7 @@ dblink_connect(PG_FUNCTION_ARGS) if (PQstatus(conn) == CONNECTION_BAD) { - msg = pstrdup(PQerrorMessage(conn)); + msg = pchomp(PQerrorMessage(conn)); PQfinish(conn); if (rconn) pfree(rconn); @@ -651,7 +651,7 @@ dblink_send_query(PG_FUNCTION_ARGS) /* async query send */ retval = PQsendQuery(conn, sql); if (retval != 1) - elog(NOTICE, "could not send query: %s", PQerrorMessage(conn)); + elog(NOTICE, "could not send query: %s", pchomp(PQerrorMessage(conn))); PG_RETURN_INT32(retval); } @@ -1087,7 +1087,7 @@ storeQueryResult(volatile storeInfo *sinfo, PGconn *conn, const char *sql) PGresult *res; if (!PQsendQuery(conn, sql)) - elog(ERROR, "could not send query: %s", PQerrorMessage(conn)); + elog(ERROR, "could not send query: %s", pchomp(PQerrorMessage(conn))); if (!PQsetSingleRowMode(conn)) /* shouldn't fail */ elog(ERROR, "failed to set single-row mode for dblink query"); @@ -1366,8 +1366,8 @@ dblink_error_message(PG_FUNCTION_ARGS) DBLINK_INIT; DBLINK_GET_NAMED_CONN; - msg = PQerrorMessage(conn); - if (msg == NULL || msg[0] == '\0') + msg = pchomp(PQerrorMessage(conn)); + if (msg[0] == '\0') PG_RETURN_TEXT_P(cstring_to_text("OK")); else PG_RETURN_TEXT_P(cstring_to_text(msg)); @@ -2709,7 +2709,7 @@ dblink_res_error(PGconn *conn, const char *conname, PGresult *res, * return NULL, not a PGresult at all. */ if (message_primary == NULL) - message_primary = PQerrorMessage(conn); + message_primary = pchomp(PQerrorMessage(conn)); if (res) PQclear(res); diff --git a/contrib/dblink/expected/dblink.out b/contrib/dblink/expected/dblink.out index 5acaaf225a..4b6d26e574 100644 --- a/contrib/dblink/expected/dblink.out +++ b/contrib/dblink/expected/dblink.out @@ -377,7 +377,6 @@ FROM dblink('myconn','SELECT * FROM foo') AS t(a int, b text, c text[]) WHERE t.a > 7; ERROR: could not establish connection DETAIL: missing "=" after "myconn" in connection info string - -- create a named persistent connection SELECT dblink_connect('myconn',connection_parameters()); dblink_connect @@ -604,7 +603,6 @@ FROM dblink('myconn','SELECT * FROM foo') AS t(a int, b text, c text[]) WHERE t.a > 7; ERROR: could not establish connection DETAIL: missing "=" after "myconn" in connection info string - -- create a named persistent connection SELECT dblink_connect('myconn',connection_parameters()); dblink_connect diff --git a/contrib/postgres_fdw/connection.c b/contrib/postgres_fdw/connection.c index 7f7a744ac0..c6e3d44515 100644 --- a/contrib/postgres_fdw/connection.c +++ b/contrib/postgres_fdw/connection.c @@ -226,21 +226,11 @@ connect_pg_server(ForeignServer *server, UserMapping *user) conn = PQconnectdbParams(keywords, values, false); if (!conn || PQstatus(conn) != CONNECTION_OK) - { - char *connmessage; - int msglen; - - /* libpq typically appends a newline, strip that */ - connmessage = pstrdup(PQerrorMessage(conn)); - msglen = strlen(connmessage); - if (msglen > 0 && connmessage[msglen - 1] == '\n') - connmessage[msglen - 1] = '\0'; ereport(ERROR, (errcode(ERRCODE_SQLCLIENT_UNABLE_TO_ESTABLISH_SQLCONNECTION), errmsg("could not connect to server \"%s\"", server->servername), - errdetail_internal("%s", connmessage))); - } + errdetail_internal("%s", pchomp(PQerrorMessage(conn))))); /* * Check that non-superuser has used password to establish connection; @@ -563,7 +553,7 @@ pgfdw_report_error(int elevel, PGresult *res, PGconn *conn, * return NULL, not a PGresult at all. */ if (message_primary == NULL) - message_primary = PQerrorMessage(conn); + message_primary = pchomp(PQerrorMessage(conn)); ereport(elevel, (errcode(sqlstate), diff --git a/src/backend/replication/libpqwalreceiver/libpqwalreceiver.c b/src/backend/replication/libpqwalreceiver/libpqwalreceiver.c index 44a89c73fd..b88760fb68 100644 --- a/src/backend/replication/libpqwalreceiver/libpqwalreceiver.c +++ b/src/backend/replication/libpqwalreceiver/libpqwalreceiver.c @@ -141,7 +141,7 @@ libpqrcv_connect(const char *conninfo, bool logical, const char *appname, conn->streamConn = PQconnectdbParams(keys, vals, /* expand_dbname = */ true); if (PQstatus(conn->streamConn) != CONNECTION_OK) { - *err = pstrdup(PQerrorMessage(conn->streamConn)); + *err = pchomp(PQerrorMessage(conn->streamConn)); return NULL; } @@ -239,7 +239,7 @@ libpqrcv_identify_system(WalReceiverConn *conn, TimeLineID *primary_tli, ereport(ERROR, (errmsg("could not receive database system identifier and timeline ID from " "the primary server: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); } if (PQnfields(res) < 3 || PQntuples(res) != 1) { @@ -316,13 +316,13 @@ libpqrcv_startstreaming(WalReceiverConn *conn, if (!pubnames_str) ereport(ERROR, (errmsg("could not start WAL streaming: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); pubnames_literal = PQescapeLiteral(conn->streamConn, pubnames_str, strlen(pubnames_str)); if (!pubnames_literal) ereport(ERROR, (errmsg("could not start WAL streaming: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); appendStringInfo(&cmd, ", publication_names %s", pubnames_literal); PQfreemem(pubnames_literal); pfree(pubnames_str); @@ -347,7 +347,7 @@ libpqrcv_startstreaming(WalReceiverConn *conn, PQclear(res); ereport(ERROR, (errmsg("could not start WAL streaming: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); } PQclear(res); return true; @@ -366,7 +366,7 @@ libpqrcv_endstreaming(WalReceiverConn *conn, TimeLineID *next_tli) PQflush(conn->streamConn)) ereport(ERROR, (errmsg("could not send end-of-streaming message to primary: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); *next_tli = 0; @@ -410,7 +410,7 @@ libpqrcv_endstreaming(WalReceiverConn *conn, TimeLineID *next_tli) if (PQresultStatus(res) != PGRES_COMMAND_OK) ereport(ERROR, (errmsg("error reading result of streaming command: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); PQclear(res); /* Verify that there are no more results */ @@ -418,7 +418,7 @@ libpqrcv_endstreaming(WalReceiverConn *conn, TimeLineID *next_tli) if (res != NULL) ereport(ERROR, (errmsg("unexpected result after CommandComplete: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); } /* @@ -445,7 +445,7 @@ libpqrcv_readtimelinehistoryfile(WalReceiverConn *conn, ereport(ERROR, (errmsg("could not receive timeline history file from " "the primary server: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); } if (PQnfields(res) != 2 || PQntuples(res) != 1) { @@ -603,7 +603,7 @@ libpqrcv_receive(WalReceiverConn *conn, char **buffer, if (PQconsumeInput(conn->streamConn) == 0) ereport(ERROR, (errmsg("could not receive data from WAL stream: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); /* Now that we've consumed some input, try again */ rawlen = PQgetCopyData(conn->streamConn, &conn->recvBuf, 1); @@ -630,13 +630,13 @@ libpqrcv_receive(WalReceiverConn *conn, char **buffer, PQclear(res); ereport(ERROR, (errmsg("could not receive data from WAL stream: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); } } if (rawlen < -1) ereport(ERROR, (errmsg("could not receive data from WAL stream: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); /* Return received messages to caller */ *buffer = conn->recvBuf; @@ -655,7 +655,7 @@ libpqrcv_send(WalReceiverConn *conn, const char *buffer, int nbytes) PQflush(conn->streamConn)) ereport(ERROR, (errmsg("could not send data to WAL stream: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); } /* @@ -689,7 +689,7 @@ libpqrcv_create_slot(WalReceiverConn *conn, const char *slotname, PQclear(res); ereport(ERROR, (errmsg("could not create replication slot \"%s\": %s", - slotname, PQerrorMessage(conn->streamConn)))); + slotname, pchomp(PQerrorMessage(conn->streamConn))))); } *lsn = DatumGetLSN(DirectFunctionCall1Coll(pg_lsn_in, InvalidOid, @@ -720,7 +720,7 @@ libpqrcv_command(WalReceiverConn *conn, const char *cmd, char **err) if (PQresultStatus(res) != PGRES_COMMAND_OK) { PQclear(res); - *err = pstrdup(PQerrorMessage(conn->streamConn)); + *err = pchomp(PQerrorMessage(conn->streamConn)); return false; } diff --git a/src/backend/utils/mmgr/mcxt.c b/src/backend/utils/mmgr/mcxt.c index 6ad0bb47b6..c21dfcb96b 100644 --- a/src/backend/utils/mmgr/mcxt.c +++ b/src/backend/utils/mmgr/mcxt.c @@ -1181,3 +1181,17 @@ pnstrdup(const char *in, Size len) out[len] = '\0'; return out; } + +/* + * Make copy of string with all trailing newline characters removed. + */ +char * +pchomp(const char *in) +{ + size_t n; + + n = strlen(in); + while (n > 0 && in[n - 1] == '\n') + n--; + return pnstrdup(in, n); +} diff --git a/src/include/utils/palloc.h b/src/include/utils/palloc.h index b72fe4aee8..2e07bd57ad 100644 --- a/src/include/utils/palloc.h +++ b/src/include/utils/palloc.h @@ -127,6 +127,8 @@ extern char *MemoryContextStrdup(MemoryContext context, const char *string); extern char *pstrdup(const char *in); extern char *pnstrdup(const char *in, Size len); +extern char *pchomp(const char *in); + /* sprintf into a palloc'd buffer --- these are in psprintf.c */ extern char *psprintf(const char *fmt,...) pg_attribute_printf(1, 2); extern size_t pvsnprintf(char *buf, size_t len, const char *fmt, va_list args) pg_attribute_printf(3, 0); -- 2.11.1 --------------8DBA76FBC0D2E1B20F0C5D8D Content-Type: text/plain Content-Disposition: inline Content-Transfer-Encoding: 8bit MIME-Version: 1.0 -- Sent via pgsql-hackers mailing list ([email protected]) To make changes to your subscription: http://www.postgresql.org/mailpref/pgsql-hackers --------------8DBA76FBC0D2E1B20F0C5D8D-- ^ permalink raw reply [nested|flat] 19+ messages in thread
* [PATCH] chomp PQerrorMessage() in backend uses @ 2017-02-08 14:31 Peter Eisentraut <[email protected]> 0 siblings, 0 replies; 19+ messages in thread From: Peter Eisentraut @ 2017-02-08 14:31 UTC (permalink / raw) PQerrorMessage() returns an error message with a trailing newline, but in backend use (dblink, postgres_fdw, libpqwalreceiver), we want to have the error message without that for emitting via ereport(). To simplify that, add a function pchomp() that returns a pstrdup'ed string with the trailing newline characters removed. --- contrib/dblink/dblink.c | 16 ++++++------ contrib/dblink/expected/dblink.out | 2 -- contrib/postgres_fdw/connection.c | 14 ++-------- .../libpqwalreceiver/libpqwalreceiver.c | 30 +++++++++++----------- src/backend/utils/mmgr/mcxt.c | 14 ++++++++++ src/include/utils/palloc.h | 2 ++ 6 files changed, 41 insertions(+), 37 deletions(-) diff --git a/contrib/dblink/dblink.c b/contrib/dblink/dblink.c index ac43c458cb..db0a8ba72d 100644 --- a/contrib/dblink/dblink.c +++ b/contrib/dblink/dblink.c @@ -166,7 +166,7 @@ typedef struct remoteConnHashEnt #define DBLINK_RES_INTERNALERROR(p2) \ do { \ - msg = pstrdup(PQerrorMessage(conn)); \ + msg = pchomp(PQerrorMessage(conn)); \ if (res) \ PQclear(res); \ elog(ERROR, "%s: %s", p2, msg); \ @@ -204,7 +204,7 @@ typedef struct remoteConnHashEnt conn = PQconnectdb(connstr); \ if (PQstatus(conn) == CONNECTION_BAD) \ { \ - msg = pstrdup(PQerrorMessage(conn)); \ + msg = pchomp(PQerrorMessage(conn)); \ PQfinish(conn); \ ereport(ERROR, \ (errcode(ERRCODE_SQLCLIENT_UNABLE_TO_ESTABLISH_SQLCONNECTION), \ @@ -278,7 +278,7 @@ dblink_connect(PG_FUNCTION_ARGS) if (PQstatus(conn) == CONNECTION_BAD) { - msg = pstrdup(PQerrorMessage(conn)); + msg = pchomp(PQerrorMessage(conn)); PQfinish(conn); if (rconn) pfree(rconn); @@ -651,7 +651,7 @@ dblink_send_query(PG_FUNCTION_ARGS) /* async query send */ retval = PQsendQuery(conn, sql); if (retval != 1) - elog(NOTICE, "could not send query: %s", PQerrorMessage(conn)); + elog(NOTICE, "could not send query: %s", pchomp(PQerrorMessage(conn))); PG_RETURN_INT32(retval); } @@ -1087,7 +1087,7 @@ storeQueryResult(volatile storeInfo *sinfo, PGconn *conn, const char *sql) PGresult *res; if (!PQsendQuery(conn, sql)) - elog(ERROR, "could not send query: %s", PQerrorMessage(conn)); + elog(ERROR, "could not send query: %s", pchomp(PQerrorMessage(conn))); if (!PQsetSingleRowMode(conn)) /* shouldn't fail */ elog(ERROR, "failed to set single-row mode for dblink query"); @@ -1366,8 +1366,8 @@ dblink_error_message(PG_FUNCTION_ARGS) DBLINK_INIT; DBLINK_GET_NAMED_CONN; - msg = PQerrorMessage(conn); - if (msg == NULL || msg[0] == '\0') + msg = pchomp(PQerrorMessage(conn)); + if (msg[0] == '\0') PG_RETURN_TEXT_P(cstring_to_text("OK")); else PG_RETURN_TEXT_P(cstring_to_text(msg)); @@ -2709,7 +2709,7 @@ dblink_res_error(PGconn *conn, const char *conname, PGresult *res, * return NULL, not a PGresult at all. */ if (message_primary == NULL) - message_primary = PQerrorMessage(conn); + message_primary = pchomp(PQerrorMessage(conn)); if (res) PQclear(res); diff --git a/contrib/dblink/expected/dblink.out b/contrib/dblink/expected/dblink.out index 5acaaf225a..4b6d26e574 100644 --- a/contrib/dblink/expected/dblink.out +++ b/contrib/dblink/expected/dblink.out @@ -377,7 +377,6 @@ FROM dblink('myconn','SELECT * FROM foo') AS t(a int, b text, c text[]) WHERE t.a > 7; ERROR: could not establish connection DETAIL: missing "=" after "myconn" in connection info string - -- create a named persistent connection SELECT dblink_connect('myconn',connection_parameters()); dblink_connect @@ -604,7 +603,6 @@ FROM dblink('myconn','SELECT * FROM foo') AS t(a int, b text, c text[]) WHERE t.a > 7; ERROR: could not establish connection DETAIL: missing "=" after "myconn" in connection info string - -- create a named persistent connection SELECT dblink_connect('myconn',connection_parameters()); dblink_connect diff --git a/contrib/postgres_fdw/connection.c b/contrib/postgres_fdw/connection.c index 7f7a744ac0..c6e3d44515 100644 --- a/contrib/postgres_fdw/connection.c +++ b/contrib/postgres_fdw/connection.c @@ -226,21 +226,11 @@ connect_pg_server(ForeignServer *server, UserMapping *user) conn = PQconnectdbParams(keywords, values, false); if (!conn || PQstatus(conn) != CONNECTION_OK) - { - char *connmessage; - int msglen; - - /* libpq typically appends a newline, strip that */ - connmessage = pstrdup(PQerrorMessage(conn)); - msglen = strlen(connmessage); - if (msglen > 0 && connmessage[msglen - 1] == '\n') - connmessage[msglen - 1] = '\0'; ereport(ERROR, (errcode(ERRCODE_SQLCLIENT_UNABLE_TO_ESTABLISH_SQLCONNECTION), errmsg("could not connect to server \"%s\"", server->servername), - errdetail_internal("%s", connmessage))); - } + errdetail_internal("%s", pchomp(PQerrorMessage(conn))))); /* * Check that non-superuser has used password to establish connection; @@ -563,7 +553,7 @@ pgfdw_report_error(int elevel, PGresult *res, PGconn *conn, * return NULL, not a PGresult at all. */ if (message_primary == NULL) - message_primary = PQerrorMessage(conn); + message_primary = pchomp(PQerrorMessage(conn)); ereport(elevel, (errcode(sqlstate), diff --git a/src/backend/replication/libpqwalreceiver/libpqwalreceiver.c b/src/backend/replication/libpqwalreceiver/libpqwalreceiver.c index 44a89c73fd..b88760fb68 100644 --- a/src/backend/replication/libpqwalreceiver/libpqwalreceiver.c +++ b/src/backend/replication/libpqwalreceiver/libpqwalreceiver.c @@ -141,7 +141,7 @@ libpqrcv_connect(const char *conninfo, bool logical, const char *appname, conn->streamConn = PQconnectdbParams(keys, vals, /* expand_dbname = */ true); if (PQstatus(conn->streamConn) != CONNECTION_OK) { - *err = pstrdup(PQerrorMessage(conn->streamConn)); + *err = pchomp(PQerrorMessage(conn->streamConn)); return NULL; } @@ -239,7 +239,7 @@ libpqrcv_identify_system(WalReceiverConn *conn, TimeLineID *primary_tli, ereport(ERROR, (errmsg("could not receive database system identifier and timeline ID from " "the primary server: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); } if (PQnfields(res) < 3 || PQntuples(res) != 1) { @@ -316,13 +316,13 @@ libpqrcv_startstreaming(WalReceiverConn *conn, if (!pubnames_str) ereport(ERROR, (errmsg("could not start WAL streaming: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); pubnames_literal = PQescapeLiteral(conn->streamConn, pubnames_str, strlen(pubnames_str)); if (!pubnames_literal) ereport(ERROR, (errmsg("could not start WAL streaming: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); appendStringInfo(&cmd, ", publication_names %s", pubnames_literal); PQfreemem(pubnames_literal); pfree(pubnames_str); @@ -347,7 +347,7 @@ libpqrcv_startstreaming(WalReceiverConn *conn, PQclear(res); ereport(ERROR, (errmsg("could not start WAL streaming: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); } PQclear(res); return true; @@ -366,7 +366,7 @@ libpqrcv_endstreaming(WalReceiverConn *conn, TimeLineID *next_tli) PQflush(conn->streamConn)) ereport(ERROR, (errmsg("could not send end-of-streaming message to primary: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); *next_tli = 0; @@ -410,7 +410,7 @@ libpqrcv_endstreaming(WalReceiverConn *conn, TimeLineID *next_tli) if (PQresultStatus(res) != PGRES_COMMAND_OK) ereport(ERROR, (errmsg("error reading result of streaming command: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); PQclear(res); /* Verify that there are no more results */ @@ -418,7 +418,7 @@ libpqrcv_endstreaming(WalReceiverConn *conn, TimeLineID *next_tli) if (res != NULL) ereport(ERROR, (errmsg("unexpected result after CommandComplete: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); } /* @@ -445,7 +445,7 @@ libpqrcv_readtimelinehistoryfile(WalReceiverConn *conn, ereport(ERROR, (errmsg("could not receive timeline history file from " "the primary server: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); } if (PQnfields(res) != 2 || PQntuples(res) != 1) { @@ -603,7 +603,7 @@ libpqrcv_receive(WalReceiverConn *conn, char **buffer, if (PQconsumeInput(conn->streamConn) == 0) ereport(ERROR, (errmsg("could not receive data from WAL stream: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); /* Now that we've consumed some input, try again */ rawlen = PQgetCopyData(conn->streamConn, &conn->recvBuf, 1); @@ -630,13 +630,13 @@ libpqrcv_receive(WalReceiverConn *conn, char **buffer, PQclear(res); ereport(ERROR, (errmsg("could not receive data from WAL stream: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); } } if (rawlen < -1) ereport(ERROR, (errmsg("could not receive data from WAL stream: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); /* Return received messages to caller */ *buffer = conn->recvBuf; @@ -655,7 +655,7 @@ libpqrcv_send(WalReceiverConn *conn, const char *buffer, int nbytes) PQflush(conn->streamConn)) ereport(ERROR, (errmsg("could not send data to WAL stream: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); } /* @@ -689,7 +689,7 @@ libpqrcv_create_slot(WalReceiverConn *conn, const char *slotname, PQclear(res); ereport(ERROR, (errmsg("could not create replication slot \"%s\": %s", - slotname, PQerrorMessage(conn->streamConn)))); + slotname, pchomp(PQerrorMessage(conn->streamConn))))); } *lsn = DatumGetLSN(DirectFunctionCall1Coll(pg_lsn_in, InvalidOid, @@ -720,7 +720,7 @@ libpqrcv_command(WalReceiverConn *conn, const char *cmd, char **err) if (PQresultStatus(res) != PGRES_COMMAND_OK) { PQclear(res); - *err = pstrdup(PQerrorMessage(conn->streamConn)); + *err = pchomp(PQerrorMessage(conn->streamConn)); return false; } diff --git a/src/backend/utils/mmgr/mcxt.c b/src/backend/utils/mmgr/mcxt.c index 6ad0bb47b6..c21dfcb96b 100644 --- a/src/backend/utils/mmgr/mcxt.c +++ b/src/backend/utils/mmgr/mcxt.c @@ -1181,3 +1181,17 @@ pnstrdup(const char *in, Size len) out[len] = '\0'; return out; } + +/* + * Make copy of string with all trailing newline characters removed. + */ +char * +pchomp(const char *in) +{ + size_t n; + + n = strlen(in); + while (n > 0 && in[n - 1] == '\n') + n--; + return pnstrdup(in, n); +} diff --git a/src/include/utils/palloc.h b/src/include/utils/palloc.h index b72fe4aee8..2e07bd57ad 100644 --- a/src/include/utils/palloc.h +++ b/src/include/utils/palloc.h @@ -127,6 +127,8 @@ extern char *MemoryContextStrdup(MemoryContext context, const char *string); extern char *pstrdup(const char *in); extern char *pnstrdup(const char *in, Size len); +extern char *pchomp(const char *in); + /* sprintf into a palloc'd buffer --- these are in psprintf.c */ extern char *psprintf(const char *fmt,...) pg_attribute_printf(1, 2); extern size_t pvsnprintf(char *buf, size_t len, const char *fmt, va_list args) pg_attribute_printf(3, 0); -- 2.11.1 --------------8DBA76FBC0D2E1B20F0C5D8D Content-Type: text/plain Content-Disposition: inline Content-Transfer-Encoding: 8bit MIME-Version: 1.0 -- Sent via pgsql-hackers mailing list ([email protected]) To make changes to your subscription: http://www.postgresql.org/mailpref/pgsql-hackers --------------8DBA76FBC0D2E1B20F0C5D8D-- ^ permalink raw reply [nested|flat] 19+ messages in thread
* [PATCH] chomp PQerrorMessage() in backend uses @ 2017-02-08 14:31 Peter Eisentraut <[email protected]> 0 siblings, 0 replies; 19+ messages in thread From: Peter Eisentraut @ 2017-02-08 14:31 UTC (permalink / raw) PQerrorMessage() returns an error message with a trailing newline, but in backend use (dblink, postgres_fdw, libpqwalreceiver), we want to have the error message without that for emitting via ereport(). To simplify that, add a function pchomp() that returns a pstrdup'ed string with the trailing newline characters removed. --- contrib/dblink/dblink.c | 16 ++++++------ contrib/dblink/expected/dblink.out | 2 -- contrib/postgres_fdw/connection.c | 14 ++-------- .../libpqwalreceiver/libpqwalreceiver.c | 30 +++++++++++----------- src/backend/utils/mmgr/mcxt.c | 14 ++++++++++ src/include/utils/palloc.h | 2 ++ 6 files changed, 41 insertions(+), 37 deletions(-) diff --git a/contrib/dblink/dblink.c b/contrib/dblink/dblink.c index ac43c458cb..db0a8ba72d 100644 --- a/contrib/dblink/dblink.c +++ b/contrib/dblink/dblink.c @@ -166,7 +166,7 @@ typedef struct remoteConnHashEnt #define DBLINK_RES_INTERNALERROR(p2) \ do { \ - msg = pstrdup(PQerrorMessage(conn)); \ + msg = pchomp(PQerrorMessage(conn)); \ if (res) \ PQclear(res); \ elog(ERROR, "%s: %s", p2, msg); \ @@ -204,7 +204,7 @@ typedef struct remoteConnHashEnt conn = PQconnectdb(connstr); \ if (PQstatus(conn) == CONNECTION_BAD) \ { \ - msg = pstrdup(PQerrorMessage(conn)); \ + msg = pchomp(PQerrorMessage(conn)); \ PQfinish(conn); \ ereport(ERROR, \ (errcode(ERRCODE_SQLCLIENT_UNABLE_TO_ESTABLISH_SQLCONNECTION), \ @@ -278,7 +278,7 @@ dblink_connect(PG_FUNCTION_ARGS) if (PQstatus(conn) == CONNECTION_BAD) { - msg = pstrdup(PQerrorMessage(conn)); + msg = pchomp(PQerrorMessage(conn)); PQfinish(conn); if (rconn) pfree(rconn); @@ -651,7 +651,7 @@ dblink_send_query(PG_FUNCTION_ARGS) /* async query send */ retval = PQsendQuery(conn, sql); if (retval != 1) - elog(NOTICE, "could not send query: %s", PQerrorMessage(conn)); + elog(NOTICE, "could not send query: %s", pchomp(PQerrorMessage(conn))); PG_RETURN_INT32(retval); } @@ -1087,7 +1087,7 @@ storeQueryResult(volatile storeInfo *sinfo, PGconn *conn, const char *sql) PGresult *res; if (!PQsendQuery(conn, sql)) - elog(ERROR, "could not send query: %s", PQerrorMessage(conn)); + elog(ERROR, "could not send query: %s", pchomp(PQerrorMessage(conn))); if (!PQsetSingleRowMode(conn)) /* shouldn't fail */ elog(ERROR, "failed to set single-row mode for dblink query"); @@ -1366,8 +1366,8 @@ dblink_error_message(PG_FUNCTION_ARGS) DBLINK_INIT; DBLINK_GET_NAMED_CONN; - msg = PQerrorMessage(conn); - if (msg == NULL || msg[0] == '\0') + msg = pchomp(PQerrorMessage(conn)); + if (msg[0] == '\0') PG_RETURN_TEXT_P(cstring_to_text("OK")); else PG_RETURN_TEXT_P(cstring_to_text(msg)); @@ -2709,7 +2709,7 @@ dblink_res_error(PGconn *conn, const char *conname, PGresult *res, * return NULL, not a PGresult at all. */ if (message_primary == NULL) - message_primary = PQerrorMessage(conn); + message_primary = pchomp(PQerrorMessage(conn)); if (res) PQclear(res); diff --git a/contrib/dblink/expected/dblink.out b/contrib/dblink/expected/dblink.out index 5acaaf225a..4b6d26e574 100644 --- a/contrib/dblink/expected/dblink.out +++ b/contrib/dblink/expected/dblink.out @@ -377,7 +377,6 @@ FROM dblink('myconn','SELECT * FROM foo') AS t(a int, b text, c text[]) WHERE t.a > 7; ERROR: could not establish connection DETAIL: missing "=" after "myconn" in connection info string - -- create a named persistent connection SELECT dblink_connect('myconn',connection_parameters()); dblink_connect @@ -604,7 +603,6 @@ FROM dblink('myconn','SELECT * FROM foo') AS t(a int, b text, c text[]) WHERE t.a > 7; ERROR: could not establish connection DETAIL: missing "=" after "myconn" in connection info string - -- create a named persistent connection SELECT dblink_connect('myconn',connection_parameters()); dblink_connect diff --git a/contrib/postgres_fdw/connection.c b/contrib/postgres_fdw/connection.c index 7f7a744ac0..c6e3d44515 100644 --- a/contrib/postgres_fdw/connection.c +++ b/contrib/postgres_fdw/connection.c @@ -226,21 +226,11 @@ connect_pg_server(ForeignServer *server, UserMapping *user) conn = PQconnectdbParams(keywords, values, false); if (!conn || PQstatus(conn) != CONNECTION_OK) - { - char *connmessage; - int msglen; - - /* libpq typically appends a newline, strip that */ - connmessage = pstrdup(PQerrorMessage(conn)); - msglen = strlen(connmessage); - if (msglen > 0 && connmessage[msglen - 1] == '\n') - connmessage[msglen - 1] = '\0'; ereport(ERROR, (errcode(ERRCODE_SQLCLIENT_UNABLE_TO_ESTABLISH_SQLCONNECTION), errmsg("could not connect to server \"%s\"", server->servername), - errdetail_internal("%s", connmessage))); - } + errdetail_internal("%s", pchomp(PQerrorMessage(conn))))); /* * Check that non-superuser has used password to establish connection; @@ -563,7 +553,7 @@ pgfdw_report_error(int elevel, PGresult *res, PGconn *conn, * return NULL, not a PGresult at all. */ if (message_primary == NULL) - message_primary = PQerrorMessage(conn); + message_primary = pchomp(PQerrorMessage(conn)); ereport(elevel, (errcode(sqlstate), diff --git a/src/backend/replication/libpqwalreceiver/libpqwalreceiver.c b/src/backend/replication/libpqwalreceiver/libpqwalreceiver.c index 44a89c73fd..b88760fb68 100644 --- a/src/backend/replication/libpqwalreceiver/libpqwalreceiver.c +++ b/src/backend/replication/libpqwalreceiver/libpqwalreceiver.c @@ -141,7 +141,7 @@ libpqrcv_connect(const char *conninfo, bool logical, const char *appname, conn->streamConn = PQconnectdbParams(keys, vals, /* expand_dbname = */ true); if (PQstatus(conn->streamConn) != CONNECTION_OK) { - *err = pstrdup(PQerrorMessage(conn->streamConn)); + *err = pchomp(PQerrorMessage(conn->streamConn)); return NULL; } @@ -239,7 +239,7 @@ libpqrcv_identify_system(WalReceiverConn *conn, TimeLineID *primary_tli, ereport(ERROR, (errmsg("could not receive database system identifier and timeline ID from " "the primary server: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); } if (PQnfields(res) < 3 || PQntuples(res) != 1) { @@ -316,13 +316,13 @@ libpqrcv_startstreaming(WalReceiverConn *conn, if (!pubnames_str) ereport(ERROR, (errmsg("could not start WAL streaming: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); pubnames_literal = PQescapeLiteral(conn->streamConn, pubnames_str, strlen(pubnames_str)); if (!pubnames_literal) ereport(ERROR, (errmsg("could not start WAL streaming: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); appendStringInfo(&cmd, ", publication_names %s", pubnames_literal); PQfreemem(pubnames_literal); pfree(pubnames_str); @@ -347,7 +347,7 @@ libpqrcv_startstreaming(WalReceiverConn *conn, PQclear(res); ereport(ERROR, (errmsg("could not start WAL streaming: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); } PQclear(res); return true; @@ -366,7 +366,7 @@ libpqrcv_endstreaming(WalReceiverConn *conn, TimeLineID *next_tli) PQflush(conn->streamConn)) ereport(ERROR, (errmsg("could not send end-of-streaming message to primary: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); *next_tli = 0; @@ -410,7 +410,7 @@ libpqrcv_endstreaming(WalReceiverConn *conn, TimeLineID *next_tli) if (PQresultStatus(res) != PGRES_COMMAND_OK) ereport(ERROR, (errmsg("error reading result of streaming command: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); PQclear(res); /* Verify that there are no more results */ @@ -418,7 +418,7 @@ libpqrcv_endstreaming(WalReceiverConn *conn, TimeLineID *next_tli) if (res != NULL) ereport(ERROR, (errmsg("unexpected result after CommandComplete: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); } /* @@ -445,7 +445,7 @@ libpqrcv_readtimelinehistoryfile(WalReceiverConn *conn, ereport(ERROR, (errmsg("could not receive timeline history file from " "the primary server: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); } if (PQnfields(res) != 2 || PQntuples(res) != 1) { @@ -603,7 +603,7 @@ libpqrcv_receive(WalReceiverConn *conn, char **buffer, if (PQconsumeInput(conn->streamConn) == 0) ereport(ERROR, (errmsg("could not receive data from WAL stream: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); /* Now that we've consumed some input, try again */ rawlen = PQgetCopyData(conn->streamConn, &conn->recvBuf, 1); @@ -630,13 +630,13 @@ libpqrcv_receive(WalReceiverConn *conn, char **buffer, PQclear(res); ereport(ERROR, (errmsg("could not receive data from WAL stream: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); } } if (rawlen < -1) ereport(ERROR, (errmsg("could not receive data from WAL stream: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); /* Return received messages to caller */ *buffer = conn->recvBuf; @@ -655,7 +655,7 @@ libpqrcv_send(WalReceiverConn *conn, const char *buffer, int nbytes) PQflush(conn->streamConn)) ereport(ERROR, (errmsg("could not send data to WAL stream: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); } /* @@ -689,7 +689,7 @@ libpqrcv_create_slot(WalReceiverConn *conn, const char *slotname, PQclear(res); ereport(ERROR, (errmsg("could not create replication slot \"%s\": %s", - slotname, PQerrorMessage(conn->streamConn)))); + slotname, pchomp(PQerrorMessage(conn->streamConn))))); } *lsn = DatumGetLSN(DirectFunctionCall1Coll(pg_lsn_in, InvalidOid, @@ -720,7 +720,7 @@ libpqrcv_command(WalReceiverConn *conn, const char *cmd, char **err) if (PQresultStatus(res) != PGRES_COMMAND_OK) { PQclear(res); - *err = pstrdup(PQerrorMessage(conn->streamConn)); + *err = pchomp(PQerrorMessage(conn->streamConn)); return false; } diff --git a/src/backend/utils/mmgr/mcxt.c b/src/backend/utils/mmgr/mcxt.c index 6ad0bb47b6..c21dfcb96b 100644 --- a/src/backend/utils/mmgr/mcxt.c +++ b/src/backend/utils/mmgr/mcxt.c @@ -1181,3 +1181,17 @@ pnstrdup(const char *in, Size len) out[len] = '\0'; return out; } + +/* + * Make copy of string with all trailing newline characters removed. + */ +char * +pchomp(const char *in) +{ + size_t n; + + n = strlen(in); + while (n > 0 && in[n - 1] == '\n') + n--; + return pnstrdup(in, n); +} diff --git a/src/include/utils/palloc.h b/src/include/utils/palloc.h index b72fe4aee8..2e07bd57ad 100644 --- a/src/include/utils/palloc.h +++ b/src/include/utils/palloc.h @@ -127,6 +127,8 @@ extern char *MemoryContextStrdup(MemoryContext context, const char *string); extern char *pstrdup(const char *in); extern char *pnstrdup(const char *in, Size len); +extern char *pchomp(const char *in); + /* sprintf into a palloc'd buffer --- these are in psprintf.c */ extern char *psprintf(const char *fmt,...) pg_attribute_printf(1, 2); extern size_t pvsnprintf(char *buf, size_t len, const char *fmt, va_list args) pg_attribute_printf(3, 0); -- 2.11.1 --------------8DBA76FBC0D2E1B20F0C5D8D Content-Type: text/plain Content-Disposition: inline Content-Transfer-Encoding: 8bit MIME-Version: 1.0 -- Sent via pgsql-hackers mailing list ([email protected]) To make changes to your subscription: http://www.postgresql.org/mailpref/pgsql-hackers --------------8DBA76FBC0D2E1B20F0C5D8D-- ^ permalink raw reply [nested|flat] 19+ messages in thread
* [PATCH] chomp PQerrorMessage() in backend uses @ 2017-02-08 14:31 Peter Eisentraut <[email protected]> 0 siblings, 0 replies; 19+ messages in thread From: Peter Eisentraut @ 2017-02-08 14:31 UTC (permalink / raw) PQerrorMessage() returns an error message with a trailing newline, but in backend use (dblink, postgres_fdw, libpqwalreceiver), we want to have the error message without that for emitting via ereport(). To simplify that, add a function pchomp() that returns a pstrdup'ed string with the trailing newline characters removed. --- contrib/dblink/dblink.c | 16 ++++++------ contrib/dblink/expected/dblink.out | 2 -- contrib/postgres_fdw/connection.c | 14 ++-------- .../libpqwalreceiver/libpqwalreceiver.c | 30 +++++++++++----------- src/backend/utils/mmgr/mcxt.c | 14 ++++++++++ src/include/utils/palloc.h | 2 ++ 6 files changed, 41 insertions(+), 37 deletions(-) diff --git a/contrib/dblink/dblink.c b/contrib/dblink/dblink.c index ac43c458cb..db0a8ba72d 100644 --- a/contrib/dblink/dblink.c +++ b/contrib/dblink/dblink.c @@ -166,7 +166,7 @@ typedef struct remoteConnHashEnt #define DBLINK_RES_INTERNALERROR(p2) \ do { \ - msg = pstrdup(PQerrorMessage(conn)); \ + msg = pchomp(PQerrorMessage(conn)); \ if (res) \ PQclear(res); \ elog(ERROR, "%s: %s", p2, msg); \ @@ -204,7 +204,7 @@ typedef struct remoteConnHashEnt conn = PQconnectdb(connstr); \ if (PQstatus(conn) == CONNECTION_BAD) \ { \ - msg = pstrdup(PQerrorMessage(conn)); \ + msg = pchomp(PQerrorMessage(conn)); \ PQfinish(conn); \ ereport(ERROR, \ (errcode(ERRCODE_SQLCLIENT_UNABLE_TO_ESTABLISH_SQLCONNECTION), \ @@ -278,7 +278,7 @@ dblink_connect(PG_FUNCTION_ARGS) if (PQstatus(conn) == CONNECTION_BAD) { - msg = pstrdup(PQerrorMessage(conn)); + msg = pchomp(PQerrorMessage(conn)); PQfinish(conn); if (rconn) pfree(rconn); @@ -651,7 +651,7 @@ dblink_send_query(PG_FUNCTION_ARGS) /* async query send */ retval = PQsendQuery(conn, sql); if (retval != 1) - elog(NOTICE, "could not send query: %s", PQerrorMessage(conn)); + elog(NOTICE, "could not send query: %s", pchomp(PQerrorMessage(conn))); PG_RETURN_INT32(retval); } @@ -1087,7 +1087,7 @@ storeQueryResult(volatile storeInfo *sinfo, PGconn *conn, const char *sql) PGresult *res; if (!PQsendQuery(conn, sql)) - elog(ERROR, "could not send query: %s", PQerrorMessage(conn)); + elog(ERROR, "could not send query: %s", pchomp(PQerrorMessage(conn))); if (!PQsetSingleRowMode(conn)) /* shouldn't fail */ elog(ERROR, "failed to set single-row mode for dblink query"); @@ -1366,8 +1366,8 @@ dblink_error_message(PG_FUNCTION_ARGS) DBLINK_INIT; DBLINK_GET_NAMED_CONN; - msg = PQerrorMessage(conn); - if (msg == NULL || msg[0] == '\0') + msg = pchomp(PQerrorMessage(conn)); + if (msg[0] == '\0') PG_RETURN_TEXT_P(cstring_to_text("OK")); else PG_RETURN_TEXT_P(cstring_to_text(msg)); @@ -2709,7 +2709,7 @@ dblink_res_error(PGconn *conn, const char *conname, PGresult *res, * return NULL, not a PGresult at all. */ if (message_primary == NULL) - message_primary = PQerrorMessage(conn); + message_primary = pchomp(PQerrorMessage(conn)); if (res) PQclear(res); diff --git a/contrib/dblink/expected/dblink.out b/contrib/dblink/expected/dblink.out index 5acaaf225a..4b6d26e574 100644 --- a/contrib/dblink/expected/dblink.out +++ b/contrib/dblink/expected/dblink.out @@ -377,7 +377,6 @@ FROM dblink('myconn','SELECT * FROM foo') AS t(a int, b text, c text[]) WHERE t.a > 7; ERROR: could not establish connection DETAIL: missing "=" after "myconn" in connection info string - -- create a named persistent connection SELECT dblink_connect('myconn',connection_parameters()); dblink_connect @@ -604,7 +603,6 @@ FROM dblink('myconn','SELECT * FROM foo') AS t(a int, b text, c text[]) WHERE t.a > 7; ERROR: could not establish connection DETAIL: missing "=" after "myconn" in connection info string - -- create a named persistent connection SELECT dblink_connect('myconn',connection_parameters()); dblink_connect diff --git a/contrib/postgres_fdw/connection.c b/contrib/postgres_fdw/connection.c index 7f7a744ac0..c6e3d44515 100644 --- a/contrib/postgres_fdw/connection.c +++ b/contrib/postgres_fdw/connection.c @@ -226,21 +226,11 @@ connect_pg_server(ForeignServer *server, UserMapping *user) conn = PQconnectdbParams(keywords, values, false); if (!conn || PQstatus(conn) != CONNECTION_OK) - { - char *connmessage; - int msglen; - - /* libpq typically appends a newline, strip that */ - connmessage = pstrdup(PQerrorMessage(conn)); - msglen = strlen(connmessage); - if (msglen > 0 && connmessage[msglen - 1] == '\n') - connmessage[msglen - 1] = '\0'; ereport(ERROR, (errcode(ERRCODE_SQLCLIENT_UNABLE_TO_ESTABLISH_SQLCONNECTION), errmsg("could not connect to server \"%s\"", server->servername), - errdetail_internal("%s", connmessage))); - } + errdetail_internal("%s", pchomp(PQerrorMessage(conn))))); /* * Check that non-superuser has used password to establish connection; @@ -563,7 +553,7 @@ pgfdw_report_error(int elevel, PGresult *res, PGconn *conn, * return NULL, not a PGresult at all. */ if (message_primary == NULL) - message_primary = PQerrorMessage(conn); + message_primary = pchomp(PQerrorMessage(conn)); ereport(elevel, (errcode(sqlstate), diff --git a/src/backend/replication/libpqwalreceiver/libpqwalreceiver.c b/src/backend/replication/libpqwalreceiver/libpqwalreceiver.c index 44a89c73fd..b88760fb68 100644 --- a/src/backend/replication/libpqwalreceiver/libpqwalreceiver.c +++ b/src/backend/replication/libpqwalreceiver/libpqwalreceiver.c @@ -141,7 +141,7 @@ libpqrcv_connect(const char *conninfo, bool logical, const char *appname, conn->streamConn = PQconnectdbParams(keys, vals, /* expand_dbname = */ true); if (PQstatus(conn->streamConn) != CONNECTION_OK) { - *err = pstrdup(PQerrorMessage(conn->streamConn)); + *err = pchomp(PQerrorMessage(conn->streamConn)); return NULL; } @@ -239,7 +239,7 @@ libpqrcv_identify_system(WalReceiverConn *conn, TimeLineID *primary_tli, ereport(ERROR, (errmsg("could not receive database system identifier and timeline ID from " "the primary server: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); } if (PQnfields(res) < 3 || PQntuples(res) != 1) { @@ -316,13 +316,13 @@ libpqrcv_startstreaming(WalReceiverConn *conn, if (!pubnames_str) ereport(ERROR, (errmsg("could not start WAL streaming: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); pubnames_literal = PQescapeLiteral(conn->streamConn, pubnames_str, strlen(pubnames_str)); if (!pubnames_literal) ereport(ERROR, (errmsg("could not start WAL streaming: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); appendStringInfo(&cmd, ", publication_names %s", pubnames_literal); PQfreemem(pubnames_literal); pfree(pubnames_str); @@ -347,7 +347,7 @@ libpqrcv_startstreaming(WalReceiverConn *conn, PQclear(res); ereport(ERROR, (errmsg("could not start WAL streaming: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); } PQclear(res); return true; @@ -366,7 +366,7 @@ libpqrcv_endstreaming(WalReceiverConn *conn, TimeLineID *next_tli) PQflush(conn->streamConn)) ereport(ERROR, (errmsg("could not send end-of-streaming message to primary: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); *next_tli = 0; @@ -410,7 +410,7 @@ libpqrcv_endstreaming(WalReceiverConn *conn, TimeLineID *next_tli) if (PQresultStatus(res) != PGRES_COMMAND_OK) ereport(ERROR, (errmsg("error reading result of streaming command: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); PQclear(res); /* Verify that there are no more results */ @@ -418,7 +418,7 @@ libpqrcv_endstreaming(WalReceiverConn *conn, TimeLineID *next_tli) if (res != NULL) ereport(ERROR, (errmsg("unexpected result after CommandComplete: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); } /* @@ -445,7 +445,7 @@ libpqrcv_readtimelinehistoryfile(WalReceiverConn *conn, ereport(ERROR, (errmsg("could not receive timeline history file from " "the primary server: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); } if (PQnfields(res) != 2 || PQntuples(res) != 1) { @@ -603,7 +603,7 @@ libpqrcv_receive(WalReceiverConn *conn, char **buffer, if (PQconsumeInput(conn->streamConn) == 0) ereport(ERROR, (errmsg("could not receive data from WAL stream: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); /* Now that we've consumed some input, try again */ rawlen = PQgetCopyData(conn->streamConn, &conn->recvBuf, 1); @@ -630,13 +630,13 @@ libpqrcv_receive(WalReceiverConn *conn, char **buffer, PQclear(res); ereport(ERROR, (errmsg("could not receive data from WAL stream: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); } } if (rawlen < -1) ereport(ERROR, (errmsg("could not receive data from WAL stream: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); /* Return received messages to caller */ *buffer = conn->recvBuf; @@ -655,7 +655,7 @@ libpqrcv_send(WalReceiverConn *conn, const char *buffer, int nbytes) PQflush(conn->streamConn)) ereport(ERROR, (errmsg("could not send data to WAL stream: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); } /* @@ -689,7 +689,7 @@ libpqrcv_create_slot(WalReceiverConn *conn, const char *slotname, PQclear(res); ereport(ERROR, (errmsg("could not create replication slot \"%s\": %s", - slotname, PQerrorMessage(conn->streamConn)))); + slotname, pchomp(PQerrorMessage(conn->streamConn))))); } *lsn = DatumGetLSN(DirectFunctionCall1Coll(pg_lsn_in, InvalidOid, @@ -720,7 +720,7 @@ libpqrcv_command(WalReceiverConn *conn, const char *cmd, char **err) if (PQresultStatus(res) != PGRES_COMMAND_OK) { PQclear(res); - *err = pstrdup(PQerrorMessage(conn->streamConn)); + *err = pchomp(PQerrorMessage(conn->streamConn)); return false; } diff --git a/src/backend/utils/mmgr/mcxt.c b/src/backend/utils/mmgr/mcxt.c index 6ad0bb47b6..c21dfcb96b 100644 --- a/src/backend/utils/mmgr/mcxt.c +++ b/src/backend/utils/mmgr/mcxt.c @@ -1181,3 +1181,17 @@ pnstrdup(const char *in, Size len) out[len] = '\0'; return out; } + +/* + * Make copy of string with all trailing newline characters removed. + */ +char * +pchomp(const char *in) +{ + size_t n; + + n = strlen(in); + while (n > 0 && in[n - 1] == '\n') + n--; + return pnstrdup(in, n); +} diff --git a/src/include/utils/palloc.h b/src/include/utils/palloc.h index b72fe4aee8..2e07bd57ad 100644 --- a/src/include/utils/palloc.h +++ b/src/include/utils/palloc.h @@ -127,6 +127,8 @@ extern char *MemoryContextStrdup(MemoryContext context, const char *string); extern char *pstrdup(const char *in); extern char *pnstrdup(const char *in, Size len); +extern char *pchomp(const char *in); + /* sprintf into a palloc'd buffer --- these are in psprintf.c */ extern char *psprintf(const char *fmt,...) pg_attribute_printf(1, 2); extern size_t pvsnprintf(char *buf, size_t len, const char *fmt, va_list args) pg_attribute_printf(3, 0); -- 2.11.1 --------------8DBA76FBC0D2E1B20F0C5D8D Content-Type: text/plain Content-Disposition: inline Content-Transfer-Encoding: 8bit MIME-Version: 1.0 -- Sent via pgsql-hackers mailing list ([email protected]) To make changes to your subscription: http://www.postgresql.org/mailpref/pgsql-hackers --------------8DBA76FBC0D2E1B20F0C5D8D-- ^ permalink raw reply [nested|flat] 19+ messages in thread
* [PATCH] chomp PQerrorMessage() in backend uses @ 2017-02-08 14:31 Peter Eisentraut <[email protected]> 0 siblings, 0 replies; 19+ messages in thread From: Peter Eisentraut @ 2017-02-08 14:31 UTC (permalink / raw) PQerrorMessage() returns an error message with a trailing newline, but in backend use (dblink, postgres_fdw, libpqwalreceiver), we want to have the error message without that for emitting via ereport(). To simplify that, add a function pchomp() that returns a pstrdup'ed string with the trailing newline characters removed. --- contrib/dblink/dblink.c | 16 ++++++------ contrib/dblink/expected/dblink.out | 2 -- contrib/postgres_fdw/connection.c | 14 ++-------- .../libpqwalreceiver/libpqwalreceiver.c | 30 +++++++++++----------- src/backend/utils/mmgr/mcxt.c | 14 ++++++++++ src/include/utils/palloc.h | 2 ++ 6 files changed, 41 insertions(+), 37 deletions(-) diff --git a/contrib/dblink/dblink.c b/contrib/dblink/dblink.c index ac43c458cb..db0a8ba72d 100644 --- a/contrib/dblink/dblink.c +++ b/contrib/dblink/dblink.c @@ -166,7 +166,7 @@ typedef struct remoteConnHashEnt #define DBLINK_RES_INTERNALERROR(p2) \ do { \ - msg = pstrdup(PQerrorMessage(conn)); \ + msg = pchomp(PQerrorMessage(conn)); \ if (res) \ PQclear(res); \ elog(ERROR, "%s: %s", p2, msg); \ @@ -204,7 +204,7 @@ typedef struct remoteConnHashEnt conn = PQconnectdb(connstr); \ if (PQstatus(conn) == CONNECTION_BAD) \ { \ - msg = pstrdup(PQerrorMessage(conn)); \ + msg = pchomp(PQerrorMessage(conn)); \ PQfinish(conn); \ ereport(ERROR, \ (errcode(ERRCODE_SQLCLIENT_UNABLE_TO_ESTABLISH_SQLCONNECTION), \ @@ -278,7 +278,7 @@ dblink_connect(PG_FUNCTION_ARGS) if (PQstatus(conn) == CONNECTION_BAD) { - msg = pstrdup(PQerrorMessage(conn)); + msg = pchomp(PQerrorMessage(conn)); PQfinish(conn); if (rconn) pfree(rconn); @@ -651,7 +651,7 @@ dblink_send_query(PG_FUNCTION_ARGS) /* async query send */ retval = PQsendQuery(conn, sql); if (retval != 1) - elog(NOTICE, "could not send query: %s", PQerrorMessage(conn)); + elog(NOTICE, "could not send query: %s", pchomp(PQerrorMessage(conn))); PG_RETURN_INT32(retval); } @@ -1087,7 +1087,7 @@ storeQueryResult(volatile storeInfo *sinfo, PGconn *conn, const char *sql) PGresult *res; if (!PQsendQuery(conn, sql)) - elog(ERROR, "could not send query: %s", PQerrorMessage(conn)); + elog(ERROR, "could not send query: %s", pchomp(PQerrorMessage(conn))); if (!PQsetSingleRowMode(conn)) /* shouldn't fail */ elog(ERROR, "failed to set single-row mode for dblink query"); @@ -1366,8 +1366,8 @@ dblink_error_message(PG_FUNCTION_ARGS) DBLINK_INIT; DBLINK_GET_NAMED_CONN; - msg = PQerrorMessage(conn); - if (msg == NULL || msg[0] == '\0') + msg = pchomp(PQerrorMessage(conn)); + if (msg[0] == '\0') PG_RETURN_TEXT_P(cstring_to_text("OK")); else PG_RETURN_TEXT_P(cstring_to_text(msg)); @@ -2709,7 +2709,7 @@ dblink_res_error(PGconn *conn, const char *conname, PGresult *res, * return NULL, not a PGresult at all. */ if (message_primary == NULL) - message_primary = PQerrorMessage(conn); + message_primary = pchomp(PQerrorMessage(conn)); if (res) PQclear(res); diff --git a/contrib/dblink/expected/dblink.out b/contrib/dblink/expected/dblink.out index 5acaaf225a..4b6d26e574 100644 --- a/contrib/dblink/expected/dblink.out +++ b/contrib/dblink/expected/dblink.out @@ -377,7 +377,6 @@ FROM dblink('myconn','SELECT * FROM foo') AS t(a int, b text, c text[]) WHERE t.a > 7; ERROR: could not establish connection DETAIL: missing "=" after "myconn" in connection info string - -- create a named persistent connection SELECT dblink_connect('myconn',connection_parameters()); dblink_connect @@ -604,7 +603,6 @@ FROM dblink('myconn','SELECT * FROM foo') AS t(a int, b text, c text[]) WHERE t.a > 7; ERROR: could not establish connection DETAIL: missing "=" after "myconn" in connection info string - -- create a named persistent connection SELECT dblink_connect('myconn',connection_parameters()); dblink_connect diff --git a/contrib/postgres_fdw/connection.c b/contrib/postgres_fdw/connection.c index 7f7a744ac0..c6e3d44515 100644 --- a/contrib/postgres_fdw/connection.c +++ b/contrib/postgres_fdw/connection.c @@ -226,21 +226,11 @@ connect_pg_server(ForeignServer *server, UserMapping *user) conn = PQconnectdbParams(keywords, values, false); if (!conn || PQstatus(conn) != CONNECTION_OK) - { - char *connmessage; - int msglen; - - /* libpq typically appends a newline, strip that */ - connmessage = pstrdup(PQerrorMessage(conn)); - msglen = strlen(connmessage); - if (msglen > 0 && connmessage[msglen - 1] == '\n') - connmessage[msglen - 1] = '\0'; ereport(ERROR, (errcode(ERRCODE_SQLCLIENT_UNABLE_TO_ESTABLISH_SQLCONNECTION), errmsg("could not connect to server \"%s\"", server->servername), - errdetail_internal("%s", connmessage))); - } + errdetail_internal("%s", pchomp(PQerrorMessage(conn))))); /* * Check that non-superuser has used password to establish connection; @@ -563,7 +553,7 @@ pgfdw_report_error(int elevel, PGresult *res, PGconn *conn, * return NULL, not a PGresult at all. */ if (message_primary == NULL) - message_primary = PQerrorMessage(conn); + message_primary = pchomp(PQerrorMessage(conn)); ereport(elevel, (errcode(sqlstate), diff --git a/src/backend/replication/libpqwalreceiver/libpqwalreceiver.c b/src/backend/replication/libpqwalreceiver/libpqwalreceiver.c index 44a89c73fd..b88760fb68 100644 --- a/src/backend/replication/libpqwalreceiver/libpqwalreceiver.c +++ b/src/backend/replication/libpqwalreceiver/libpqwalreceiver.c @@ -141,7 +141,7 @@ libpqrcv_connect(const char *conninfo, bool logical, const char *appname, conn->streamConn = PQconnectdbParams(keys, vals, /* expand_dbname = */ true); if (PQstatus(conn->streamConn) != CONNECTION_OK) { - *err = pstrdup(PQerrorMessage(conn->streamConn)); + *err = pchomp(PQerrorMessage(conn->streamConn)); return NULL; } @@ -239,7 +239,7 @@ libpqrcv_identify_system(WalReceiverConn *conn, TimeLineID *primary_tli, ereport(ERROR, (errmsg("could not receive database system identifier and timeline ID from " "the primary server: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); } if (PQnfields(res) < 3 || PQntuples(res) != 1) { @@ -316,13 +316,13 @@ libpqrcv_startstreaming(WalReceiverConn *conn, if (!pubnames_str) ereport(ERROR, (errmsg("could not start WAL streaming: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); pubnames_literal = PQescapeLiteral(conn->streamConn, pubnames_str, strlen(pubnames_str)); if (!pubnames_literal) ereport(ERROR, (errmsg("could not start WAL streaming: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); appendStringInfo(&cmd, ", publication_names %s", pubnames_literal); PQfreemem(pubnames_literal); pfree(pubnames_str); @@ -347,7 +347,7 @@ libpqrcv_startstreaming(WalReceiverConn *conn, PQclear(res); ereport(ERROR, (errmsg("could not start WAL streaming: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); } PQclear(res); return true; @@ -366,7 +366,7 @@ libpqrcv_endstreaming(WalReceiverConn *conn, TimeLineID *next_tli) PQflush(conn->streamConn)) ereport(ERROR, (errmsg("could not send end-of-streaming message to primary: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); *next_tli = 0; @@ -410,7 +410,7 @@ libpqrcv_endstreaming(WalReceiverConn *conn, TimeLineID *next_tli) if (PQresultStatus(res) != PGRES_COMMAND_OK) ereport(ERROR, (errmsg("error reading result of streaming command: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); PQclear(res); /* Verify that there are no more results */ @@ -418,7 +418,7 @@ libpqrcv_endstreaming(WalReceiverConn *conn, TimeLineID *next_tli) if (res != NULL) ereport(ERROR, (errmsg("unexpected result after CommandComplete: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); } /* @@ -445,7 +445,7 @@ libpqrcv_readtimelinehistoryfile(WalReceiverConn *conn, ereport(ERROR, (errmsg("could not receive timeline history file from " "the primary server: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); } if (PQnfields(res) != 2 || PQntuples(res) != 1) { @@ -603,7 +603,7 @@ libpqrcv_receive(WalReceiverConn *conn, char **buffer, if (PQconsumeInput(conn->streamConn) == 0) ereport(ERROR, (errmsg("could not receive data from WAL stream: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); /* Now that we've consumed some input, try again */ rawlen = PQgetCopyData(conn->streamConn, &conn->recvBuf, 1); @@ -630,13 +630,13 @@ libpqrcv_receive(WalReceiverConn *conn, char **buffer, PQclear(res); ereport(ERROR, (errmsg("could not receive data from WAL stream: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); } } if (rawlen < -1) ereport(ERROR, (errmsg("could not receive data from WAL stream: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); /* Return received messages to caller */ *buffer = conn->recvBuf; @@ -655,7 +655,7 @@ libpqrcv_send(WalReceiverConn *conn, const char *buffer, int nbytes) PQflush(conn->streamConn)) ereport(ERROR, (errmsg("could not send data to WAL stream: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); } /* @@ -689,7 +689,7 @@ libpqrcv_create_slot(WalReceiverConn *conn, const char *slotname, PQclear(res); ereport(ERROR, (errmsg("could not create replication slot \"%s\": %s", - slotname, PQerrorMessage(conn->streamConn)))); + slotname, pchomp(PQerrorMessage(conn->streamConn))))); } *lsn = DatumGetLSN(DirectFunctionCall1Coll(pg_lsn_in, InvalidOid, @@ -720,7 +720,7 @@ libpqrcv_command(WalReceiverConn *conn, const char *cmd, char **err) if (PQresultStatus(res) != PGRES_COMMAND_OK) { PQclear(res); - *err = pstrdup(PQerrorMessage(conn->streamConn)); + *err = pchomp(PQerrorMessage(conn->streamConn)); return false; } diff --git a/src/backend/utils/mmgr/mcxt.c b/src/backend/utils/mmgr/mcxt.c index 6ad0bb47b6..c21dfcb96b 100644 --- a/src/backend/utils/mmgr/mcxt.c +++ b/src/backend/utils/mmgr/mcxt.c @@ -1181,3 +1181,17 @@ pnstrdup(const char *in, Size len) out[len] = '\0'; return out; } + +/* + * Make copy of string with all trailing newline characters removed. + */ +char * +pchomp(const char *in) +{ + size_t n; + + n = strlen(in); + while (n > 0 && in[n - 1] == '\n') + n--; + return pnstrdup(in, n); +} diff --git a/src/include/utils/palloc.h b/src/include/utils/palloc.h index b72fe4aee8..2e07bd57ad 100644 --- a/src/include/utils/palloc.h +++ b/src/include/utils/palloc.h @@ -127,6 +127,8 @@ extern char *MemoryContextStrdup(MemoryContext context, const char *string); extern char *pstrdup(const char *in); extern char *pnstrdup(const char *in, Size len); +extern char *pchomp(const char *in); + /* sprintf into a palloc'd buffer --- these are in psprintf.c */ extern char *psprintf(const char *fmt,...) pg_attribute_printf(1, 2); extern size_t pvsnprintf(char *buf, size_t len, const char *fmt, va_list args) pg_attribute_printf(3, 0); -- 2.11.1 --------------8DBA76FBC0D2E1B20F0C5D8D Content-Type: text/plain Content-Disposition: inline Content-Transfer-Encoding: 8bit MIME-Version: 1.0 -- Sent via pgsql-hackers mailing list ([email protected]) To make changes to your subscription: http://www.postgresql.org/mailpref/pgsql-hackers --------------8DBA76FBC0D2E1B20F0C5D8D-- ^ permalink raw reply [nested|flat] 19+ messages in thread
* [PATCH] chomp PQerrorMessage() in backend uses @ 2017-02-08 14:31 Peter Eisentraut <[email protected]> 0 siblings, 0 replies; 19+ messages in thread From: Peter Eisentraut @ 2017-02-08 14:31 UTC (permalink / raw) PQerrorMessage() returns an error message with a trailing newline, but in backend use (dblink, postgres_fdw, libpqwalreceiver), we want to have the error message without that for emitting via ereport(). To simplify that, add a function pchomp() that returns a pstrdup'ed string with the trailing newline characters removed. --- contrib/dblink/dblink.c | 16 ++++++------ contrib/dblink/expected/dblink.out | 2 -- contrib/postgres_fdw/connection.c | 14 ++-------- .../libpqwalreceiver/libpqwalreceiver.c | 30 +++++++++++----------- src/backend/utils/mmgr/mcxt.c | 14 ++++++++++ src/include/utils/palloc.h | 2 ++ 6 files changed, 41 insertions(+), 37 deletions(-) diff --git a/contrib/dblink/dblink.c b/contrib/dblink/dblink.c index ac43c458cb..db0a8ba72d 100644 --- a/contrib/dblink/dblink.c +++ b/contrib/dblink/dblink.c @@ -166,7 +166,7 @@ typedef struct remoteConnHashEnt #define DBLINK_RES_INTERNALERROR(p2) \ do { \ - msg = pstrdup(PQerrorMessage(conn)); \ + msg = pchomp(PQerrorMessage(conn)); \ if (res) \ PQclear(res); \ elog(ERROR, "%s: %s", p2, msg); \ @@ -204,7 +204,7 @@ typedef struct remoteConnHashEnt conn = PQconnectdb(connstr); \ if (PQstatus(conn) == CONNECTION_BAD) \ { \ - msg = pstrdup(PQerrorMessage(conn)); \ + msg = pchomp(PQerrorMessage(conn)); \ PQfinish(conn); \ ereport(ERROR, \ (errcode(ERRCODE_SQLCLIENT_UNABLE_TO_ESTABLISH_SQLCONNECTION), \ @@ -278,7 +278,7 @@ dblink_connect(PG_FUNCTION_ARGS) if (PQstatus(conn) == CONNECTION_BAD) { - msg = pstrdup(PQerrorMessage(conn)); + msg = pchomp(PQerrorMessage(conn)); PQfinish(conn); if (rconn) pfree(rconn); @@ -651,7 +651,7 @@ dblink_send_query(PG_FUNCTION_ARGS) /* async query send */ retval = PQsendQuery(conn, sql); if (retval != 1) - elog(NOTICE, "could not send query: %s", PQerrorMessage(conn)); + elog(NOTICE, "could not send query: %s", pchomp(PQerrorMessage(conn))); PG_RETURN_INT32(retval); } @@ -1087,7 +1087,7 @@ storeQueryResult(volatile storeInfo *sinfo, PGconn *conn, const char *sql) PGresult *res; if (!PQsendQuery(conn, sql)) - elog(ERROR, "could not send query: %s", PQerrorMessage(conn)); + elog(ERROR, "could not send query: %s", pchomp(PQerrorMessage(conn))); if (!PQsetSingleRowMode(conn)) /* shouldn't fail */ elog(ERROR, "failed to set single-row mode for dblink query"); @@ -1366,8 +1366,8 @@ dblink_error_message(PG_FUNCTION_ARGS) DBLINK_INIT; DBLINK_GET_NAMED_CONN; - msg = PQerrorMessage(conn); - if (msg == NULL || msg[0] == '\0') + msg = pchomp(PQerrorMessage(conn)); + if (msg[0] == '\0') PG_RETURN_TEXT_P(cstring_to_text("OK")); else PG_RETURN_TEXT_P(cstring_to_text(msg)); @@ -2709,7 +2709,7 @@ dblink_res_error(PGconn *conn, const char *conname, PGresult *res, * return NULL, not a PGresult at all. */ if (message_primary == NULL) - message_primary = PQerrorMessage(conn); + message_primary = pchomp(PQerrorMessage(conn)); if (res) PQclear(res); diff --git a/contrib/dblink/expected/dblink.out b/contrib/dblink/expected/dblink.out index 5acaaf225a..4b6d26e574 100644 --- a/contrib/dblink/expected/dblink.out +++ b/contrib/dblink/expected/dblink.out @@ -377,7 +377,6 @@ FROM dblink('myconn','SELECT * FROM foo') AS t(a int, b text, c text[]) WHERE t.a > 7; ERROR: could not establish connection DETAIL: missing "=" after "myconn" in connection info string - -- create a named persistent connection SELECT dblink_connect('myconn',connection_parameters()); dblink_connect @@ -604,7 +603,6 @@ FROM dblink('myconn','SELECT * FROM foo') AS t(a int, b text, c text[]) WHERE t.a > 7; ERROR: could not establish connection DETAIL: missing "=" after "myconn" in connection info string - -- create a named persistent connection SELECT dblink_connect('myconn',connection_parameters()); dblink_connect diff --git a/contrib/postgres_fdw/connection.c b/contrib/postgres_fdw/connection.c index 7f7a744ac0..c6e3d44515 100644 --- a/contrib/postgres_fdw/connection.c +++ b/contrib/postgres_fdw/connection.c @@ -226,21 +226,11 @@ connect_pg_server(ForeignServer *server, UserMapping *user) conn = PQconnectdbParams(keywords, values, false); if (!conn || PQstatus(conn) != CONNECTION_OK) - { - char *connmessage; - int msglen; - - /* libpq typically appends a newline, strip that */ - connmessage = pstrdup(PQerrorMessage(conn)); - msglen = strlen(connmessage); - if (msglen > 0 && connmessage[msglen - 1] == '\n') - connmessage[msglen - 1] = '\0'; ereport(ERROR, (errcode(ERRCODE_SQLCLIENT_UNABLE_TO_ESTABLISH_SQLCONNECTION), errmsg("could not connect to server \"%s\"", server->servername), - errdetail_internal("%s", connmessage))); - } + errdetail_internal("%s", pchomp(PQerrorMessage(conn))))); /* * Check that non-superuser has used password to establish connection; @@ -563,7 +553,7 @@ pgfdw_report_error(int elevel, PGresult *res, PGconn *conn, * return NULL, not a PGresult at all. */ if (message_primary == NULL) - message_primary = PQerrorMessage(conn); + message_primary = pchomp(PQerrorMessage(conn)); ereport(elevel, (errcode(sqlstate), diff --git a/src/backend/replication/libpqwalreceiver/libpqwalreceiver.c b/src/backend/replication/libpqwalreceiver/libpqwalreceiver.c index 44a89c73fd..b88760fb68 100644 --- a/src/backend/replication/libpqwalreceiver/libpqwalreceiver.c +++ b/src/backend/replication/libpqwalreceiver/libpqwalreceiver.c @@ -141,7 +141,7 @@ libpqrcv_connect(const char *conninfo, bool logical, const char *appname, conn->streamConn = PQconnectdbParams(keys, vals, /* expand_dbname = */ true); if (PQstatus(conn->streamConn) != CONNECTION_OK) { - *err = pstrdup(PQerrorMessage(conn->streamConn)); + *err = pchomp(PQerrorMessage(conn->streamConn)); return NULL; } @@ -239,7 +239,7 @@ libpqrcv_identify_system(WalReceiverConn *conn, TimeLineID *primary_tli, ereport(ERROR, (errmsg("could not receive database system identifier and timeline ID from " "the primary server: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); } if (PQnfields(res) < 3 || PQntuples(res) != 1) { @@ -316,13 +316,13 @@ libpqrcv_startstreaming(WalReceiverConn *conn, if (!pubnames_str) ereport(ERROR, (errmsg("could not start WAL streaming: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); pubnames_literal = PQescapeLiteral(conn->streamConn, pubnames_str, strlen(pubnames_str)); if (!pubnames_literal) ereport(ERROR, (errmsg("could not start WAL streaming: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); appendStringInfo(&cmd, ", publication_names %s", pubnames_literal); PQfreemem(pubnames_literal); pfree(pubnames_str); @@ -347,7 +347,7 @@ libpqrcv_startstreaming(WalReceiverConn *conn, PQclear(res); ereport(ERROR, (errmsg("could not start WAL streaming: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); } PQclear(res); return true; @@ -366,7 +366,7 @@ libpqrcv_endstreaming(WalReceiverConn *conn, TimeLineID *next_tli) PQflush(conn->streamConn)) ereport(ERROR, (errmsg("could not send end-of-streaming message to primary: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); *next_tli = 0; @@ -410,7 +410,7 @@ libpqrcv_endstreaming(WalReceiverConn *conn, TimeLineID *next_tli) if (PQresultStatus(res) != PGRES_COMMAND_OK) ereport(ERROR, (errmsg("error reading result of streaming command: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); PQclear(res); /* Verify that there are no more results */ @@ -418,7 +418,7 @@ libpqrcv_endstreaming(WalReceiverConn *conn, TimeLineID *next_tli) if (res != NULL) ereport(ERROR, (errmsg("unexpected result after CommandComplete: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); } /* @@ -445,7 +445,7 @@ libpqrcv_readtimelinehistoryfile(WalReceiverConn *conn, ereport(ERROR, (errmsg("could not receive timeline history file from " "the primary server: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); } if (PQnfields(res) != 2 || PQntuples(res) != 1) { @@ -603,7 +603,7 @@ libpqrcv_receive(WalReceiverConn *conn, char **buffer, if (PQconsumeInput(conn->streamConn) == 0) ereport(ERROR, (errmsg("could not receive data from WAL stream: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); /* Now that we've consumed some input, try again */ rawlen = PQgetCopyData(conn->streamConn, &conn->recvBuf, 1); @@ -630,13 +630,13 @@ libpqrcv_receive(WalReceiverConn *conn, char **buffer, PQclear(res); ereport(ERROR, (errmsg("could not receive data from WAL stream: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); } } if (rawlen < -1) ereport(ERROR, (errmsg("could not receive data from WAL stream: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); /* Return received messages to caller */ *buffer = conn->recvBuf; @@ -655,7 +655,7 @@ libpqrcv_send(WalReceiverConn *conn, const char *buffer, int nbytes) PQflush(conn->streamConn)) ereport(ERROR, (errmsg("could not send data to WAL stream: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); } /* @@ -689,7 +689,7 @@ libpqrcv_create_slot(WalReceiverConn *conn, const char *slotname, PQclear(res); ereport(ERROR, (errmsg("could not create replication slot \"%s\": %s", - slotname, PQerrorMessage(conn->streamConn)))); + slotname, pchomp(PQerrorMessage(conn->streamConn))))); } *lsn = DatumGetLSN(DirectFunctionCall1Coll(pg_lsn_in, InvalidOid, @@ -720,7 +720,7 @@ libpqrcv_command(WalReceiverConn *conn, const char *cmd, char **err) if (PQresultStatus(res) != PGRES_COMMAND_OK) { PQclear(res); - *err = pstrdup(PQerrorMessage(conn->streamConn)); + *err = pchomp(PQerrorMessage(conn->streamConn)); return false; } diff --git a/src/backend/utils/mmgr/mcxt.c b/src/backend/utils/mmgr/mcxt.c index 6ad0bb47b6..c21dfcb96b 100644 --- a/src/backend/utils/mmgr/mcxt.c +++ b/src/backend/utils/mmgr/mcxt.c @@ -1181,3 +1181,17 @@ pnstrdup(const char *in, Size len) out[len] = '\0'; return out; } + +/* + * Make copy of string with all trailing newline characters removed. + */ +char * +pchomp(const char *in) +{ + size_t n; + + n = strlen(in); + while (n > 0 && in[n - 1] == '\n') + n--; + return pnstrdup(in, n); +} diff --git a/src/include/utils/palloc.h b/src/include/utils/palloc.h index b72fe4aee8..2e07bd57ad 100644 --- a/src/include/utils/palloc.h +++ b/src/include/utils/palloc.h @@ -127,6 +127,8 @@ extern char *MemoryContextStrdup(MemoryContext context, const char *string); extern char *pstrdup(const char *in); extern char *pnstrdup(const char *in, Size len); +extern char *pchomp(const char *in); + /* sprintf into a palloc'd buffer --- these are in psprintf.c */ extern char *psprintf(const char *fmt,...) pg_attribute_printf(1, 2); extern size_t pvsnprintf(char *buf, size_t len, const char *fmt, va_list args) pg_attribute_printf(3, 0); -- 2.11.1 --------------8DBA76FBC0D2E1B20F0C5D8D Content-Type: text/plain Content-Disposition: inline Content-Transfer-Encoding: 8bit MIME-Version: 1.0 -- Sent via pgsql-hackers mailing list ([email protected]) To make changes to your subscription: http://www.postgresql.org/mailpref/pgsql-hackers --------------8DBA76FBC0D2E1B20F0C5D8D-- ^ permalink raw reply [nested|flat] 19+ messages in thread
* [PATCH] chomp PQerrorMessage() in backend uses @ 2017-02-08 14:31 Peter Eisentraut <[email protected]> 0 siblings, 0 replies; 19+ messages in thread From: Peter Eisentraut @ 2017-02-08 14:31 UTC (permalink / raw) PQerrorMessage() returns an error message with a trailing newline, but in backend use (dblink, postgres_fdw, libpqwalreceiver), we want to have the error message without that for emitting via ereport(). To simplify that, add a function pchomp() that returns a pstrdup'ed string with the trailing newline characters removed. --- contrib/dblink/dblink.c | 16 ++++++------ contrib/dblink/expected/dblink.out | 2 -- contrib/postgres_fdw/connection.c | 14 ++-------- .../libpqwalreceiver/libpqwalreceiver.c | 30 +++++++++++----------- src/backend/utils/mmgr/mcxt.c | 14 ++++++++++ src/include/utils/palloc.h | 2 ++ 6 files changed, 41 insertions(+), 37 deletions(-) diff --git a/contrib/dblink/dblink.c b/contrib/dblink/dblink.c index ac43c458cb..db0a8ba72d 100644 --- a/contrib/dblink/dblink.c +++ b/contrib/dblink/dblink.c @@ -166,7 +166,7 @@ typedef struct remoteConnHashEnt #define DBLINK_RES_INTERNALERROR(p2) \ do { \ - msg = pstrdup(PQerrorMessage(conn)); \ + msg = pchomp(PQerrorMessage(conn)); \ if (res) \ PQclear(res); \ elog(ERROR, "%s: %s", p2, msg); \ @@ -204,7 +204,7 @@ typedef struct remoteConnHashEnt conn = PQconnectdb(connstr); \ if (PQstatus(conn) == CONNECTION_BAD) \ { \ - msg = pstrdup(PQerrorMessage(conn)); \ + msg = pchomp(PQerrorMessage(conn)); \ PQfinish(conn); \ ereport(ERROR, \ (errcode(ERRCODE_SQLCLIENT_UNABLE_TO_ESTABLISH_SQLCONNECTION), \ @@ -278,7 +278,7 @@ dblink_connect(PG_FUNCTION_ARGS) if (PQstatus(conn) == CONNECTION_BAD) { - msg = pstrdup(PQerrorMessage(conn)); + msg = pchomp(PQerrorMessage(conn)); PQfinish(conn); if (rconn) pfree(rconn); @@ -651,7 +651,7 @@ dblink_send_query(PG_FUNCTION_ARGS) /* async query send */ retval = PQsendQuery(conn, sql); if (retval != 1) - elog(NOTICE, "could not send query: %s", PQerrorMessage(conn)); + elog(NOTICE, "could not send query: %s", pchomp(PQerrorMessage(conn))); PG_RETURN_INT32(retval); } @@ -1087,7 +1087,7 @@ storeQueryResult(volatile storeInfo *sinfo, PGconn *conn, const char *sql) PGresult *res; if (!PQsendQuery(conn, sql)) - elog(ERROR, "could not send query: %s", PQerrorMessage(conn)); + elog(ERROR, "could not send query: %s", pchomp(PQerrorMessage(conn))); if (!PQsetSingleRowMode(conn)) /* shouldn't fail */ elog(ERROR, "failed to set single-row mode for dblink query"); @@ -1366,8 +1366,8 @@ dblink_error_message(PG_FUNCTION_ARGS) DBLINK_INIT; DBLINK_GET_NAMED_CONN; - msg = PQerrorMessage(conn); - if (msg == NULL || msg[0] == '\0') + msg = pchomp(PQerrorMessage(conn)); + if (msg[0] == '\0') PG_RETURN_TEXT_P(cstring_to_text("OK")); else PG_RETURN_TEXT_P(cstring_to_text(msg)); @@ -2709,7 +2709,7 @@ dblink_res_error(PGconn *conn, const char *conname, PGresult *res, * return NULL, not a PGresult at all. */ if (message_primary == NULL) - message_primary = PQerrorMessage(conn); + message_primary = pchomp(PQerrorMessage(conn)); if (res) PQclear(res); diff --git a/contrib/dblink/expected/dblink.out b/contrib/dblink/expected/dblink.out index 5acaaf225a..4b6d26e574 100644 --- a/contrib/dblink/expected/dblink.out +++ b/contrib/dblink/expected/dblink.out @@ -377,7 +377,6 @@ FROM dblink('myconn','SELECT * FROM foo') AS t(a int, b text, c text[]) WHERE t.a > 7; ERROR: could not establish connection DETAIL: missing "=" after "myconn" in connection info string - -- create a named persistent connection SELECT dblink_connect('myconn',connection_parameters()); dblink_connect @@ -604,7 +603,6 @@ FROM dblink('myconn','SELECT * FROM foo') AS t(a int, b text, c text[]) WHERE t.a > 7; ERROR: could not establish connection DETAIL: missing "=" after "myconn" in connection info string - -- create a named persistent connection SELECT dblink_connect('myconn',connection_parameters()); dblink_connect diff --git a/contrib/postgres_fdw/connection.c b/contrib/postgres_fdw/connection.c index 7f7a744ac0..c6e3d44515 100644 --- a/contrib/postgres_fdw/connection.c +++ b/contrib/postgres_fdw/connection.c @@ -226,21 +226,11 @@ connect_pg_server(ForeignServer *server, UserMapping *user) conn = PQconnectdbParams(keywords, values, false); if (!conn || PQstatus(conn) != CONNECTION_OK) - { - char *connmessage; - int msglen; - - /* libpq typically appends a newline, strip that */ - connmessage = pstrdup(PQerrorMessage(conn)); - msglen = strlen(connmessage); - if (msglen > 0 && connmessage[msglen - 1] == '\n') - connmessage[msglen - 1] = '\0'; ereport(ERROR, (errcode(ERRCODE_SQLCLIENT_UNABLE_TO_ESTABLISH_SQLCONNECTION), errmsg("could not connect to server \"%s\"", server->servername), - errdetail_internal("%s", connmessage))); - } + errdetail_internal("%s", pchomp(PQerrorMessage(conn))))); /* * Check that non-superuser has used password to establish connection; @@ -563,7 +553,7 @@ pgfdw_report_error(int elevel, PGresult *res, PGconn *conn, * return NULL, not a PGresult at all. */ if (message_primary == NULL) - message_primary = PQerrorMessage(conn); + message_primary = pchomp(PQerrorMessage(conn)); ereport(elevel, (errcode(sqlstate), diff --git a/src/backend/replication/libpqwalreceiver/libpqwalreceiver.c b/src/backend/replication/libpqwalreceiver/libpqwalreceiver.c index 44a89c73fd..b88760fb68 100644 --- a/src/backend/replication/libpqwalreceiver/libpqwalreceiver.c +++ b/src/backend/replication/libpqwalreceiver/libpqwalreceiver.c @@ -141,7 +141,7 @@ libpqrcv_connect(const char *conninfo, bool logical, const char *appname, conn->streamConn = PQconnectdbParams(keys, vals, /* expand_dbname = */ true); if (PQstatus(conn->streamConn) != CONNECTION_OK) { - *err = pstrdup(PQerrorMessage(conn->streamConn)); + *err = pchomp(PQerrorMessage(conn->streamConn)); return NULL; } @@ -239,7 +239,7 @@ libpqrcv_identify_system(WalReceiverConn *conn, TimeLineID *primary_tli, ereport(ERROR, (errmsg("could not receive database system identifier and timeline ID from " "the primary server: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); } if (PQnfields(res) < 3 || PQntuples(res) != 1) { @@ -316,13 +316,13 @@ libpqrcv_startstreaming(WalReceiverConn *conn, if (!pubnames_str) ereport(ERROR, (errmsg("could not start WAL streaming: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); pubnames_literal = PQescapeLiteral(conn->streamConn, pubnames_str, strlen(pubnames_str)); if (!pubnames_literal) ereport(ERROR, (errmsg("could not start WAL streaming: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); appendStringInfo(&cmd, ", publication_names %s", pubnames_literal); PQfreemem(pubnames_literal); pfree(pubnames_str); @@ -347,7 +347,7 @@ libpqrcv_startstreaming(WalReceiverConn *conn, PQclear(res); ereport(ERROR, (errmsg("could not start WAL streaming: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); } PQclear(res); return true; @@ -366,7 +366,7 @@ libpqrcv_endstreaming(WalReceiverConn *conn, TimeLineID *next_tli) PQflush(conn->streamConn)) ereport(ERROR, (errmsg("could not send end-of-streaming message to primary: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); *next_tli = 0; @@ -410,7 +410,7 @@ libpqrcv_endstreaming(WalReceiverConn *conn, TimeLineID *next_tli) if (PQresultStatus(res) != PGRES_COMMAND_OK) ereport(ERROR, (errmsg("error reading result of streaming command: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); PQclear(res); /* Verify that there are no more results */ @@ -418,7 +418,7 @@ libpqrcv_endstreaming(WalReceiverConn *conn, TimeLineID *next_tli) if (res != NULL) ereport(ERROR, (errmsg("unexpected result after CommandComplete: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); } /* @@ -445,7 +445,7 @@ libpqrcv_readtimelinehistoryfile(WalReceiverConn *conn, ereport(ERROR, (errmsg("could not receive timeline history file from " "the primary server: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); } if (PQnfields(res) != 2 || PQntuples(res) != 1) { @@ -603,7 +603,7 @@ libpqrcv_receive(WalReceiverConn *conn, char **buffer, if (PQconsumeInput(conn->streamConn) == 0) ereport(ERROR, (errmsg("could not receive data from WAL stream: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); /* Now that we've consumed some input, try again */ rawlen = PQgetCopyData(conn->streamConn, &conn->recvBuf, 1); @@ -630,13 +630,13 @@ libpqrcv_receive(WalReceiverConn *conn, char **buffer, PQclear(res); ereport(ERROR, (errmsg("could not receive data from WAL stream: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); } } if (rawlen < -1) ereport(ERROR, (errmsg("could not receive data from WAL stream: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); /* Return received messages to caller */ *buffer = conn->recvBuf; @@ -655,7 +655,7 @@ libpqrcv_send(WalReceiverConn *conn, const char *buffer, int nbytes) PQflush(conn->streamConn)) ereport(ERROR, (errmsg("could not send data to WAL stream: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); } /* @@ -689,7 +689,7 @@ libpqrcv_create_slot(WalReceiverConn *conn, const char *slotname, PQclear(res); ereport(ERROR, (errmsg("could not create replication slot \"%s\": %s", - slotname, PQerrorMessage(conn->streamConn)))); + slotname, pchomp(PQerrorMessage(conn->streamConn))))); } *lsn = DatumGetLSN(DirectFunctionCall1Coll(pg_lsn_in, InvalidOid, @@ -720,7 +720,7 @@ libpqrcv_command(WalReceiverConn *conn, const char *cmd, char **err) if (PQresultStatus(res) != PGRES_COMMAND_OK) { PQclear(res); - *err = pstrdup(PQerrorMessage(conn->streamConn)); + *err = pchomp(PQerrorMessage(conn->streamConn)); return false; } diff --git a/src/backend/utils/mmgr/mcxt.c b/src/backend/utils/mmgr/mcxt.c index 6ad0bb47b6..c21dfcb96b 100644 --- a/src/backend/utils/mmgr/mcxt.c +++ b/src/backend/utils/mmgr/mcxt.c @@ -1181,3 +1181,17 @@ pnstrdup(const char *in, Size len) out[len] = '\0'; return out; } + +/* + * Make copy of string with all trailing newline characters removed. + */ +char * +pchomp(const char *in) +{ + size_t n; + + n = strlen(in); + while (n > 0 && in[n - 1] == '\n') + n--; + return pnstrdup(in, n); +} diff --git a/src/include/utils/palloc.h b/src/include/utils/palloc.h index b72fe4aee8..2e07bd57ad 100644 --- a/src/include/utils/palloc.h +++ b/src/include/utils/palloc.h @@ -127,6 +127,8 @@ extern char *MemoryContextStrdup(MemoryContext context, const char *string); extern char *pstrdup(const char *in); extern char *pnstrdup(const char *in, Size len); +extern char *pchomp(const char *in); + /* sprintf into a palloc'd buffer --- these are in psprintf.c */ extern char *psprintf(const char *fmt,...) pg_attribute_printf(1, 2); extern size_t pvsnprintf(char *buf, size_t len, const char *fmt, va_list args) pg_attribute_printf(3, 0); -- 2.11.1 --------------8DBA76FBC0D2E1B20F0C5D8D Content-Type: text/plain Content-Disposition: inline Content-Transfer-Encoding: 8bit MIME-Version: 1.0 -- Sent via pgsql-hackers mailing list ([email protected]) To make changes to your subscription: http://www.postgresql.org/mailpref/pgsql-hackers --------------8DBA76FBC0D2E1B20F0C5D8D-- ^ permalink raw reply [nested|flat] 19+ messages in thread
* [PATCH] chomp PQerrorMessage() in backend uses @ 2017-02-08 14:31 Peter Eisentraut <[email protected]> 0 siblings, 0 replies; 19+ messages in thread From: Peter Eisentraut @ 2017-02-08 14:31 UTC (permalink / raw) PQerrorMessage() returns an error message with a trailing newline, but in backend use (dblink, postgres_fdw, libpqwalreceiver), we want to have the error message without that for emitting via ereport(). To simplify that, add a function pchomp() that returns a pstrdup'ed string with the trailing newline characters removed. --- contrib/dblink/dblink.c | 16 ++++++------ contrib/dblink/expected/dblink.out | 2 -- contrib/postgres_fdw/connection.c | 14 ++-------- .../libpqwalreceiver/libpqwalreceiver.c | 30 +++++++++++----------- src/backend/utils/mmgr/mcxt.c | 14 ++++++++++ src/include/utils/palloc.h | 2 ++ 6 files changed, 41 insertions(+), 37 deletions(-) diff --git a/contrib/dblink/dblink.c b/contrib/dblink/dblink.c index ac43c458cb..db0a8ba72d 100644 --- a/contrib/dblink/dblink.c +++ b/contrib/dblink/dblink.c @@ -166,7 +166,7 @@ typedef struct remoteConnHashEnt #define DBLINK_RES_INTERNALERROR(p2) \ do { \ - msg = pstrdup(PQerrorMessage(conn)); \ + msg = pchomp(PQerrorMessage(conn)); \ if (res) \ PQclear(res); \ elog(ERROR, "%s: %s", p2, msg); \ @@ -204,7 +204,7 @@ typedef struct remoteConnHashEnt conn = PQconnectdb(connstr); \ if (PQstatus(conn) == CONNECTION_BAD) \ { \ - msg = pstrdup(PQerrorMessage(conn)); \ + msg = pchomp(PQerrorMessage(conn)); \ PQfinish(conn); \ ereport(ERROR, \ (errcode(ERRCODE_SQLCLIENT_UNABLE_TO_ESTABLISH_SQLCONNECTION), \ @@ -278,7 +278,7 @@ dblink_connect(PG_FUNCTION_ARGS) if (PQstatus(conn) == CONNECTION_BAD) { - msg = pstrdup(PQerrorMessage(conn)); + msg = pchomp(PQerrorMessage(conn)); PQfinish(conn); if (rconn) pfree(rconn); @@ -651,7 +651,7 @@ dblink_send_query(PG_FUNCTION_ARGS) /* async query send */ retval = PQsendQuery(conn, sql); if (retval != 1) - elog(NOTICE, "could not send query: %s", PQerrorMessage(conn)); + elog(NOTICE, "could not send query: %s", pchomp(PQerrorMessage(conn))); PG_RETURN_INT32(retval); } @@ -1087,7 +1087,7 @@ storeQueryResult(volatile storeInfo *sinfo, PGconn *conn, const char *sql) PGresult *res; if (!PQsendQuery(conn, sql)) - elog(ERROR, "could not send query: %s", PQerrorMessage(conn)); + elog(ERROR, "could not send query: %s", pchomp(PQerrorMessage(conn))); if (!PQsetSingleRowMode(conn)) /* shouldn't fail */ elog(ERROR, "failed to set single-row mode for dblink query"); @@ -1366,8 +1366,8 @@ dblink_error_message(PG_FUNCTION_ARGS) DBLINK_INIT; DBLINK_GET_NAMED_CONN; - msg = PQerrorMessage(conn); - if (msg == NULL || msg[0] == '\0') + msg = pchomp(PQerrorMessage(conn)); + if (msg[0] == '\0') PG_RETURN_TEXT_P(cstring_to_text("OK")); else PG_RETURN_TEXT_P(cstring_to_text(msg)); @@ -2709,7 +2709,7 @@ dblink_res_error(PGconn *conn, const char *conname, PGresult *res, * return NULL, not a PGresult at all. */ if (message_primary == NULL) - message_primary = PQerrorMessage(conn); + message_primary = pchomp(PQerrorMessage(conn)); if (res) PQclear(res); diff --git a/contrib/dblink/expected/dblink.out b/contrib/dblink/expected/dblink.out index 5acaaf225a..4b6d26e574 100644 --- a/contrib/dblink/expected/dblink.out +++ b/contrib/dblink/expected/dblink.out @@ -377,7 +377,6 @@ FROM dblink('myconn','SELECT * FROM foo') AS t(a int, b text, c text[]) WHERE t.a > 7; ERROR: could not establish connection DETAIL: missing "=" after "myconn" in connection info string - -- create a named persistent connection SELECT dblink_connect('myconn',connection_parameters()); dblink_connect @@ -604,7 +603,6 @@ FROM dblink('myconn','SELECT * FROM foo') AS t(a int, b text, c text[]) WHERE t.a > 7; ERROR: could not establish connection DETAIL: missing "=" after "myconn" in connection info string - -- create a named persistent connection SELECT dblink_connect('myconn',connection_parameters()); dblink_connect diff --git a/contrib/postgres_fdw/connection.c b/contrib/postgres_fdw/connection.c index 7f7a744ac0..c6e3d44515 100644 --- a/contrib/postgres_fdw/connection.c +++ b/contrib/postgres_fdw/connection.c @@ -226,21 +226,11 @@ connect_pg_server(ForeignServer *server, UserMapping *user) conn = PQconnectdbParams(keywords, values, false); if (!conn || PQstatus(conn) != CONNECTION_OK) - { - char *connmessage; - int msglen; - - /* libpq typically appends a newline, strip that */ - connmessage = pstrdup(PQerrorMessage(conn)); - msglen = strlen(connmessage); - if (msglen > 0 && connmessage[msglen - 1] == '\n') - connmessage[msglen - 1] = '\0'; ereport(ERROR, (errcode(ERRCODE_SQLCLIENT_UNABLE_TO_ESTABLISH_SQLCONNECTION), errmsg("could not connect to server \"%s\"", server->servername), - errdetail_internal("%s", connmessage))); - } + errdetail_internal("%s", pchomp(PQerrorMessage(conn))))); /* * Check that non-superuser has used password to establish connection; @@ -563,7 +553,7 @@ pgfdw_report_error(int elevel, PGresult *res, PGconn *conn, * return NULL, not a PGresult at all. */ if (message_primary == NULL) - message_primary = PQerrorMessage(conn); + message_primary = pchomp(PQerrorMessage(conn)); ereport(elevel, (errcode(sqlstate), diff --git a/src/backend/replication/libpqwalreceiver/libpqwalreceiver.c b/src/backend/replication/libpqwalreceiver/libpqwalreceiver.c index 44a89c73fd..b88760fb68 100644 --- a/src/backend/replication/libpqwalreceiver/libpqwalreceiver.c +++ b/src/backend/replication/libpqwalreceiver/libpqwalreceiver.c @@ -141,7 +141,7 @@ libpqrcv_connect(const char *conninfo, bool logical, const char *appname, conn->streamConn = PQconnectdbParams(keys, vals, /* expand_dbname = */ true); if (PQstatus(conn->streamConn) != CONNECTION_OK) { - *err = pstrdup(PQerrorMessage(conn->streamConn)); + *err = pchomp(PQerrorMessage(conn->streamConn)); return NULL; } @@ -239,7 +239,7 @@ libpqrcv_identify_system(WalReceiverConn *conn, TimeLineID *primary_tli, ereport(ERROR, (errmsg("could not receive database system identifier and timeline ID from " "the primary server: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); } if (PQnfields(res) < 3 || PQntuples(res) != 1) { @@ -316,13 +316,13 @@ libpqrcv_startstreaming(WalReceiverConn *conn, if (!pubnames_str) ereport(ERROR, (errmsg("could not start WAL streaming: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); pubnames_literal = PQescapeLiteral(conn->streamConn, pubnames_str, strlen(pubnames_str)); if (!pubnames_literal) ereport(ERROR, (errmsg("could not start WAL streaming: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); appendStringInfo(&cmd, ", publication_names %s", pubnames_literal); PQfreemem(pubnames_literal); pfree(pubnames_str); @@ -347,7 +347,7 @@ libpqrcv_startstreaming(WalReceiverConn *conn, PQclear(res); ereport(ERROR, (errmsg("could not start WAL streaming: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); } PQclear(res); return true; @@ -366,7 +366,7 @@ libpqrcv_endstreaming(WalReceiverConn *conn, TimeLineID *next_tli) PQflush(conn->streamConn)) ereport(ERROR, (errmsg("could not send end-of-streaming message to primary: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); *next_tli = 0; @@ -410,7 +410,7 @@ libpqrcv_endstreaming(WalReceiverConn *conn, TimeLineID *next_tli) if (PQresultStatus(res) != PGRES_COMMAND_OK) ereport(ERROR, (errmsg("error reading result of streaming command: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); PQclear(res); /* Verify that there are no more results */ @@ -418,7 +418,7 @@ libpqrcv_endstreaming(WalReceiverConn *conn, TimeLineID *next_tli) if (res != NULL) ereport(ERROR, (errmsg("unexpected result after CommandComplete: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); } /* @@ -445,7 +445,7 @@ libpqrcv_readtimelinehistoryfile(WalReceiverConn *conn, ereport(ERROR, (errmsg("could not receive timeline history file from " "the primary server: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); } if (PQnfields(res) != 2 || PQntuples(res) != 1) { @@ -603,7 +603,7 @@ libpqrcv_receive(WalReceiverConn *conn, char **buffer, if (PQconsumeInput(conn->streamConn) == 0) ereport(ERROR, (errmsg("could not receive data from WAL stream: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); /* Now that we've consumed some input, try again */ rawlen = PQgetCopyData(conn->streamConn, &conn->recvBuf, 1); @@ -630,13 +630,13 @@ libpqrcv_receive(WalReceiverConn *conn, char **buffer, PQclear(res); ereport(ERROR, (errmsg("could not receive data from WAL stream: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); } } if (rawlen < -1) ereport(ERROR, (errmsg("could not receive data from WAL stream: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); /* Return received messages to caller */ *buffer = conn->recvBuf; @@ -655,7 +655,7 @@ libpqrcv_send(WalReceiverConn *conn, const char *buffer, int nbytes) PQflush(conn->streamConn)) ereport(ERROR, (errmsg("could not send data to WAL stream: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); } /* @@ -689,7 +689,7 @@ libpqrcv_create_slot(WalReceiverConn *conn, const char *slotname, PQclear(res); ereport(ERROR, (errmsg("could not create replication slot \"%s\": %s", - slotname, PQerrorMessage(conn->streamConn)))); + slotname, pchomp(PQerrorMessage(conn->streamConn))))); } *lsn = DatumGetLSN(DirectFunctionCall1Coll(pg_lsn_in, InvalidOid, @@ -720,7 +720,7 @@ libpqrcv_command(WalReceiverConn *conn, const char *cmd, char **err) if (PQresultStatus(res) != PGRES_COMMAND_OK) { PQclear(res); - *err = pstrdup(PQerrorMessage(conn->streamConn)); + *err = pchomp(PQerrorMessage(conn->streamConn)); return false; } diff --git a/src/backend/utils/mmgr/mcxt.c b/src/backend/utils/mmgr/mcxt.c index 6ad0bb47b6..c21dfcb96b 100644 --- a/src/backend/utils/mmgr/mcxt.c +++ b/src/backend/utils/mmgr/mcxt.c @@ -1181,3 +1181,17 @@ pnstrdup(const char *in, Size len) out[len] = '\0'; return out; } + +/* + * Make copy of string with all trailing newline characters removed. + */ +char * +pchomp(const char *in) +{ + size_t n; + + n = strlen(in); + while (n > 0 && in[n - 1] == '\n') + n--; + return pnstrdup(in, n); +} diff --git a/src/include/utils/palloc.h b/src/include/utils/palloc.h index b72fe4aee8..2e07bd57ad 100644 --- a/src/include/utils/palloc.h +++ b/src/include/utils/palloc.h @@ -127,6 +127,8 @@ extern char *MemoryContextStrdup(MemoryContext context, const char *string); extern char *pstrdup(const char *in); extern char *pnstrdup(const char *in, Size len); +extern char *pchomp(const char *in); + /* sprintf into a palloc'd buffer --- these are in psprintf.c */ extern char *psprintf(const char *fmt,...) pg_attribute_printf(1, 2); extern size_t pvsnprintf(char *buf, size_t len, const char *fmt, va_list args) pg_attribute_printf(3, 0); -- 2.11.1 --------------8DBA76FBC0D2E1B20F0C5D8D Content-Type: text/plain Content-Disposition: inline Content-Transfer-Encoding: 8bit MIME-Version: 1.0 -- Sent via pgsql-hackers mailing list ([email protected]) To make changes to your subscription: http://www.postgresql.org/mailpref/pgsql-hackers --------------8DBA76FBC0D2E1B20F0C5D8D-- ^ permalink raw reply [nested|flat] 19+ messages in thread
* [PATCH] chomp PQerrorMessage() in backend uses @ 2017-02-08 14:31 Peter Eisentraut <[email protected]> 0 siblings, 0 replies; 19+ messages in thread From: Peter Eisentraut @ 2017-02-08 14:31 UTC (permalink / raw) PQerrorMessage() returns an error message with a trailing newline, but in backend use (dblink, postgres_fdw, libpqwalreceiver), we want to have the error message without that for emitting via ereport(). To simplify that, add a function pchomp() that returns a pstrdup'ed string with the trailing newline characters removed. --- contrib/dblink/dblink.c | 16 ++++++------ contrib/dblink/expected/dblink.out | 2 -- contrib/postgres_fdw/connection.c | 14 ++-------- .../libpqwalreceiver/libpqwalreceiver.c | 30 +++++++++++----------- src/backend/utils/mmgr/mcxt.c | 14 ++++++++++ src/include/utils/palloc.h | 2 ++ 6 files changed, 41 insertions(+), 37 deletions(-) diff --git a/contrib/dblink/dblink.c b/contrib/dblink/dblink.c index ac43c458cb..db0a8ba72d 100644 --- a/contrib/dblink/dblink.c +++ b/contrib/dblink/dblink.c @@ -166,7 +166,7 @@ typedef struct remoteConnHashEnt #define DBLINK_RES_INTERNALERROR(p2) \ do { \ - msg = pstrdup(PQerrorMessage(conn)); \ + msg = pchomp(PQerrorMessage(conn)); \ if (res) \ PQclear(res); \ elog(ERROR, "%s: %s", p2, msg); \ @@ -204,7 +204,7 @@ typedef struct remoteConnHashEnt conn = PQconnectdb(connstr); \ if (PQstatus(conn) == CONNECTION_BAD) \ { \ - msg = pstrdup(PQerrorMessage(conn)); \ + msg = pchomp(PQerrorMessage(conn)); \ PQfinish(conn); \ ereport(ERROR, \ (errcode(ERRCODE_SQLCLIENT_UNABLE_TO_ESTABLISH_SQLCONNECTION), \ @@ -278,7 +278,7 @@ dblink_connect(PG_FUNCTION_ARGS) if (PQstatus(conn) == CONNECTION_BAD) { - msg = pstrdup(PQerrorMessage(conn)); + msg = pchomp(PQerrorMessage(conn)); PQfinish(conn); if (rconn) pfree(rconn); @@ -651,7 +651,7 @@ dblink_send_query(PG_FUNCTION_ARGS) /* async query send */ retval = PQsendQuery(conn, sql); if (retval != 1) - elog(NOTICE, "could not send query: %s", PQerrorMessage(conn)); + elog(NOTICE, "could not send query: %s", pchomp(PQerrorMessage(conn))); PG_RETURN_INT32(retval); } @@ -1087,7 +1087,7 @@ storeQueryResult(volatile storeInfo *sinfo, PGconn *conn, const char *sql) PGresult *res; if (!PQsendQuery(conn, sql)) - elog(ERROR, "could not send query: %s", PQerrorMessage(conn)); + elog(ERROR, "could not send query: %s", pchomp(PQerrorMessage(conn))); if (!PQsetSingleRowMode(conn)) /* shouldn't fail */ elog(ERROR, "failed to set single-row mode for dblink query"); @@ -1366,8 +1366,8 @@ dblink_error_message(PG_FUNCTION_ARGS) DBLINK_INIT; DBLINK_GET_NAMED_CONN; - msg = PQerrorMessage(conn); - if (msg == NULL || msg[0] == '\0') + msg = pchomp(PQerrorMessage(conn)); + if (msg[0] == '\0') PG_RETURN_TEXT_P(cstring_to_text("OK")); else PG_RETURN_TEXT_P(cstring_to_text(msg)); @@ -2709,7 +2709,7 @@ dblink_res_error(PGconn *conn, const char *conname, PGresult *res, * return NULL, not a PGresult at all. */ if (message_primary == NULL) - message_primary = PQerrorMessage(conn); + message_primary = pchomp(PQerrorMessage(conn)); if (res) PQclear(res); diff --git a/contrib/dblink/expected/dblink.out b/contrib/dblink/expected/dblink.out index 5acaaf225a..4b6d26e574 100644 --- a/contrib/dblink/expected/dblink.out +++ b/contrib/dblink/expected/dblink.out @@ -377,7 +377,6 @@ FROM dblink('myconn','SELECT * FROM foo') AS t(a int, b text, c text[]) WHERE t.a > 7; ERROR: could not establish connection DETAIL: missing "=" after "myconn" in connection info string - -- create a named persistent connection SELECT dblink_connect('myconn',connection_parameters()); dblink_connect @@ -604,7 +603,6 @@ FROM dblink('myconn','SELECT * FROM foo') AS t(a int, b text, c text[]) WHERE t.a > 7; ERROR: could not establish connection DETAIL: missing "=" after "myconn" in connection info string - -- create a named persistent connection SELECT dblink_connect('myconn',connection_parameters()); dblink_connect diff --git a/contrib/postgres_fdw/connection.c b/contrib/postgres_fdw/connection.c index 7f7a744ac0..c6e3d44515 100644 --- a/contrib/postgres_fdw/connection.c +++ b/contrib/postgres_fdw/connection.c @@ -226,21 +226,11 @@ connect_pg_server(ForeignServer *server, UserMapping *user) conn = PQconnectdbParams(keywords, values, false); if (!conn || PQstatus(conn) != CONNECTION_OK) - { - char *connmessage; - int msglen; - - /* libpq typically appends a newline, strip that */ - connmessage = pstrdup(PQerrorMessage(conn)); - msglen = strlen(connmessage); - if (msglen > 0 && connmessage[msglen - 1] == '\n') - connmessage[msglen - 1] = '\0'; ereport(ERROR, (errcode(ERRCODE_SQLCLIENT_UNABLE_TO_ESTABLISH_SQLCONNECTION), errmsg("could not connect to server \"%s\"", server->servername), - errdetail_internal("%s", connmessage))); - } + errdetail_internal("%s", pchomp(PQerrorMessage(conn))))); /* * Check that non-superuser has used password to establish connection; @@ -563,7 +553,7 @@ pgfdw_report_error(int elevel, PGresult *res, PGconn *conn, * return NULL, not a PGresult at all. */ if (message_primary == NULL) - message_primary = PQerrorMessage(conn); + message_primary = pchomp(PQerrorMessage(conn)); ereport(elevel, (errcode(sqlstate), diff --git a/src/backend/replication/libpqwalreceiver/libpqwalreceiver.c b/src/backend/replication/libpqwalreceiver/libpqwalreceiver.c index 44a89c73fd..b88760fb68 100644 --- a/src/backend/replication/libpqwalreceiver/libpqwalreceiver.c +++ b/src/backend/replication/libpqwalreceiver/libpqwalreceiver.c @@ -141,7 +141,7 @@ libpqrcv_connect(const char *conninfo, bool logical, const char *appname, conn->streamConn = PQconnectdbParams(keys, vals, /* expand_dbname = */ true); if (PQstatus(conn->streamConn) != CONNECTION_OK) { - *err = pstrdup(PQerrorMessage(conn->streamConn)); + *err = pchomp(PQerrorMessage(conn->streamConn)); return NULL; } @@ -239,7 +239,7 @@ libpqrcv_identify_system(WalReceiverConn *conn, TimeLineID *primary_tli, ereport(ERROR, (errmsg("could not receive database system identifier and timeline ID from " "the primary server: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); } if (PQnfields(res) < 3 || PQntuples(res) != 1) { @@ -316,13 +316,13 @@ libpqrcv_startstreaming(WalReceiverConn *conn, if (!pubnames_str) ereport(ERROR, (errmsg("could not start WAL streaming: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); pubnames_literal = PQescapeLiteral(conn->streamConn, pubnames_str, strlen(pubnames_str)); if (!pubnames_literal) ereport(ERROR, (errmsg("could not start WAL streaming: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); appendStringInfo(&cmd, ", publication_names %s", pubnames_literal); PQfreemem(pubnames_literal); pfree(pubnames_str); @@ -347,7 +347,7 @@ libpqrcv_startstreaming(WalReceiverConn *conn, PQclear(res); ereport(ERROR, (errmsg("could not start WAL streaming: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); } PQclear(res); return true; @@ -366,7 +366,7 @@ libpqrcv_endstreaming(WalReceiverConn *conn, TimeLineID *next_tli) PQflush(conn->streamConn)) ereport(ERROR, (errmsg("could not send end-of-streaming message to primary: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); *next_tli = 0; @@ -410,7 +410,7 @@ libpqrcv_endstreaming(WalReceiverConn *conn, TimeLineID *next_tli) if (PQresultStatus(res) != PGRES_COMMAND_OK) ereport(ERROR, (errmsg("error reading result of streaming command: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); PQclear(res); /* Verify that there are no more results */ @@ -418,7 +418,7 @@ libpqrcv_endstreaming(WalReceiverConn *conn, TimeLineID *next_tli) if (res != NULL) ereport(ERROR, (errmsg("unexpected result after CommandComplete: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); } /* @@ -445,7 +445,7 @@ libpqrcv_readtimelinehistoryfile(WalReceiverConn *conn, ereport(ERROR, (errmsg("could not receive timeline history file from " "the primary server: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); } if (PQnfields(res) != 2 || PQntuples(res) != 1) { @@ -603,7 +603,7 @@ libpqrcv_receive(WalReceiverConn *conn, char **buffer, if (PQconsumeInput(conn->streamConn) == 0) ereport(ERROR, (errmsg("could not receive data from WAL stream: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); /* Now that we've consumed some input, try again */ rawlen = PQgetCopyData(conn->streamConn, &conn->recvBuf, 1); @@ -630,13 +630,13 @@ libpqrcv_receive(WalReceiverConn *conn, char **buffer, PQclear(res); ereport(ERROR, (errmsg("could not receive data from WAL stream: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); } } if (rawlen < -1) ereport(ERROR, (errmsg("could not receive data from WAL stream: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); /* Return received messages to caller */ *buffer = conn->recvBuf; @@ -655,7 +655,7 @@ libpqrcv_send(WalReceiverConn *conn, const char *buffer, int nbytes) PQflush(conn->streamConn)) ereport(ERROR, (errmsg("could not send data to WAL stream: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); } /* @@ -689,7 +689,7 @@ libpqrcv_create_slot(WalReceiverConn *conn, const char *slotname, PQclear(res); ereport(ERROR, (errmsg("could not create replication slot \"%s\": %s", - slotname, PQerrorMessage(conn->streamConn)))); + slotname, pchomp(PQerrorMessage(conn->streamConn))))); } *lsn = DatumGetLSN(DirectFunctionCall1Coll(pg_lsn_in, InvalidOid, @@ -720,7 +720,7 @@ libpqrcv_command(WalReceiverConn *conn, const char *cmd, char **err) if (PQresultStatus(res) != PGRES_COMMAND_OK) { PQclear(res); - *err = pstrdup(PQerrorMessage(conn->streamConn)); + *err = pchomp(PQerrorMessage(conn->streamConn)); return false; } diff --git a/src/backend/utils/mmgr/mcxt.c b/src/backend/utils/mmgr/mcxt.c index 6ad0bb47b6..c21dfcb96b 100644 --- a/src/backend/utils/mmgr/mcxt.c +++ b/src/backend/utils/mmgr/mcxt.c @@ -1181,3 +1181,17 @@ pnstrdup(const char *in, Size len) out[len] = '\0'; return out; } + +/* + * Make copy of string with all trailing newline characters removed. + */ +char * +pchomp(const char *in) +{ + size_t n; + + n = strlen(in); + while (n > 0 && in[n - 1] == '\n') + n--; + return pnstrdup(in, n); +} diff --git a/src/include/utils/palloc.h b/src/include/utils/palloc.h index b72fe4aee8..2e07bd57ad 100644 --- a/src/include/utils/palloc.h +++ b/src/include/utils/palloc.h @@ -127,6 +127,8 @@ extern char *MemoryContextStrdup(MemoryContext context, const char *string); extern char *pstrdup(const char *in); extern char *pnstrdup(const char *in, Size len); +extern char *pchomp(const char *in); + /* sprintf into a palloc'd buffer --- these are in psprintf.c */ extern char *psprintf(const char *fmt,...) pg_attribute_printf(1, 2); extern size_t pvsnprintf(char *buf, size_t len, const char *fmt, va_list args) pg_attribute_printf(3, 0); -- 2.11.1 --------------8DBA76FBC0D2E1B20F0C5D8D Content-Type: text/plain Content-Disposition: inline Content-Transfer-Encoding: 8bit MIME-Version: 1.0 -- Sent via pgsql-hackers mailing list ([email protected]) To make changes to your subscription: http://www.postgresql.org/mailpref/pgsql-hackers --------------8DBA76FBC0D2E1B20F0C5D8D-- ^ permalink raw reply [nested|flat] 19+ messages in thread
* [PATCH] chomp PQerrorMessage() in backend uses @ 2017-02-08 14:31 Peter Eisentraut <[email protected]> 0 siblings, 0 replies; 19+ messages in thread From: Peter Eisentraut @ 2017-02-08 14:31 UTC (permalink / raw) PQerrorMessage() returns an error message with a trailing newline, but in backend use (dblink, postgres_fdw, libpqwalreceiver), we want to have the error message without that for emitting via ereport(). To simplify that, add a function pchomp() that returns a pstrdup'ed string with the trailing newline characters removed. --- contrib/dblink/dblink.c | 16 ++++++------ contrib/dblink/expected/dblink.out | 2 -- contrib/postgres_fdw/connection.c | 14 ++-------- .../libpqwalreceiver/libpqwalreceiver.c | 30 +++++++++++----------- src/backend/utils/mmgr/mcxt.c | 14 ++++++++++ src/include/utils/palloc.h | 2 ++ 6 files changed, 41 insertions(+), 37 deletions(-) diff --git a/contrib/dblink/dblink.c b/contrib/dblink/dblink.c index ac43c458cb..db0a8ba72d 100644 --- a/contrib/dblink/dblink.c +++ b/contrib/dblink/dblink.c @@ -166,7 +166,7 @@ typedef struct remoteConnHashEnt #define DBLINK_RES_INTERNALERROR(p2) \ do { \ - msg = pstrdup(PQerrorMessage(conn)); \ + msg = pchomp(PQerrorMessage(conn)); \ if (res) \ PQclear(res); \ elog(ERROR, "%s: %s", p2, msg); \ @@ -204,7 +204,7 @@ typedef struct remoteConnHashEnt conn = PQconnectdb(connstr); \ if (PQstatus(conn) == CONNECTION_BAD) \ { \ - msg = pstrdup(PQerrorMessage(conn)); \ + msg = pchomp(PQerrorMessage(conn)); \ PQfinish(conn); \ ereport(ERROR, \ (errcode(ERRCODE_SQLCLIENT_UNABLE_TO_ESTABLISH_SQLCONNECTION), \ @@ -278,7 +278,7 @@ dblink_connect(PG_FUNCTION_ARGS) if (PQstatus(conn) == CONNECTION_BAD) { - msg = pstrdup(PQerrorMessage(conn)); + msg = pchomp(PQerrorMessage(conn)); PQfinish(conn); if (rconn) pfree(rconn); @@ -651,7 +651,7 @@ dblink_send_query(PG_FUNCTION_ARGS) /* async query send */ retval = PQsendQuery(conn, sql); if (retval != 1) - elog(NOTICE, "could not send query: %s", PQerrorMessage(conn)); + elog(NOTICE, "could not send query: %s", pchomp(PQerrorMessage(conn))); PG_RETURN_INT32(retval); } @@ -1087,7 +1087,7 @@ storeQueryResult(volatile storeInfo *sinfo, PGconn *conn, const char *sql) PGresult *res; if (!PQsendQuery(conn, sql)) - elog(ERROR, "could not send query: %s", PQerrorMessage(conn)); + elog(ERROR, "could not send query: %s", pchomp(PQerrorMessage(conn))); if (!PQsetSingleRowMode(conn)) /* shouldn't fail */ elog(ERROR, "failed to set single-row mode for dblink query"); @@ -1366,8 +1366,8 @@ dblink_error_message(PG_FUNCTION_ARGS) DBLINK_INIT; DBLINK_GET_NAMED_CONN; - msg = PQerrorMessage(conn); - if (msg == NULL || msg[0] == '\0') + msg = pchomp(PQerrorMessage(conn)); + if (msg[0] == '\0') PG_RETURN_TEXT_P(cstring_to_text("OK")); else PG_RETURN_TEXT_P(cstring_to_text(msg)); @@ -2709,7 +2709,7 @@ dblink_res_error(PGconn *conn, const char *conname, PGresult *res, * return NULL, not a PGresult at all. */ if (message_primary == NULL) - message_primary = PQerrorMessage(conn); + message_primary = pchomp(PQerrorMessage(conn)); if (res) PQclear(res); diff --git a/contrib/dblink/expected/dblink.out b/contrib/dblink/expected/dblink.out index 5acaaf225a..4b6d26e574 100644 --- a/contrib/dblink/expected/dblink.out +++ b/contrib/dblink/expected/dblink.out @@ -377,7 +377,6 @@ FROM dblink('myconn','SELECT * FROM foo') AS t(a int, b text, c text[]) WHERE t.a > 7; ERROR: could not establish connection DETAIL: missing "=" after "myconn" in connection info string - -- create a named persistent connection SELECT dblink_connect('myconn',connection_parameters()); dblink_connect @@ -604,7 +603,6 @@ FROM dblink('myconn','SELECT * FROM foo') AS t(a int, b text, c text[]) WHERE t.a > 7; ERROR: could not establish connection DETAIL: missing "=" after "myconn" in connection info string - -- create a named persistent connection SELECT dblink_connect('myconn',connection_parameters()); dblink_connect diff --git a/contrib/postgres_fdw/connection.c b/contrib/postgres_fdw/connection.c index 7f7a744ac0..c6e3d44515 100644 --- a/contrib/postgres_fdw/connection.c +++ b/contrib/postgres_fdw/connection.c @@ -226,21 +226,11 @@ connect_pg_server(ForeignServer *server, UserMapping *user) conn = PQconnectdbParams(keywords, values, false); if (!conn || PQstatus(conn) != CONNECTION_OK) - { - char *connmessage; - int msglen; - - /* libpq typically appends a newline, strip that */ - connmessage = pstrdup(PQerrorMessage(conn)); - msglen = strlen(connmessage); - if (msglen > 0 && connmessage[msglen - 1] == '\n') - connmessage[msglen - 1] = '\0'; ereport(ERROR, (errcode(ERRCODE_SQLCLIENT_UNABLE_TO_ESTABLISH_SQLCONNECTION), errmsg("could not connect to server \"%s\"", server->servername), - errdetail_internal("%s", connmessage))); - } + errdetail_internal("%s", pchomp(PQerrorMessage(conn))))); /* * Check that non-superuser has used password to establish connection; @@ -563,7 +553,7 @@ pgfdw_report_error(int elevel, PGresult *res, PGconn *conn, * return NULL, not a PGresult at all. */ if (message_primary == NULL) - message_primary = PQerrorMessage(conn); + message_primary = pchomp(PQerrorMessage(conn)); ereport(elevel, (errcode(sqlstate), diff --git a/src/backend/replication/libpqwalreceiver/libpqwalreceiver.c b/src/backend/replication/libpqwalreceiver/libpqwalreceiver.c index 44a89c73fd..b88760fb68 100644 --- a/src/backend/replication/libpqwalreceiver/libpqwalreceiver.c +++ b/src/backend/replication/libpqwalreceiver/libpqwalreceiver.c @@ -141,7 +141,7 @@ libpqrcv_connect(const char *conninfo, bool logical, const char *appname, conn->streamConn = PQconnectdbParams(keys, vals, /* expand_dbname = */ true); if (PQstatus(conn->streamConn) != CONNECTION_OK) { - *err = pstrdup(PQerrorMessage(conn->streamConn)); + *err = pchomp(PQerrorMessage(conn->streamConn)); return NULL; } @@ -239,7 +239,7 @@ libpqrcv_identify_system(WalReceiverConn *conn, TimeLineID *primary_tli, ereport(ERROR, (errmsg("could not receive database system identifier and timeline ID from " "the primary server: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); } if (PQnfields(res) < 3 || PQntuples(res) != 1) { @@ -316,13 +316,13 @@ libpqrcv_startstreaming(WalReceiverConn *conn, if (!pubnames_str) ereport(ERROR, (errmsg("could not start WAL streaming: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); pubnames_literal = PQescapeLiteral(conn->streamConn, pubnames_str, strlen(pubnames_str)); if (!pubnames_literal) ereport(ERROR, (errmsg("could not start WAL streaming: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); appendStringInfo(&cmd, ", publication_names %s", pubnames_literal); PQfreemem(pubnames_literal); pfree(pubnames_str); @@ -347,7 +347,7 @@ libpqrcv_startstreaming(WalReceiverConn *conn, PQclear(res); ereport(ERROR, (errmsg("could not start WAL streaming: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); } PQclear(res); return true; @@ -366,7 +366,7 @@ libpqrcv_endstreaming(WalReceiverConn *conn, TimeLineID *next_tli) PQflush(conn->streamConn)) ereport(ERROR, (errmsg("could not send end-of-streaming message to primary: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); *next_tli = 0; @@ -410,7 +410,7 @@ libpqrcv_endstreaming(WalReceiverConn *conn, TimeLineID *next_tli) if (PQresultStatus(res) != PGRES_COMMAND_OK) ereport(ERROR, (errmsg("error reading result of streaming command: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); PQclear(res); /* Verify that there are no more results */ @@ -418,7 +418,7 @@ libpqrcv_endstreaming(WalReceiverConn *conn, TimeLineID *next_tli) if (res != NULL) ereport(ERROR, (errmsg("unexpected result after CommandComplete: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); } /* @@ -445,7 +445,7 @@ libpqrcv_readtimelinehistoryfile(WalReceiverConn *conn, ereport(ERROR, (errmsg("could not receive timeline history file from " "the primary server: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); } if (PQnfields(res) != 2 || PQntuples(res) != 1) { @@ -603,7 +603,7 @@ libpqrcv_receive(WalReceiverConn *conn, char **buffer, if (PQconsumeInput(conn->streamConn) == 0) ereport(ERROR, (errmsg("could not receive data from WAL stream: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); /* Now that we've consumed some input, try again */ rawlen = PQgetCopyData(conn->streamConn, &conn->recvBuf, 1); @@ -630,13 +630,13 @@ libpqrcv_receive(WalReceiverConn *conn, char **buffer, PQclear(res); ereport(ERROR, (errmsg("could not receive data from WAL stream: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); } } if (rawlen < -1) ereport(ERROR, (errmsg("could not receive data from WAL stream: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); /* Return received messages to caller */ *buffer = conn->recvBuf; @@ -655,7 +655,7 @@ libpqrcv_send(WalReceiverConn *conn, const char *buffer, int nbytes) PQflush(conn->streamConn)) ereport(ERROR, (errmsg("could not send data to WAL stream: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); } /* @@ -689,7 +689,7 @@ libpqrcv_create_slot(WalReceiverConn *conn, const char *slotname, PQclear(res); ereport(ERROR, (errmsg("could not create replication slot \"%s\": %s", - slotname, PQerrorMessage(conn->streamConn)))); + slotname, pchomp(PQerrorMessage(conn->streamConn))))); } *lsn = DatumGetLSN(DirectFunctionCall1Coll(pg_lsn_in, InvalidOid, @@ -720,7 +720,7 @@ libpqrcv_command(WalReceiverConn *conn, const char *cmd, char **err) if (PQresultStatus(res) != PGRES_COMMAND_OK) { PQclear(res); - *err = pstrdup(PQerrorMessage(conn->streamConn)); + *err = pchomp(PQerrorMessage(conn->streamConn)); return false; } diff --git a/src/backend/utils/mmgr/mcxt.c b/src/backend/utils/mmgr/mcxt.c index 6ad0bb47b6..c21dfcb96b 100644 --- a/src/backend/utils/mmgr/mcxt.c +++ b/src/backend/utils/mmgr/mcxt.c @@ -1181,3 +1181,17 @@ pnstrdup(const char *in, Size len) out[len] = '\0'; return out; } + +/* + * Make copy of string with all trailing newline characters removed. + */ +char * +pchomp(const char *in) +{ + size_t n; + + n = strlen(in); + while (n > 0 && in[n - 1] == '\n') + n--; + return pnstrdup(in, n); +} diff --git a/src/include/utils/palloc.h b/src/include/utils/palloc.h index b72fe4aee8..2e07bd57ad 100644 --- a/src/include/utils/palloc.h +++ b/src/include/utils/palloc.h @@ -127,6 +127,8 @@ extern char *MemoryContextStrdup(MemoryContext context, const char *string); extern char *pstrdup(const char *in); extern char *pnstrdup(const char *in, Size len); +extern char *pchomp(const char *in); + /* sprintf into a palloc'd buffer --- these are in psprintf.c */ extern char *psprintf(const char *fmt,...) pg_attribute_printf(1, 2); extern size_t pvsnprintf(char *buf, size_t len, const char *fmt, va_list args) pg_attribute_printf(3, 0); -- 2.11.1 --------------8DBA76FBC0D2E1B20F0C5D8D Content-Type: text/plain Content-Disposition: inline Content-Transfer-Encoding: 8bit MIME-Version: 1.0 -- Sent via pgsql-hackers mailing list ([email protected]) To make changes to your subscription: http://www.postgresql.org/mailpref/pgsql-hackers --------------8DBA76FBC0D2E1B20F0C5D8D-- ^ permalink raw reply [nested|flat] 19+ messages in thread
* [PATCH] chomp PQerrorMessage() in backend uses @ 2017-02-08 14:31 Peter Eisentraut <[email protected]> 0 siblings, 0 replies; 19+ messages in thread From: Peter Eisentraut @ 2017-02-08 14:31 UTC (permalink / raw) PQerrorMessage() returns an error message with a trailing newline, but in backend use (dblink, postgres_fdw, libpqwalreceiver), we want to have the error message without that for emitting via ereport(). To simplify that, add a function pchomp() that returns a pstrdup'ed string with the trailing newline characters removed. --- contrib/dblink/dblink.c | 16 ++++++------ contrib/dblink/expected/dblink.out | 2 -- contrib/postgres_fdw/connection.c | 14 ++-------- .../libpqwalreceiver/libpqwalreceiver.c | 30 +++++++++++----------- src/backend/utils/mmgr/mcxt.c | 14 ++++++++++ src/include/utils/palloc.h | 2 ++ 6 files changed, 41 insertions(+), 37 deletions(-) diff --git a/contrib/dblink/dblink.c b/contrib/dblink/dblink.c index ac43c458cb..db0a8ba72d 100644 --- a/contrib/dblink/dblink.c +++ b/contrib/dblink/dblink.c @@ -166,7 +166,7 @@ typedef struct remoteConnHashEnt #define DBLINK_RES_INTERNALERROR(p2) \ do { \ - msg = pstrdup(PQerrorMessage(conn)); \ + msg = pchomp(PQerrorMessage(conn)); \ if (res) \ PQclear(res); \ elog(ERROR, "%s: %s", p2, msg); \ @@ -204,7 +204,7 @@ typedef struct remoteConnHashEnt conn = PQconnectdb(connstr); \ if (PQstatus(conn) == CONNECTION_BAD) \ { \ - msg = pstrdup(PQerrorMessage(conn)); \ + msg = pchomp(PQerrorMessage(conn)); \ PQfinish(conn); \ ereport(ERROR, \ (errcode(ERRCODE_SQLCLIENT_UNABLE_TO_ESTABLISH_SQLCONNECTION), \ @@ -278,7 +278,7 @@ dblink_connect(PG_FUNCTION_ARGS) if (PQstatus(conn) == CONNECTION_BAD) { - msg = pstrdup(PQerrorMessage(conn)); + msg = pchomp(PQerrorMessage(conn)); PQfinish(conn); if (rconn) pfree(rconn); @@ -651,7 +651,7 @@ dblink_send_query(PG_FUNCTION_ARGS) /* async query send */ retval = PQsendQuery(conn, sql); if (retval != 1) - elog(NOTICE, "could not send query: %s", PQerrorMessage(conn)); + elog(NOTICE, "could not send query: %s", pchomp(PQerrorMessage(conn))); PG_RETURN_INT32(retval); } @@ -1087,7 +1087,7 @@ storeQueryResult(volatile storeInfo *sinfo, PGconn *conn, const char *sql) PGresult *res; if (!PQsendQuery(conn, sql)) - elog(ERROR, "could not send query: %s", PQerrorMessage(conn)); + elog(ERROR, "could not send query: %s", pchomp(PQerrorMessage(conn))); if (!PQsetSingleRowMode(conn)) /* shouldn't fail */ elog(ERROR, "failed to set single-row mode for dblink query"); @@ -1366,8 +1366,8 @@ dblink_error_message(PG_FUNCTION_ARGS) DBLINK_INIT; DBLINK_GET_NAMED_CONN; - msg = PQerrorMessage(conn); - if (msg == NULL || msg[0] == '\0') + msg = pchomp(PQerrorMessage(conn)); + if (msg[0] == '\0') PG_RETURN_TEXT_P(cstring_to_text("OK")); else PG_RETURN_TEXT_P(cstring_to_text(msg)); @@ -2709,7 +2709,7 @@ dblink_res_error(PGconn *conn, const char *conname, PGresult *res, * return NULL, not a PGresult at all. */ if (message_primary == NULL) - message_primary = PQerrorMessage(conn); + message_primary = pchomp(PQerrorMessage(conn)); if (res) PQclear(res); diff --git a/contrib/dblink/expected/dblink.out b/contrib/dblink/expected/dblink.out index 5acaaf225a..4b6d26e574 100644 --- a/contrib/dblink/expected/dblink.out +++ b/contrib/dblink/expected/dblink.out @@ -377,7 +377,6 @@ FROM dblink('myconn','SELECT * FROM foo') AS t(a int, b text, c text[]) WHERE t.a > 7; ERROR: could not establish connection DETAIL: missing "=" after "myconn" in connection info string - -- create a named persistent connection SELECT dblink_connect('myconn',connection_parameters()); dblink_connect @@ -604,7 +603,6 @@ FROM dblink('myconn','SELECT * FROM foo') AS t(a int, b text, c text[]) WHERE t.a > 7; ERROR: could not establish connection DETAIL: missing "=" after "myconn" in connection info string - -- create a named persistent connection SELECT dblink_connect('myconn',connection_parameters()); dblink_connect diff --git a/contrib/postgres_fdw/connection.c b/contrib/postgres_fdw/connection.c index 7f7a744ac0..c6e3d44515 100644 --- a/contrib/postgres_fdw/connection.c +++ b/contrib/postgres_fdw/connection.c @@ -226,21 +226,11 @@ connect_pg_server(ForeignServer *server, UserMapping *user) conn = PQconnectdbParams(keywords, values, false); if (!conn || PQstatus(conn) != CONNECTION_OK) - { - char *connmessage; - int msglen; - - /* libpq typically appends a newline, strip that */ - connmessage = pstrdup(PQerrorMessage(conn)); - msglen = strlen(connmessage); - if (msglen > 0 && connmessage[msglen - 1] == '\n') - connmessage[msglen - 1] = '\0'; ereport(ERROR, (errcode(ERRCODE_SQLCLIENT_UNABLE_TO_ESTABLISH_SQLCONNECTION), errmsg("could not connect to server \"%s\"", server->servername), - errdetail_internal("%s", connmessage))); - } + errdetail_internal("%s", pchomp(PQerrorMessage(conn))))); /* * Check that non-superuser has used password to establish connection; @@ -563,7 +553,7 @@ pgfdw_report_error(int elevel, PGresult *res, PGconn *conn, * return NULL, not a PGresult at all. */ if (message_primary == NULL) - message_primary = PQerrorMessage(conn); + message_primary = pchomp(PQerrorMessage(conn)); ereport(elevel, (errcode(sqlstate), diff --git a/src/backend/replication/libpqwalreceiver/libpqwalreceiver.c b/src/backend/replication/libpqwalreceiver/libpqwalreceiver.c index 44a89c73fd..b88760fb68 100644 --- a/src/backend/replication/libpqwalreceiver/libpqwalreceiver.c +++ b/src/backend/replication/libpqwalreceiver/libpqwalreceiver.c @@ -141,7 +141,7 @@ libpqrcv_connect(const char *conninfo, bool logical, const char *appname, conn->streamConn = PQconnectdbParams(keys, vals, /* expand_dbname = */ true); if (PQstatus(conn->streamConn) != CONNECTION_OK) { - *err = pstrdup(PQerrorMessage(conn->streamConn)); + *err = pchomp(PQerrorMessage(conn->streamConn)); return NULL; } @@ -239,7 +239,7 @@ libpqrcv_identify_system(WalReceiverConn *conn, TimeLineID *primary_tli, ereport(ERROR, (errmsg("could not receive database system identifier and timeline ID from " "the primary server: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); } if (PQnfields(res) < 3 || PQntuples(res) != 1) { @@ -316,13 +316,13 @@ libpqrcv_startstreaming(WalReceiverConn *conn, if (!pubnames_str) ereport(ERROR, (errmsg("could not start WAL streaming: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); pubnames_literal = PQescapeLiteral(conn->streamConn, pubnames_str, strlen(pubnames_str)); if (!pubnames_literal) ereport(ERROR, (errmsg("could not start WAL streaming: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); appendStringInfo(&cmd, ", publication_names %s", pubnames_literal); PQfreemem(pubnames_literal); pfree(pubnames_str); @@ -347,7 +347,7 @@ libpqrcv_startstreaming(WalReceiverConn *conn, PQclear(res); ereport(ERROR, (errmsg("could not start WAL streaming: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); } PQclear(res); return true; @@ -366,7 +366,7 @@ libpqrcv_endstreaming(WalReceiverConn *conn, TimeLineID *next_tli) PQflush(conn->streamConn)) ereport(ERROR, (errmsg("could not send end-of-streaming message to primary: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); *next_tli = 0; @@ -410,7 +410,7 @@ libpqrcv_endstreaming(WalReceiverConn *conn, TimeLineID *next_tli) if (PQresultStatus(res) != PGRES_COMMAND_OK) ereport(ERROR, (errmsg("error reading result of streaming command: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); PQclear(res); /* Verify that there are no more results */ @@ -418,7 +418,7 @@ libpqrcv_endstreaming(WalReceiverConn *conn, TimeLineID *next_tli) if (res != NULL) ereport(ERROR, (errmsg("unexpected result after CommandComplete: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); } /* @@ -445,7 +445,7 @@ libpqrcv_readtimelinehistoryfile(WalReceiverConn *conn, ereport(ERROR, (errmsg("could not receive timeline history file from " "the primary server: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); } if (PQnfields(res) != 2 || PQntuples(res) != 1) { @@ -603,7 +603,7 @@ libpqrcv_receive(WalReceiverConn *conn, char **buffer, if (PQconsumeInput(conn->streamConn) == 0) ereport(ERROR, (errmsg("could not receive data from WAL stream: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); /* Now that we've consumed some input, try again */ rawlen = PQgetCopyData(conn->streamConn, &conn->recvBuf, 1); @@ -630,13 +630,13 @@ libpqrcv_receive(WalReceiverConn *conn, char **buffer, PQclear(res); ereport(ERROR, (errmsg("could not receive data from WAL stream: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); } } if (rawlen < -1) ereport(ERROR, (errmsg("could not receive data from WAL stream: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); /* Return received messages to caller */ *buffer = conn->recvBuf; @@ -655,7 +655,7 @@ libpqrcv_send(WalReceiverConn *conn, const char *buffer, int nbytes) PQflush(conn->streamConn)) ereport(ERROR, (errmsg("could not send data to WAL stream: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); } /* @@ -689,7 +689,7 @@ libpqrcv_create_slot(WalReceiverConn *conn, const char *slotname, PQclear(res); ereport(ERROR, (errmsg("could not create replication slot \"%s\": %s", - slotname, PQerrorMessage(conn->streamConn)))); + slotname, pchomp(PQerrorMessage(conn->streamConn))))); } *lsn = DatumGetLSN(DirectFunctionCall1Coll(pg_lsn_in, InvalidOid, @@ -720,7 +720,7 @@ libpqrcv_command(WalReceiverConn *conn, const char *cmd, char **err) if (PQresultStatus(res) != PGRES_COMMAND_OK) { PQclear(res); - *err = pstrdup(PQerrorMessage(conn->streamConn)); + *err = pchomp(PQerrorMessage(conn->streamConn)); return false; } diff --git a/src/backend/utils/mmgr/mcxt.c b/src/backend/utils/mmgr/mcxt.c index 6ad0bb47b6..c21dfcb96b 100644 --- a/src/backend/utils/mmgr/mcxt.c +++ b/src/backend/utils/mmgr/mcxt.c @@ -1181,3 +1181,17 @@ pnstrdup(const char *in, Size len) out[len] = '\0'; return out; } + +/* + * Make copy of string with all trailing newline characters removed. + */ +char * +pchomp(const char *in) +{ + size_t n; + + n = strlen(in); + while (n > 0 && in[n - 1] == '\n') + n--; + return pnstrdup(in, n); +} diff --git a/src/include/utils/palloc.h b/src/include/utils/palloc.h index b72fe4aee8..2e07bd57ad 100644 --- a/src/include/utils/palloc.h +++ b/src/include/utils/palloc.h @@ -127,6 +127,8 @@ extern char *MemoryContextStrdup(MemoryContext context, const char *string); extern char *pstrdup(const char *in); extern char *pnstrdup(const char *in, Size len); +extern char *pchomp(const char *in); + /* sprintf into a palloc'd buffer --- these are in psprintf.c */ extern char *psprintf(const char *fmt,...) pg_attribute_printf(1, 2); extern size_t pvsnprintf(char *buf, size_t len, const char *fmt, va_list args) pg_attribute_printf(3, 0); -- 2.11.1 --------------8DBA76FBC0D2E1B20F0C5D8D Content-Type: text/plain Content-Disposition: inline Content-Transfer-Encoding: 8bit MIME-Version: 1.0 -- Sent via pgsql-hackers mailing list ([email protected]) To make changes to your subscription: http://www.postgresql.org/mailpref/pgsql-hackers --------------8DBA76FBC0D2E1B20F0C5D8D-- ^ permalink raw reply [nested|flat] 19+ messages in thread
* [PATCH] chomp PQerrorMessage() in backend uses @ 2017-02-08 14:31 Peter Eisentraut <[email protected]> 0 siblings, 0 replies; 19+ messages in thread From: Peter Eisentraut @ 2017-02-08 14:31 UTC (permalink / raw) PQerrorMessage() returns an error message with a trailing newline, but in backend use (dblink, postgres_fdw, libpqwalreceiver), we want to have the error message without that for emitting via ereport(). To simplify that, add a function pchomp() that returns a pstrdup'ed string with the trailing newline characters removed. --- contrib/dblink/dblink.c | 16 ++++++------ contrib/dblink/expected/dblink.out | 2 -- contrib/postgres_fdw/connection.c | 14 ++-------- .../libpqwalreceiver/libpqwalreceiver.c | 30 +++++++++++----------- src/backend/utils/mmgr/mcxt.c | 14 ++++++++++ src/include/utils/palloc.h | 2 ++ 6 files changed, 41 insertions(+), 37 deletions(-) diff --git a/contrib/dblink/dblink.c b/contrib/dblink/dblink.c index ac43c458cb..db0a8ba72d 100644 --- a/contrib/dblink/dblink.c +++ b/contrib/dblink/dblink.c @@ -166,7 +166,7 @@ typedef struct remoteConnHashEnt #define DBLINK_RES_INTERNALERROR(p2) \ do { \ - msg = pstrdup(PQerrorMessage(conn)); \ + msg = pchomp(PQerrorMessage(conn)); \ if (res) \ PQclear(res); \ elog(ERROR, "%s: %s", p2, msg); \ @@ -204,7 +204,7 @@ typedef struct remoteConnHashEnt conn = PQconnectdb(connstr); \ if (PQstatus(conn) == CONNECTION_BAD) \ { \ - msg = pstrdup(PQerrorMessage(conn)); \ + msg = pchomp(PQerrorMessage(conn)); \ PQfinish(conn); \ ereport(ERROR, \ (errcode(ERRCODE_SQLCLIENT_UNABLE_TO_ESTABLISH_SQLCONNECTION), \ @@ -278,7 +278,7 @@ dblink_connect(PG_FUNCTION_ARGS) if (PQstatus(conn) == CONNECTION_BAD) { - msg = pstrdup(PQerrorMessage(conn)); + msg = pchomp(PQerrorMessage(conn)); PQfinish(conn); if (rconn) pfree(rconn); @@ -651,7 +651,7 @@ dblink_send_query(PG_FUNCTION_ARGS) /* async query send */ retval = PQsendQuery(conn, sql); if (retval != 1) - elog(NOTICE, "could not send query: %s", PQerrorMessage(conn)); + elog(NOTICE, "could not send query: %s", pchomp(PQerrorMessage(conn))); PG_RETURN_INT32(retval); } @@ -1087,7 +1087,7 @@ storeQueryResult(volatile storeInfo *sinfo, PGconn *conn, const char *sql) PGresult *res; if (!PQsendQuery(conn, sql)) - elog(ERROR, "could not send query: %s", PQerrorMessage(conn)); + elog(ERROR, "could not send query: %s", pchomp(PQerrorMessage(conn))); if (!PQsetSingleRowMode(conn)) /* shouldn't fail */ elog(ERROR, "failed to set single-row mode for dblink query"); @@ -1366,8 +1366,8 @@ dblink_error_message(PG_FUNCTION_ARGS) DBLINK_INIT; DBLINK_GET_NAMED_CONN; - msg = PQerrorMessage(conn); - if (msg == NULL || msg[0] == '\0') + msg = pchomp(PQerrorMessage(conn)); + if (msg[0] == '\0') PG_RETURN_TEXT_P(cstring_to_text("OK")); else PG_RETURN_TEXT_P(cstring_to_text(msg)); @@ -2709,7 +2709,7 @@ dblink_res_error(PGconn *conn, const char *conname, PGresult *res, * return NULL, not a PGresult at all. */ if (message_primary == NULL) - message_primary = PQerrorMessage(conn); + message_primary = pchomp(PQerrorMessage(conn)); if (res) PQclear(res); diff --git a/contrib/dblink/expected/dblink.out b/contrib/dblink/expected/dblink.out index 5acaaf225a..4b6d26e574 100644 --- a/contrib/dblink/expected/dblink.out +++ b/contrib/dblink/expected/dblink.out @@ -377,7 +377,6 @@ FROM dblink('myconn','SELECT * FROM foo') AS t(a int, b text, c text[]) WHERE t.a > 7; ERROR: could not establish connection DETAIL: missing "=" after "myconn" in connection info string - -- create a named persistent connection SELECT dblink_connect('myconn',connection_parameters()); dblink_connect @@ -604,7 +603,6 @@ FROM dblink('myconn','SELECT * FROM foo') AS t(a int, b text, c text[]) WHERE t.a > 7; ERROR: could not establish connection DETAIL: missing "=" after "myconn" in connection info string - -- create a named persistent connection SELECT dblink_connect('myconn',connection_parameters()); dblink_connect diff --git a/contrib/postgres_fdw/connection.c b/contrib/postgres_fdw/connection.c index 7f7a744ac0..c6e3d44515 100644 --- a/contrib/postgres_fdw/connection.c +++ b/contrib/postgres_fdw/connection.c @@ -226,21 +226,11 @@ connect_pg_server(ForeignServer *server, UserMapping *user) conn = PQconnectdbParams(keywords, values, false); if (!conn || PQstatus(conn) != CONNECTION_OK) - { - char *connmessage; - int msglen; - - /* libpq typically appends a newline, strip that */ - connmessage = pstrdup(PQerrorMessage(conn)); - msglen = strlen(connmessage); - if (msglen > 0 && connmessage[msglen - 1] == '\n') - connmessage[msglen - 1] = '\0'; ereport(ERROR, (errcode(ERRCODE_SQLCLIENT_UNABLE_TO_ESTABLISH_SQLCONNECTION), errmsg("could not connect to server \"%s\"", server->servername), - errdetail_internal("%s", connmessage))); - } + errdetail_internal("%s", pchomp(PQerrorMessage(conn))))); /* * Check that non-superuser has used password to establish connection; @@ -563,7 +553,7 @@ pgfdw_report_error(int elevel, PGresult *res, PGconn *conn, * return NULL, not a PGresult at all. */ if (message_primary == NULL) - message_primary = PQerrorMessage(conn); + message_primary = pchomp(PQerrorMessage(conn)); ereport(elevel, (errcode(sqlstate), diff --git a/src/backend/replication/libpqwalreceiver/libpqwalreceiver.c b/src/backend/replication/libpqwalreceiver/libpqwalreceiver.c index 44a89c73fd..b88760fb68 100644 --- a/src/backend/replication/libpqwalreceiver/libpqwalreceiver.c +++ b/src/backend/replication/libpqwalreceiver/libpqwalreceiver.c @@ -141,7 +141,7 @@ libpqrcv_connect(const char *conninfo, bool logical, const char *appname, conn->streamConn = PQconnectdbParams(keys, vals, /* expand_dbname = */ true); if (PQstatus(conn->streamConn) != CONNECTION_OK) { - *err = pstrdup(PQerrorMessage(conn->streamConn)); + *err = pchomp(PQerrorMessage(conn->streamConn)); return NULL; } @@ -239,7 +239,7 @@ libpqrcv_identify_system(WalReceiverConn *conn, TimeLineID *primary_tli, ereport(ERROR, (errmsg("could not receive database system identifier and timeline ID from " "the primary server: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); } if (PQnfields(res) < 3 || PQntuples(res) != 1) { @@ -316,13 +316,13 @@ libpqrcv_startstreaming(WalReceiverConn *conn, if (!pubnames_str) ereport(ERROR, (errmsg("could not start WAL streaming: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); pubnames_literal = PQescapeLiteral(conn->streamConn, pubnames_str, strlen(pubnames_str)); if (!pubnames_literal) ereport(ERROR, (errmsg("could not start WAL streaming: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); appendStringInfo(&cmd, ", publication_names %s", pubnames_literal); PQfreemem(pubnames_literal); pfree(pubnames_str); @@ -347,7 +347,7 @@ libpqrcv_startstreaming(WalReceiverConn *conn, PQclear(res); ereport(ERROR, (errmsg("could not start WAL streaming: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); } PQclear(res); return true; @@ -366,7 +366,7 @@ libpqrcv_endstreaming(WalReceiverConn *conn, TimeLineID *next_tli) PQflush(conn->streamConn)) ereport(ERROR, (errmsg("could not send end-of-streaming message to primary: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); *next_tli = 0; @@ -410,7 +410,7 @@ libpqrcv_endstreaming(WalReceiverConn *conn, TimeLineID *next_tli) if (PQresultStatus(res) != PGRES_COMMAND_OK) ereport(ERROR, (errmsg("error reading result of streaming command: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); PQclear(res); /* Verify that there are no more results */ @@ -418,7 +418,7 @@ libpqrcv_endstreaming(WalReceiverConn *conn, TimeLineID *next_tli) if (res != NULL) ereport(ERROR, (errmsg("unexpected result after CommandComplete: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); } /* @@ -445,7 +445,7 @@ libpqrcv_readtimelinehistoryfile(WalReceiverConn *conn, ereport(ERROR, (errmsg("could not receive timeline history file from " "the primary server: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); } if (PQnfields(res) != 2 || PQntuples(res) != 1) { @@ -603,7 +603,7 @@ libpqrcv_receive(WalReceiverConn *conn, char **buffer, if (PQconsumeInput(conn->streamConn) == 0) ereport(ERROR, (errmsg("could not receive data from WAL stream: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); /* Now that we've consumed some input, try again */ rawlen = PQgetCopyData(conn->streamConn, &conn->recvBuf, 1); @@ -630,13 +630,13 @@ libpqrcv_receive(WalReceiverConn *conn, char **buffer, PQclear(res); ereport(ERROR, (errmsg("could not receive data from WAL stream: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); } } if (rawlen < -1) ereport(ERROR, (errmsg("could not receive data from WAL stream: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); /* Return received messages to caller */ *buffer = conn->recvBuf; @@ -655,7 +655,7 @@ libpqrcv_send(WalReceiverConn *conn, const char *buffer, int nbytes) PQflush(conn->streamConn)) ereport(ERROR, (errmsg("could not send data to WAL stream: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); } /* @@ -689,7 +689,7 @@ libpqrcv_create_slot(WalReceiverConn *conn, const char *slotname, PQclear(res); ereport(ERROR, (errmsg("could not create replication slot \"%s\": %s", - slotname, PQerrorMessage(conn->streamConn)))); + slotname, pchomp(PQerrorMessage(conn->streamConn))))); } *lsn = DatumGetLSN(DirectFunctionCall1Coll(pg_lsn_in, InvalidOid, @@ -720,7 +720,7 @@ libpqrcv_command(WalReceiverConn *conn, const char *cmd, char **err) if (PQresultStatus(res) != PGRES_COMMAND_OK) { PQclear(res); - *err = pstrdup(PQerrorMessage(conn->streamConn)); + *err = pchomp(PQerrorMessage(conn->streamConn)); return false; } diff --git a/src/backend/utils/mmgr/mcxt.c b/src/backend/utils/mmgr/mcxt.c index 6ad0bb47b6..c21dfcb96b 100644 --- a/src/backend/utils/mmgr/mcxt.c +++ b/src/backend/utils/mmgr/mcxt.c @@ -1181,3 +1181,17 @@ pnstrdup(const char *in, Size len) out[len] = '\0'; return out; } + +/* + * Make copy of string with all trailing newline characters removed. + */ +char * +pchomp(const char *in) +{ + size_t n; + + n = strlen(in); + while (n > 0 && in[n - 1] == '\n') + n--; + return pnstrdup(in, n); +} diff --git a/src/include/utils/palloc.h b/src/include/utils/palloc.h index b72fe4aee8..2e07bd57ad 100644 --- a/src/include/utils/palloc.h +++ b/src/include/utils/palloc.h @@ -127,6 +127,8 @@ extern char *MemoryContextStrdup(MemoryContext context, const char *string); extern char *pstrdup(const char *in); extern char *pnstrdup(const char *in, Size len); +extern char *pchomp(const char *in); + /* sprintf into a palloc'd buffer --- these are in psprintf.c */ extern char *psprintf(const char *fmt,...) pg_attribute_printf(1, 2); extern size_t pvsnprintf(char *buf, size_t len, const char *fmt, va_list args) pg_attribute_printf(3, 0); -- 2.11.1 --------------8DBA76FBC0D2E1B20F0C5D8D Content-Type: text/plain Content-Disposition: inline Content-Transfer-Encoding: 8bit MIME-Version: 1.0 -- Sent via pgsql-hackers mailing list ([email protected]) To make changes to your subscription: http://www.postgresql.org/mailpref/pgsql-hackers --------------8DBA76FBC0D2E1B20F0C5D8D-- ^ permalink raw reply [nested|flat] 19+ messages in thread
* [PATCH] chomp PQerrorMessage() in backend uses @ 2017-02-08 14:31 Peter Eisentraut <[email protected]> 0 siblings, 0 replies; 19+ messages in thread From: Peter Eisentraut @ 2017-02-08 14:31 UTC (permalink / raw) PQerrorMessage() returns an error message with a trailing newline, but in backend use (dblink, postgres_fdw, libpqwalreceiver), we want to have the error message without that for emitting via ereport(). To simplify that, add a function pchomp() that returns a pstrdup'ed string with the trailing newline characters removed. --- contrib/dblink/dblink.c | 16 ++++++------ contrib/dblink/expected/dblink.out | 2 -- contrib/postgres_fdw/connection.c | 14 ++-------- .../libpqwalreceiver/libpqwalreceiver.c | 30 +++++++++++----------- src/backend/utils/mmgr/mcxt.c | 14 ++++++++++ src/include/utils/palloc.h | 2 ++ 6 files changed, 41 insertions(+), 37 deletions(-) diff --git a/contrib/dblink/dblink.c b/contrib/dblink/dblink.c index ac43c458cb..db0a8ba72d 100644 --- a/contrib/dblink/dblink.c +++ b/contrib/dblink/dblink.c @@ -166,7 +166,7 @@ typedef struct remoteConnHashEnt #define DBLINK_RES_INTERNALERROR(p2) \ do { \ - msg = pstrdup(PQerrorMessage(conn)); \ + msg = pchomp(PQerrorMessage(conn)); \ if (res) \ PQclear(res); \ elog(ERROR, "%s: %s", p2, msg); \ @@ -204,7 +204,7 @@ typedef struct remoteConnHashEnt conn = PQconnectdb(connstr); \ if (PQstatus(conn) == CONNECTION_BAD) \ { \ - msg = pstrdup(PQerrorMessage(conn)); \ + msg = pchomp(PQerrorMessage(conn)); \ PQfinish(conn); \ ereport(ERROR, \ (errcode(ERRCODE_SQLCLIENT_UNABLE_TO_ESTABLISH_SQLCONNECTION), \ @@ -278,7 +278,7 @@ dblink_connect(PG_FUNCTION_ARGS) if (PQstatus(conn) == CONNECTION_BAD) { - msg = pstrdup(PQerrorMessage(conn)); + msg = pchomp(PQerrorMessage(conn)); PQfinish(conn); if (rconn) pfree(rconn); @@ -651,7 +651,7 @@ dblink_send_query(PG_FUNCTION_ARGS) /* async query send */ retval = PQsendQuery(conn, sql); if (retval != 1) - elog(NOTICE, "could not send query: %s", PQerrorMessage(conn)); + elog(NOTICE, "could not send query: %s", pchomp(PQerrorMessage(conn))); PG_RETURN_INT32(retval); } @@ -1087,7 +1087,7 @@ storeQueryResult(volatile storeInfo *sinfo, PGconn *conn, const char *sql) PGresult *res; if (!PQsendQuery(conn, sql)) - elog(ERROR, "could not send query: %s", PQerrorMessage(conn)); + elog(ERROR, "could not send query: %s", pchomp(PQerrorMessage(conn))); if (!PQsetSingleRowMode(conn)) /* shouldn't fail */ elog(ERROR, "failed to set single-row mode for dblink query"); @@ -1366,8 +1366,8 @@ dblink_error_message(PG_FUNCTION_ARGS) DBLINK_INIT; DBLINK_GET_NAMED_CONN; - msg = PQerrorMessage(conn); - if (msg == NULL || msg[0] == '\0') + msg = pchomp(PQerrorMessage(conn)); + if (msg[0] == '\0') PG_RETURN_TEXT_P(cstring_to_text("OK")); else PG_RETURN_TEXT_P(cstring_to_text(msg)); @@ -2709,7 +2709,7 @@ dblink_res_error(PGconn *conn, const char *conname, PGresult *res, * return NULL, not a PGresult at all. */ if (message_primary == NULL) - message_primary = PQerrorMessage(conn); + message_primary = pchomp(PQerrorMessage(conn)); if (res) PQclear(res); diff --git a/contrib/dblink/expected/dblink.out b/contrib/dblink/expected/dblink.out index 5acaaf225a..4b6d26e574 100644 --- a/contrib/dblink/expected/dblink.out +++ b/contrib/dblink/expected/dblink.out @@ -377,7 +377,6 @@ FROM dblink('myconn','SELECT * FROM foo') AS t(a int, b text, c text[]) WHERE t.a > 7; ERROR: could not establish connection DETAIL: missing "=" after "myconn" in connection info string - -- create a named persistent connection SELECT dblink_connect('myconn',connection_parameters()); dblink_connect @@ -604,7 +603,6 @@ FROM dblink('myconn','SELECT * FROM foo') AS t(a int, b text, c text[]) WHERE t.a > 7; ERROR: could not establish connection DETAIL: missing "=" after "myconn" in connection info string - -- create a named persistent connection SELECT dblink_connect('myconn',connection_parameters()); dblink_connect diff --git a/contrib/postgres_fdw/connection.c b/contrib/postgres_fdw/connection.c index 7f7a744ac0..c6e3d44515 100644 --- a/contrib/postgres_fdw/connection.c +++ b/contrib/postgres_fdw/connection.c @@ -226,21 +226,11 @@ connect_pg_server(ForeignServer *server, UserMapping *user) conn = PQconnectdbParams(keywords, values, false); if (!conn || PQstatus(conn) != CONNECTION_OK) - { - char *connmessage; - int msglen; - - /* libpq typically appends a newline, strip that */ - connmessage = pstrdup(PQerrorMessage(conn)); - msglen = strlen(connmessage); - if (msglen > 0 && connmessage[msglen - 1] == '\n') - connmessage[msglen - 1] = '\0'; ereport(ERROR, (errcode(ERRCODE_SQLCLIENT_UNABLE_TO_ESTABLISH_SQLCONNECTION), errmsg("could not connect to server \"%s\"", server->servername), - errdetail_internal("%s", connmessage))); - } + errdetail_internal("%s", pchomp(PQerrorMessage(conn))))); /* * Check that non-superuser has used password to establish connection; @@ -563,7 +553,7 @@ pgfdw_report_error(int elevel, PGresult *res, PGconn *conn, * return NULL, not a PGresult at all. */ if (message_primary == NULL) - message_primary = PQerrorMessage(conn); + message_primary = pchomp(PQerrorMessage(conn)); ereport(elevel, (errcode(sqlstate), diff --git a/src/backend/replication/libpqwalreceiver/libpqwalreceiver.c b/src/backend/replication/libpqwalreceiver/libpqwalreceiver.c index 44a89c73fd..b88760fb68 100644 --- a/src/backend/replication/libpqwalreceiver/libpqwalreceiver.c +++ b/src/backend/replication/libpqwalreceiver/libpqwalreceiver.c @@ -141,7 +141,7 @@ libpqrcv_connect(const char *conninfo, bool logical, const char *appname, conn->streamConn = PQconnectdbParams(keys, vals, /* expand_dbname = */ true); if (PQstatus(conn->streamConn) != CONNECTION_OK) { - *err = pstrdup(PQerrorMessage(conn->streamConn)); + *err = pchomp(PQerrorMessage(conn->streamConn)); return NULL; } @@ -239,7 +239,7 @@ libpqrcv_identify_system(WalReceiverConn *conn, TimeLineID *primary_tli, ereport(ERROR, (errmsg("could not receive database system identifier and timeline ID from " "the primary server: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); } if (PQnfields(res) < 3 || PQntuples(res) != 1) { @@ -316,13 +316,13 @@ libpqrcv_startstreaming(WalReceiverConn *conn, if (!pubnames_str) ereport(ERROR, (errmsg("could not start WAL streaming: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); pubnames_literal = PQescapeLiteral(conn->streamConn, pubnames_str, strlen(pubnames_str)); if (!pubnames_literal) ereport(ERROR, (errmsg("could not start WAL streaming: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); appendStringInfo(&cmd, ", publication_names %s", pubnames_literal); PQfreemem(pubnames_literal); pfree(pubnames_str); @@ -347,7 +347,7 @@ libpqrcv_startstreaming(WalReceiverConn *conn, PQclear(res); ereport(ERROR, (errmsg("could not start WAL streaming: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); } PQclear(res); return true; @@ -366,7 +366,7 @@ libpqrcv_endstreaming(WalReceiverConn *conn, TimeLineID *next_tli) PQflush(conn->streamConn)) ereport(ERROR, (errmsg("could not send end-of-streaming message to primary: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); *next_tli = 0; @@ -410,7 +410,7 @@ libpqrcv_endstreaming(WalReceiverConn *conn, TimeLineID *next_tli) if (PQresultStatus(res) != PGRES_COMMAND_OK) ereport(ERROR, (errmsg("error reading result of streaming command: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); PQclear(res); /* Verify that there are no more results */ @@ -418,7 +418,7 @@ libpqrcv_endstreaming(WalReceiverConn *conn, TimeLineID *next_tli) if (res != NULL) ereport(ERROR, (errmsg("unexpected result after CommandComplete: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); } /* @@ -445,7 +445,7 @@ libpqrcv_readtimelinehistoryfile(WalReceiverConn *conn, ereport(ERROR, (errmsg("could not receive timeline history file from " "the primary server: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); } if (PQnfields(res) != 2 || PQntuples(res) != 1) { @@ -603,7 +603,7 @@ libpqrcv_receive(WalReceiverConn *conn, char **buffer, if (PQconsumeInput(conn->streamConn) == 0) ereport(ERROR, (errmsg("could not receive data from WAL stream: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); /* Now that we've consumed some input, try again */ rawlen = PQgetCopyData(conn->streamConn, &conn->recvBuf, 1); @@ -630,13 +630,13 @@ libpqrcv_receive(WalReceiverConn *conn, char **buffer, PQclear(res); ereport(ERROR, (errmsg("could not receive data from WAL stream: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); } } if (rawlen < -1) ereport(ERROR, (errmsg("could not receive data from WAL stream: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); /* Return received messages to caller */ *buffer = conn->recvBuf; @@ -655,7 +655,7 @@ libpqrcv_send(WalReceiverConn *conn, const char *buffer, int nbytes) PQflush(conn->streamConn)) ereport(ERROR, (errmsg("could not send data to WAL stream: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); } /* @@ -689,7 +689,7 @@ libpqrcv_create_slot(WalReceiverConn *conn, const char *slotname, PQclear(res); ereport(ERROR, (errmsg("could not create replication slot \"%s\": %s", - slotname, PQerrorMessage(conn->streamConn)))); + slotname, pchomp(PQerrorMessage(conn->streamConn))))); } *lsn = DatumGetLSN(DirectFunctionCall1Coll(pg_lsn_in, InvalidOid, @@ -720,7 +720,7 @@ libpqrcv_command(WalReceiverConn *conn, const char *cmd, char **err) if (PQresultStatus(res) != PGRES_COMMAND_OK) { PQclear(res); - *err = pstrdup(PQerrorMessage(conn->streamConn)); + *err = pchomp(PQerrorMessage(conn->streamConn)); return false; } diff --git a/src/backend/utils/mmgr/mcxt.c b/src/backend/utils/mmgr/mcxt.c index 6ad0bb47b6..c21dfcb96b 100644 --- a/src/backend/utils/mmgr/mcxt.c +++ b/src/backend/utils/mmgr/mcxt.c @@ -1181,3 +1181,17 @@ pnstrdup(const char *in, Size len) out[len] = '\0'; return out; } + +/* + * Make copy of string with all trailing newline characters removed. + */ +char * +pchomp(const char *in) +{ + size_t n; + + n = strlen(in); + while (n > 0 && in[n - 1] == '\n') + n--; + return pnstrdup(in, n); +} diff --git a/src/include/utils/palloc.h b/src/include/utils/palloc.h index b72fe4aee8..2e07bd57ad 100644 --- a/src/include/utils/palloc.h +++ b/src/include/utils/palloc.h @@ -127,6 +127,8 @@ extern char *MemoryContextStrdup(MemoryContext context, const char *string); extern char *pstrdup(const char *in); extern char *pnstrdup(const char *in, Size len); +extern char *pchomp(const char *in); + /* sprintf into a palloc'd buffer --- these are in psprintf.c */ extern char *psprintf(const char *fmt,...) pg_attribute_printf(1, 2); extern size_t pvsnprintf(char *buf, size_t len, const char *fmt, va_list args) pg_attribute_printf(3, 0); -- 2.11.1 --------------8DBA76FBC0D2E1B20F0C5D8D Content-Type: text/plain Content-Disposition: inline Content-Transfer-Encoding: 8bit MIME-Version: 1.0 -- Sent via pgsql-hackers mailing list ([email protected]) To make changes to your subscription: http://www.postgresql.org/mailpref/pgsql-hackers --------------8DBA76FBC0D2E1B20F0C5D8D-- ^ permalink raw reply [nested|flat] 19+ messages in thread
* [PATCH] chomp PQerrorMessage() in backend uses @ 2017-02-08 14:31 Peter Eisentraut <[email protected]> 0 siblings, 0 replies; 19+ messages in thread From: Peter Eisentraut @ 2017-02-08 14:31 UTC (permalink / raw) PQerrorMessage() returns an error message with a trailing newline, but in backend use (dblink, postgres_fdw, libpqwalreceiver), we want to have the error message without that for emitting via ereport(). To simplify that, add a function pchomp() that returns a pstrdup'ed string with the trailing newline characters removed. --- contrib/dblink/dblink.c | 16 ++++++------ contrib/dblink/expected/dblink.out | 2 -- contrib/postgres_fdw/connection.c | 14 ++-------- .../libpqwalreceiver/libpqwalreceiver.c | 30 +++++++++++----------- src/backend/utils/mmgr/mcxt.c | 14 ++++++++++ src/include/utils/palloc.h | 2 ++ 6 files changed, 41 insertions(+), 37 deletions(-) diff --git a/contrib/dblink/dblink.c b/contrib/dblink/dblink.c index ac43c458cb..db0a8ba72d 100644 --- a/contrib/dblink/dblink.c +++ b/contrib/dblink/dblink.c @@ -166,7 +166,7 @@ typedef struct remoteConnHashEnt #define DBLINK_RES_INTERNALERROR(p2) \ do { \ - msg = pstrdup(PQerrorMessage(conn)); \ + msg = pchomp(PQerrorMessage(conn)); \ if (res) \ PQclear(res); \ elog(ERROR, "%s: %s", p2, msg); \ @@ -204,7 +204,7 @@ typedef struct remoteConnHashEnt conn = PQconnectdb(connstr); \ if (PQstatus(conn) == CONNECTION_BAD) \ { \ - msg = pstrdup(PQerrorMessage(conn)); \ + msg = pchomp(PQerrorMessage(conn)); \ PQfinish(conn); \ ereport(ERROR, \ (errcode(ERRCODE_SQLCLIENT_UNABLE_TO_ESTABLISH_SQLCONNECTION), \ @@ -278,7 +278,7 @@ dblink_connect(PG_FUNCTION_ARGS) if (PQstatus(conn) == CONNECTION_BAD) { - msg = pstrdup(PQerrorMessage(conn)); + msg = pchomp(PQerrorMessage(conn)); PQfinish(conn); if (rconn) pfree(rconn); @@ -651,7 +651,7 @@ dblink_send_query(PG_FUNCTION_ARGS) /* async query send */ retval = PQsendQuery(conn, sql); if (retval != 1) - elog(NOTICE, "could not send query: %s", PQerrorMessage(conn)); + elog(NOTICE, "could not send query: %s", pchomp(PQerrorMessage(conn))); PG_RETURN_INT32(retval); } @@ -1087,7 +1087,7 @@ storeQueryResult(volatile storeInfo *sinfo, PGconn *conn, const char *sql) PGresult *res; if (!PQsendQuery(conn, sql)) - elog(ERROR, "could not send query: %s", PQerrorMessage(conn)); + elog(ERROR, "could not send query: %s", pchomp(PQerrorMessage(conn))); if (!PQsetSingleRowMode(conn)) /* shouldn't fail */ elog(ERROR, "failed to set single-row mode for dblink query"); @@ -1366,8 +1366,8 @@ dblink_error_message(PG_FUNCTION_ARGS) DBLINK_INIT; DBLINK_GET_NAMED_CONN; - msg = PQerrorMessage(conn); - if (msg == NULL || msg[0] == '\0') + msg = pchomp(PQerrorMessage(conn)); + if (msg[0] == '\0') PG_RETURN_TEXT_P(cstring_to_text("OK")); else PG_RETURN_TEXT_P(cstring_to_text(msg)); @@ -2709,7 +2709,7 @@ dblink_res_error(PGconn *conn, const char *conname, PGresult *res, * return NULL, not a PGresult at all. */ if (message_primary == NULL) - message_primary = PQerrorMessage(conn); + message_primary = pchomp(PQerrorMessage(conn)); if (res) PQclear(res); diff --git a/contrib/dblink/expected/dblink.out b/contrib/dblink/expected/dblink.out index 5acaaf225a..4b6d26e574 100644 --- a/contrib/dblink/expected/dblink.out +++ b/contrib/dblink/expected/dblink.out @@ -377,7 +377,6 @@ FROM dblink('myconn','SELECT * FROM foo') AS t(a int, b text, c text[]) WHERE t.a > 7; ERROR: could not establish connection DETAIL: missing "=" after "myconn" in connection info string - -- create a named persistent connection SELECT dblink_connect('myconn',connection_parameters()); dblink_connect @@ -604,7 +603,6 @@ FROM dblink('myconn','SELECT * FROM foo') AS t(a int, b text, c text[]) WHERE t.a > 7; ERROR: could not establish connection DETAIL: missing "=" after "myconn" in connection info string - -- create a named persistent connection SELECT dblink_connect('myconn',connection_parameters()); dblink_connect diff --git a/contrib/postgres_fdw/connection.c b/contrib/postgres_fdw/connection.c index 7f7a744ac0..c6e3d44515 100644 --- a/contrib/postgres_fdw/connection.c +++ b/contrib/postgres_fdw/connection.c @@ -226,21 +226,11 @@ connect_pg_server(ForeignServer *server, UserMapping *user) conn = PQconnectdbParams(keywords, values, false); if (!conn || PQstatus(conn) != CONNECTION_OK) - { - char *connmessage; - int msglen; - - /* libpq typically appends a newline, strip that */ - connmessage = pstrdup(PQerrorMessage(conn)); - msglen = strlen(connmessage); - if (msglen > 0 && connmessage[msglen - 1] == '\n') - connmessage[msglen - 1] = '\0'; ereport(ERROR, (errcode(ERRCODE_SQLCLIENT_UNABLE_TO_ESTABLISH_SQLCONNECTION), errmsg("could not connect to server \"%s\"", server->servername), - errdetail_internal("%s", connmessage))); - } + errdetail_internal("%s", pchomp(PQerrorMessage(conn))))); /* * Check that non-superuser has used password to establish connection; @@ -563,7 +553,7 @@ pgfdw_report_error(int elevel, PGresult *res, PGconn *conn, * return NULL, not a PGresult at all. */ if (message_primary == NULL) - message_primary = PQerrorMessage(conn); + message_primary = pchomp(PQerrorMessage(conn)); ereport(elevel, (errcode(sqlstate), diff --git a/src/backend/replication/libpqwalreceiver/libpqwalreceiver.c b/src/backend/replication/libpqwalreceiver/libpqwalreceiver.c index 44a89c73fd..b88760fb68 100644 --- a/src/backend/replication/libpqwalreceiver/libpqwalreceiver.c +++ b/src/backend/replication/libpqwalreceiver/libpqwalreceiver.c @@ -141,7 +141,7 @@ libpqrcv_connect(const char *conninfo, bool logical, const char *appname, conn->streamConn = PQconnectdbParams(keys, vals, /* expand_dbname = */ true); if (PQstatus(conn->streamConn) != CONNECTION_OK) { - *err = pstrdup(PQerrorMessage(conn->streamConn)); + *err = pchomp(PQerrorMessage(conn->streamConn)); return NULL; } @@ -239,7 +239,7 @@ libpqrcv_identify_system(WalReceiverConn *conn, TimeLineID *primary_tli, ereport(ERROR, (errmsg("could not receive database system identifier and timeline ID from " "the primary server: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); } if (PQnfields(res) < 3 || PQntuples(res) != 1) { @@ -316,13 +316,13 @@ libpqrcv_startstreaming(WalReceiverConn *conn, if (!pubnames_str) ereport(ERROR, (errmsg("could not start WAL streaming: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); pubnames_literal = PQescapeLiteral(conn->streamConn, pubnames_str, strlen(pubnames_str)); if (!pubnames_literal) ereport(ERROR, (errmsg("could not start WAL streaming: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); appendStringInfo(&cmd, ", publication_names %s", pubnames_literal); PQfreemem(pubnames_literal); pfree(pubnames_str); @@ -347,7 +347,7 @@ libpqrcv_startstreaming(WalReceiverConn *conn, PQclear(res); ereport(ERROR, (errmsg("could not start WAL streaming: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); } PQclear(res); return true; @@ -366,7 +366,7 @@ libpqrcv_endstreaming(WalReceiverConn *conn, TimeLineID *next_tli) PQflush(conn->streamConn)) ereport(ERROR, (errmsg("could not send end-of-streaming message to primary: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); *next_tli = 0; @@ -410,7 +410,7 @@ libpqrcv_endstreaming(WalReceiverConn *conn, TimeLineID *next_tli) if (PQresultStatus(res) != PGRES_COMMAND_OK) ereport(ERROR, (errmsg("error reading result of streaming command: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); PQclear(res); /* Verify that there are no more results */ @@ -418,7 +418,7 @@ libpqrcv_endstreaming(WalReceiverConn *conn, TimeLineID *next_tli) if (res != NULL) ereport(ERROR, (errmsg("unexpected result after CommandComplete: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); } /* @@ -445,7 +445,7 @@ libpqrcv_readtimelinehistoryfile(WalReceiverConn *conn, ereport(ERROR, (errmsg("could not receive timeline history file from " "the primary server: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); } if (PQnfields(res) != 2 || PQntuples(res) != 1) { @@ -603,7 +603,7 @@ libpqrcv_receive(WalReceiverConn *conn, char **buffer, if (PQconsumeInput(conn->streamConn) == 0) ereport(ERROR, (errmsg("could not receive data from WAL stream: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); /* Now that we've consumed some input, try again */ rawlen = PQgetCopyData(conn->streamConn, &conn->recvBuf, 1); @@ -630,13 +630,13 @@ libpqrcv_receive(WalReceiverConn *conn, char **buffer, PQclear(res); ereport(ERROR, (errmsg("could not receive data from WAL stream: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); } } if (rawlen < -1) ereport(ERROR, (errmsg("could not receive data from WAL stream: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); /* Return received messages to caller */ *buffer = conn->recvBuf; @@ -655,7 +655,7 @@ libpqrcv_send(WalReceiverConn *conn, const char *buffer, int nbytes) PQflush(conn->streamConn)) ereport(ERROR, (errmsg("could not send data to WAL stream: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); } /* @@ -689,7 +689,7 @@ libpqrcv_create_slot(WalReceiverConn *conn, const char *slotname, PQclear(res); ereport(ERROR, (errmsg("could not create replication slot \"%s\": %s", - slotname, PQerrorMessage(conn->streamConn)))); + slotname, pchomp(PQerrorMessage(conn->streamConn))))); } *lsn = DatumGetLSN(DirectFunctionCall1Coll(pg_lsn_in, InvalidOid, @@ -720,7 +720,7 @@ libpqrcv_command(WalReceiverConn *conn, const char *cmd, char **err) if (PQresultStatus(res) != PGRES_COMMAND_OK) { PQclear(res); - *err = pstrdup(PQerrorMessage(conn->streamConn)); + *err = pchomp(PQerrorMessage(conn->streamConn)); return false; } diff --git a/src/backend/utils/mmgr/mcxt.c b/src/backend/utils/mmgr/mcxt.c index 6ad0bb47b6..c21dfcb96b 100644 --- a/src/backend/utils/mmgr/mcxt.c +++ b/src/backend/utils/mmgr/mcxt.c @@ -1181,3 +1181,17 @@ pnstrdup(const char *in, Size len) out[len] = '\0'; return out; } + +/* + * Make copy of string with all trailing newline characters removed. + */ +char * +pchomp(const char *in) +{ + size_t n; + + n = strlen(in); + while (n > 0 && in[n - 1] == '\n') + n--; + return pnstrdup(in, n); +} diff --git a/src/include/utils/palloc.h b/src/include/utils/palloc.h index b72fe4aee8..2e07bd57ad 100644 --- a/src/include/utils/palloc.h +++ b/src/include/utils/palloc.h @@ -127,6 +127,8 @@ extern char *MemoryContextStrdup(MemoryContext context, const char *string); extern char *pstrdup(const char *in); extern char *pnstrdup(const char *in, Size len); +extern char *pchomp(const char *in); + /* sprintf into a palloc'd buffer --- these are in psprintf.c */ extern char *psprintf(const char *fmt,...) pg_attribute_printf(1, 2); extern size_t pvsnprintf(char *buf, size_t len, const char *fmt, va_list args) pg_attribute_printf(3, 0); -- 2.11.1 --------------8DBA76FBC0D2E1B20F0C5D8D Content-Type: text/plain Content-Disposition: inline Content-Transfer-Encoding: 8bit MIME-Version: 1.0 -- Sent via pgsql-hackers mailing list ([email protected]) To make changes to your subscription: http://www.postgresql.org/mailpref/pgsql-hackers --------------8DBA76FBC0D2E1B20F0C5D8D-- ^ permalink raw reply [nested|flat] 19+ messages in thread
* [PATCH] chomp PQerrorMessage() in backend uses @ 2017-02-08 14:31 Peter Eisentraut <[email protected]> 0 siblings, 0 replies; 19+ messages in thread From: Peter Eisentraut @ 2017-02-08 14:31 UTC (permalink / raw) PQerrorMessage() returns an error message with a trailing newline, but in backend use (dblink, postgres_fdw, libpqwalreceiver), we want to have the error message without that for emitting via ereport(). To simplify that, add a function pchomp() that returns a pstrdup'ed string with the trailing newline characters removed. --- contrib/dblink/dblink.c | 16 ++++++------ contrib/dblink/expected/dblink.out | 2 -- contrib/postgres_fdw/connection.c | 14 ++-------- .../libpqwalreceiver/libpqwalreceiver.c | 30 +++++++++++----------- src/backend/utils/mmgr/mcxt.c | 14 ++++++++++ src/include/utils/palloc.h | 2 ++ 6 files changed, 41 insertions(+), 37 deletions(-) diff --git a/contrib/dblink/dblink.c b/contrib/dblink/dblink.c index ac43c458cb..db0a8ba72d 100644 --- a/contrib/dblink/dblink.c +++ b/contrib/dblink/dblink.c @@ -166,7 +166,7 @@ typedef struct remoteConnHashEnt #define DBLINK_RES_INTERNALERROR(p2) \ do { \ - msg = pstrdup(PQerrorMessage(conn)); \ + msg = pchomp(PQerrorMessage(conn)); \ if (res) \ PQclear(res); \ elog(ERROR, "%s: %s", p2, msg); \ @@ -204,7 +204,7 @@ typedef struct remoteConnHashEnt conn = PQconnectdb(connstr); \ if (PQstatus(conn) == CONNECTION_BAD) \ { \ - msg = pstrdup(PQerrorMessage(conn)); \ + msg = pchomp(PQerrorMessage(conn)); \ PQfinish(conn); \ ereport(ERROR, \ (errcode(ERRCODE_SQLCLIENT_UNABLE_TO_ESTABLISH_SQLCONNECTION), \ @@ -278,7 +278,7 @@ dblink_connect(PG_FUNCTION_ARGS) if (PQstatus(conn) == CONNECTION_BAD) { - msg = pstrdup(PQerrorMessage(conn)); + msg = pchomp(PQerrorMessage(conn)); PQfinish(conn); if (rconn) pfree(rconn); @@ -651,7 +651,7 @@ dblink_send_query(PG_FUNCTION_ARGS) /* async query send */ retval = PQsendQuery(conn, sql); if (retval != 1) - elog(NOTICE, "could not send query: %s", PQerrorMessage(conn)); + elog(NOTICE, "could not send query: %s", pchomp(PQerrorMessage(conn))); PG_RETURN_INT32(retval); } @@ -1087,7 +1087,7 @@ storeQueryResult(volatile storeInfo *sinfo, PGconn *conn, const char *sql) PGresult *res; if (!PQsendQuery(conn, sql)) - elog(ERROR, "could not send query: %s", PQerrorMessage(conn)); + elog(ERROR, "could not send query: %s", pchomp(PQerrorMessage(conn))); if (!PQsetSingleRowMode(conn)) /* shouldn't fail */ elog(ERROR, "failed to set single-row mode for dblink query"); @@ -1366,8 +1366,8 @@ dblink_error_message(PG_FUNCTION_ARGS) DBLINK_INIT; DBLINK_GET_NAMED_CONN; - msg = PQerrorMessage(conn); - if (msg == NULL || msg[0] == '\0') + msg = pchomp(PQerrorMessage(conn)); + if (msg[0] == '\0') PG_RETURN_TEXT_P(cstring_to_text("OK")); else PG_RETURN_TEXT_P(cstring_to_text(msg)); @@ -2709,7 +2709,7 @@ dblink_res_error(PGconn *conn, const char *conname, PGresult *res, * return NULL, not a PGresult at all. */ if (message_primary == NULL) - message_primary = PQerrorMessage(conn); + message_primary = pchomp(PQerrorMessage(conn)); if (res) PQclear(res); diff --git a/contrib/dblink/expected/dblink.out b/contrib/dblink/expected/dblink.out index 5acaaf225a..4b6d26e574 100644 --- a/contrib/dblink/expected/dblink.out +++ b/contrib/dblink/expected/dblink.out @@ -377,7 +377,6 @@ FROM dblink('myconn','SELECT * FROM foo') AS t(a int, b text, c text[]) WHERE t.a > 7; ERROR: could not establish connection DETAIL: missing "=" after "myconn" in connection info string - -- create a named persistent connection SELECT dblink_connect('myconn',connection_parameters()); dblink_connect @@ -604,7 +603,6 @@ FROM dblink('myconn','SELECT * FROM foo') AS t(a int, b text, c text[]) WHERE t.a > 7; ERROR: could not establish connection DETAIL: missing "=" after "myconn" in connection info string - -- create a named persistent connection SELECT dblink_connect('myconn',connection_parameters()); dblink_connect diff --git a/contrib/postgres_fdw/connection.c b/contrib/postgres_fdw/connection.c index 7f7a744ac0..c6e3d44515 100644 --- a/contrib/postgres_fdw/connection.c +++ b/contrib/postgres_fdw/connection.c @@ -226,21 +226,11 @@ connect_pg_server(ForeignServer *server, UserMapping *user) conn = PQconnectdbParams(keywords, values, false); if (!conn || PQstatus(conn) != CONNECTION_OK) - { - char *connmessage; - int msglen; - - /* libpq typically appends a newline, strip that */ - connmessage = pstrdup(PQerrorMessage(conn)); - msglen = strlen(connmessage); - if (msglen > 0 && connmessage[msglen - 1] == '\n') - connmessage[msglen - 1] = '\0'; ereport(ERROR, (errcode(ERRCODE_SQLCLIENT_UNABLE_TO_ESTABLISH_SQLCONNECTION), errmsg("could not connect to server \"%s\"", server->servername), - errdetail_internal("%s", connmessage))); - } + errdetail_internal("%s", pchomp(PQerrorMessage(conn))))); /* * Check that non-superuser has used password to establish connection; @@ -563,7 +553,7 @@ pgfdw_report_error(int elevel, PGresult *res, PGconn *conn, * return NULL, not a PGresult at all. */ if (message_primary == NULL) - message_primary = PQerrorMessage(conn); + message_primary = pchomp(PQerrorMessage(conn)); ereport(elevel, (errcode(sqlstate), diff --git a/src/backend/replication/libpqwalreceiver/libpqwalreceiver.c b/src/backend/replication/libpqwalreceiver/libpqwalreceiver.c index 44a89c73fd..b88760fb68 100644 --- a/src/backend/replication/libpqwalreceiver/libpqwalreceiver.c +++ b/src/backend/replication/libpqwalreceiver/libpqwalreceiver.c @@ -141,7 +141,7 @@ libpqrcv_connect(const char *conninfo, bool logical, const char *appname, conn->streamConn = PQconnectdbParams(keys, vals, /* expand_dbname = */ true); if (PQstatus(conn->streamConn) != CONNECTION_OK) { - *err = pstrdup(PQerrorMessage(conn->streamConn)); + *err = pchomp(PQerrorMessage(conn->streamConn)); return NULL; } @@ -239,7 +239,7 @@ libpqrcv_identify_system(WalReceiverConn *conn, TimeLineID *primary_tli, ereport(ERROR, (errmsg("could not receive database system identifier and timeline ID from " "the primary server: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); } if (PQnfields(res) < 3 || PQntuples(res) != 1) { @@ -316,13 +316,13 @@ libpqrcv_startstreaming(WalReceiverConn *conn, if (!pubnames_str) ereport(ERROR, (errmsg("could not start WAL streaming: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); pubnames_literal = PQescapeLiteral(conn->streamConn, pubnames_str, strlen(pubnames_str)); if (!pubnames_literal) ereport(ERROR, (errmsg("could not start WAL streaming: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); appendStringInfo(&cmd, ", publication_names %s", pubnames_literal); PQfreemem(pubnames_literal); pfree(pubnames_str); @@ -347,7 +347,7 @@ libpqrcv_startstreaming(WalReceiverConn *conn, PQclear(res); ereport(ERROR, (errmsg("could not start WAL streaming: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); } PQclear(res); return true; @@ -366,7 +366,7 @@ libpqrcv_endstreaming(WalReceiverConn *conn, TimeLineID *next_tli) PQflush(conn->streamConn)) ereport(ERROR, (errmsg("could not send end-of-streaming message to primary: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); *next_tli = 0; @@ -410,7 +410,7 @@ libpqrcv_endstreaming(WalReceiverConn *conn, TimeLineID *next_tli) if (PQresultStatus(res) != PGRES_COMMAND_OK) ereport(ERROR, (errmsg("error reading result of streaming command: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); PQclear(res); /* Verify that there are no more results */ @@ -418,7 +418,7 @@ libpqrcv_endstreaming(WalReceiverConn *conn, TimeLineID *next_tli) if (res != NULL) ereport(ERROR, (errmsg("unexpected result after CommandComplete: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); } /* @@ -445,7 +445,7 @@ libpqrcv_readtimelinehistoryfile(WalReceiverConn *conn, ereport(ERROR, (errmsg("could not receive timeline history file from " "the primary server: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); } if (PQnfields(res) != 2 || PQntuples(res) != 1) { @@ -603,7 +603,7 @@ libpqrcv_receive(WalReceiverConn *conn, char **buffer, if (PQconsumeInput(conn->streamConn) == 0) ereport(ERROR, (errmsg("could not receive data from WAL stream: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); /* Now that we've consumed some input, try again */ rawlen = PQgetCopyData(conn->streamConn, &conn->recvBuf, 1); @@ -630,13 +630,13 @@ libpqrcv_receive(WalReceiverConn *conn, char **buffer, PQclear(res); ereport(ERROR, (errmsg("could not receive data from WAL stream: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); } } if (rawlen < -1) ereport(ERROR, (errmsg("could not receive data from WAL stream: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); /* Return received messages to caller */ *buffer = conn->recvBuf; @@ -655,7 +655,7 @@ libpqrcv_send(WalReceiverConn *conn, const char *buffer, int nbytes) PQflush(conn->streamConn)) ereport(ERROR, (errmsg("could not send data to WAL stream: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); } /* @@ -689,7 +689,7 @@ libpqrcv_create_slot(WalReceiverConn *conn, const char *slotname, PQclear(res); ereport(ERROR, (errmsg("could not create replication slot \"%s\": %s", - slotname, PQerrorMessage(conn->streamConn)))); + slotname, pchomp(PQerrorMessage(conn->streamConn))))); } *lsn = DatumGetLSN(DirectFunctionCall1Coll(pg_lsn_in, InvalidOid, @@ -720,7 +720,7 @@ libpqrcv_command(WalReceiverConn *conn, const char *cmd, char **err) if (PQresultStatus(res) != PGRES_COMMAND_OK) { PQclear(res); - *err = pstrdup(PQerrorMessage(conn->streamConn)); + *err = pchomp(PQerrorMessage(conn->streamConn)); return false; } diff --git a/src/backend/utils/mmgr/mcxt.c b/src/backend/utils/mmgr/mcxt.c index 6ad0bb47b6..c21dfcb96b 100644 --- a/src/backend/utils/mmgr/mcxt.c +++ b/src/backend/utils/mmgr/mcxt.c @@ -1181,3 +1181,17 @@ pnstrdup(const char *in, Size len) out[len] = '\0'; return out; } + +/* + * Make copy of string with all trailing newline characters removed. + */ +char * +pchomp(const char *in) +{ + size_t n; + + n = strlen(in); + while (n > 0 && in[n - 1] == '\n') + n--; + return pnstrdup(in, n); +} diff --git a/src/include/utils/palloc.h b/src/include/utils/palloc.h index b72fe4aee8..2e07bd57ad 100644 --- a/src/include/utils/palloc.h +++ b/src/include/utils/palloc.h @@ -127,6 +127,8 @@ extern char *MemoryContextStrdup(MemoryContext context, const char *string); extern char *pstrdup(const char *in); extern char *pnstrdup(const char *in, Size len); +extern char *pchomp(const char *in); + /* sprintf into a palloc'd buffer --- these are in psprintf.c */ extern char *psprintf(const char *fmt,...) pg_attribute_printf(1, 2); extern size_t pvsnprintf(char *buf, size_t len, const char *fmt, va_list args) pg_attribute_printf(3, 0); -- 2.11.1 --------------8DBA76FBC0D2E1B20F0C5D8D Content-Type: text/plain Content-Disposition: inline Content-Transfer-Encoding: 8bit MIME-Version: 1.0 -- Sent via pgsql-hackers mailing list ([email protected]) To make changes to your subscription: http://www.postgresql.org/mailpref/pgsql-hackers --------------8DBA76FBC0D2E1B20F0C5D8D-- ^ permalink raw reply [nested|flat] 19+ messages in thread
* [PATCH] chomp PQerrorMessage() in backend uses @ 2017-02-08 14:31 Peter Eisentraut <[email protected]> 0 siblings, 0 replies; 19+ messages in thread From: Peter Eisentraut @ 2017-02-08 14:31 UTC (permalink / raw) PQerrorMessage() returns an error message with a trailing newline, but in backend use (dblink, postgres_fdw, libpqwalreceiver), we want to have the error message without that for emitting via ereport(). To simplify that, add a function pchomp() that returns a pstrdup'ed string with the trailing newline characters removed. --- contrib/dblink/dblink.c | 16 ++++++------ contrib/dblink/expected/dblink.out | 2 -- contrib/postgres_fdw/connection.c | 14 ++-------- .../libpqwalreceiver/libpqwalreceiver.c | 30 +++++++++++----------- src/backend/utils/mmgr/mcxt.c | 14 ++++++++++ src/include/utils/palloc.h | 2 ++ 6 files changed, 41 insertions(+), 37 deletions(-) diff --git a/contrib/dblink/dblink.c b/contrib/dblink/dblink.c index ac43c458cb..db0a8ba72d 100644 --- a/contrib/dblink/dblink.c +++ b/contrib/dblink/dblink.c @@ -166,7 +166,7 @@ typedef struct remoteConnHashEnt #define DBLINK_RES_INTERNALERROR(p2) \ do { \ - msg = pstrdup(PQerrorMessage(conn)); \ + msg = pchomp(PQerrorMessage(conn)); \ if (res) \ PQclear(res); \ elog(ERROR, "%s: %s", p2, msg); \ @@ -204,7 +204,7 @@ typedef struct remoteConnHashEnt conn = PQconnectdb(connstr); \ if (PQstatus(conn) == CONNECTION_BAD) \ { \ - msg = pstrdup(PQerrorMessage(conn)); \ + msg = pchomp(PQerrorMessage(conn)); \ PQfinish(conn); \ ereport(ERROR, \ (errcode(ERRCODE_SQLCLIENT_UNABLE_TO_ESTABLISH_SQLCONNECTION), \ @@ -278,7 +278,7 @@ dblink_connect(PG_FUNCTION_ARGS) if (PQstatus(conn) == CONNECTION_BAD) { - msg = pstrdup(PQerrorMessage(conn)); + msg = pchomp(PQerrorMessage(conn)); PQfinish(conn); if (rconn) pfree(rconn); @@ -651,7 +651,7 @@ dblink_send_query(PG_FUNCTION_ARGS) /* async query send */ retval = PQsendQuery(conn, sql); if (retval != 1) - elog(NOTICE, "could not send query: %s", PQerrorMessage(conn)); + elog(NOTICE, "could not send query: %s", pchomp(PQerrorMessage(conn))); PG_RETURN_INT32(retval); } @@ -1087,7 +1087,7 @@ storeQueryResult(volatile storeInfo *sinfo, PGconn *conn, const char *sql) PGresult *res; if (!PQsendQuery(conn, sql)) - elog(ERROR, "could not send query: %s", PQerrorMessage(conn)); + elog(ERROR, "could not send query: %s", pchomp(PQerrorMessage(conn))); if (!PQsetSingleRowMode(conn)) /* shouldn't fail */ elog(ERROR, "failed to set single-row mode for dblink query"); @@ -1366,8 +1366,8 @@ dblink_error_message(PG_FUNCTION_ARGS) DBLINK_INIT; DBLINK_GET_NAMED_CONN; - msg = PQerrorMessage(conn); - if (msg == NULL || msg[0] == '\0') + msg = pchomp(PQerrorMessage(conn)); + if (msg[0] == '\0') PG_RETURN_TEXT_P(cstring_to_text("OK")); else PG_RETURN_TEXT_P(cstring_to_text(msg)); @@ -2709,7 +2709,7 @@ dblink_res_error(PGconn *conn, const char *conname, PGresult *res, * return NULL, not a PGresult at all. */ if (message_primary == NULL) - message_primary = PQerrorMessage(conn); + message_primary = pchomp(PQerrorMessage(conn)); if (res) PQclear(res); diff --git a/contrib/dblink/expected/dblink.out b/contrib/dblink/expected/dblink.out index 5acaaf225a..4b6d26e574 100644 --- a/contrib/dblink/expected/dblink.out +++ b/contrib/dblink/expected/dblink.out @@ -377,7 +377,6 @@ FROM dblink('myconn','SELECT * FROM foo') AS t(a int, b text, c text[]) WHERE t.a > 7; ERROR: could not establish connection DETAIL: missing "=" after "myconn" in connection info string - -- create a named persistent connection SELECT dblink_connect('myconn',connection_parameters()); dblink_connect @@ -604,7 +603,6 @@ FROM dblink('myconn','SELECT * FROM foo') AS t(a int, b text, c text[]) WHERE t.a > 7; ERROR: could not establish connection DETAIL: missing "=" after "myconn" in connection info string - -- create a named persistent connection SELECT dblink_connect('myconn',connection_parameters()); dblink_connect diff --git a/contrib/postgres_fdw/connection.c b/contrib/postgres_fdw/connection.c index 7f7a744ac0..c6e3d44515 100644 --- a/contrib/postgres_fdw/connection.c +++ b/contrib/postgres_fdw/connection.c @@ -226,21 +226,11 @@ connect_pg_server(ForeignServer *server, UserMapping *user) conn = PQconnectdbParams(keywords, values, false); if (!conn || PQstatus(conn) != CONNECTION_OK) - { - char *connmessage; - int msglen; - - /* libpq typically appends a newline, strip that */ - connmessage = pstrdup(PQerrorMessage(conn)); - msglen = strlen(connmessage); - if (msglen > 0 && connmessage[msglen - 1] == '\n') - connmessage[msglen - 1] = '\0'; ereport(ERROR, (errcode(ERRCODE_SQLCLIENT_UNABLE_TO_ESTABLISH_SQLCONNECTION), errmsg("could not connect to server \"%s\"", server->servername), - errdetail_internal("%s", connmessage))); - } + errdetail_internal("%s", pchomp(PQerrorMessage(conn))))); /* * Check that non-superuser has used password to establish connection; @@ -563,7 +553,7 @@ pgfdw_report_error(int elevel, PGresult *res, PGconn *conn, * return NULL, not a PGresult at all. */ if (message_primary == NULL) - message_primary = PQerrorMessage(conn); + message_primary = pchomp(PQerrorMessage(conn)); ereport(elevel, (errcode(sqlstate), diff --git a/src/backend/replication/libpqwalreceiver/libpqwalreceiver.c b/src/backend/replication/libpqwalreceiver/libpqwalreceiver.c index 44a89c73fd..b88760fb68 100644 --- a/src/backend/replication/libpqwalreceiver/libpqwalreceiver.c +++ b/src/backend/replication/libpqwalreceiver/libpqwalreceiver.c @@ -141,7 +141,7 @@ libpqrcv_connect(const char *conninfo, bool logical, const char *appname, conn->streamConn = PQconnectdbParams(keys, vals, /* expand_dbname = */ true); if (PQstatus(conn->streamConn) != CONNECTION_OK) { - *err = pstrdup(PQerrorMessage(conn->streamConn)); + *err = pchomp(PQerrorMessage(conn->streamConn)); return NULL; } @@ -239,7 +239,7 @@ libpqrcv_identify_system(WalReceiverConn *conn, TimeLineID *primary_tli, ereport(ERROR, (errmsg("could not receive database system identifier and timeline ID from " "the primary server: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); } if (PQnfields(res) < 3 || PQntuples(res) != 1) { @@ -316,13 +316,13 @@ libpqrcv_startstreaming(WalReceiverConn *conn, if (!pubnames_str) ereport(ERROR, (errmsg("could not start WAL streaming: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); pubnames_literal = PQescapeLiteral(conn->streamConn, pubnames_str, strlen(pubnames_str)); if (!pubnames_literal) ereport(ERROR, (errmsg("could not start WAL streaming: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); appendStringInfo(&cmd, ", publication_names %s", pubnames_literal); PQfreemem(pubnames_literal); pfree(pubnames_str); @@ -347,7 +347,7 @@ libpqrcv_startstreaming(WalReceiverConn *conn, PQclear(res); ereport(ERROR, (errmsg("could not start WAL streaming: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); } PQclear(res); return true; @@ -366,7 +366,7 @@ libpqrcv_endstreaming(WalReceiverConn *conn, TimeLineID *next_tli) PQflush(conn->streamConn)) ereport(ERROR, (errmsg("could not send end-of-streaming message to primary: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); *next_tli = 0; @@ -410,7 +410,7 @@ libpqrcv_endstreaming(WalReceiverConn *conn, TimeLineID *next_tli) if (PQresultStatus(res) != PGRES_COMMAND_OK) ereport(ERROR, (errmsg("error reading result of streaming command: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); PQclear(res); /* Verify that there are no more results */ @@ -418,7 +418,7 @@ libpqrcv_endstreaming(WalReceiverConn *conn, TimeLineID *next_tli) if (res != NULL) ereport(ERROR, (errmsg("unexpected result after CommandComplete: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); } /* @@ -445,7 +445,7 @@ libpqrcv_readtimelinehistoryfile(WalReceiverConn *conn, ereport(ERROR, (errmsg("could not receive timeline history file from " "the primary server: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); } if (PQnfields(res) != 2 || PQntuples(res) != 1) { @@ -603,7 +603,7 @@ libpqrcv_receive(WalReceiverConn *conn, char **buffer, if (PQconsumeInput(conn->streamConn) == 0) ereport(ERROR, (errmsg("could not receive data from WAL stream: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); /* Now that we've consumed some input, try again */ rawlen = PQgetCopyData(conn->streamConn, &conn->recvBuf, 1); @@ -630,13 +630,13 @@ libpqrcv_receive(WalReceiverConn *conn, char **buffer, PQclear(res); ereport(ERROR, (errmsg("could not receive data from WAL stream: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); } } if (rawlen < -1) ereport(ERROR, (errmsg("could not receive data from WAL stream: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); /* Return received messages to caller */ *buffer = conn->recvBuf; @@ -655,7 +655,7 @@ libpqrcv_send(WalReceiverConn *conn, const char *buffer, int nbytes) PQflush(conn->streamConn)) ereport(ERROR, (errmsg("could not send data to WAL stream: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); } /* @@ -689,7 +689,7 @@ libpqrcv_create_slot(WalReceiverConn *conn, const char *slotname, PQclear(res); ereport(ERROR, (errmsg("could not create replication slot \"%s\": %s", - slotname, PQerrorMessage(conn->streamConn)))); + slotname, pchomp(PQerrorMessage(conn->streamConn))))); } *lsn = DatumGetLSN(DirectFunctionCall1Coll(pg_lsn_in, InvalidOid, @@ -720,7 +720,7 @@ libpqrcv_command(WalReceiverConn *conn, const char *cmd, char **err) if (PQresultStatus(res) != PGRES_COMMAND_OK) { PQclear(res); - *err = pstrdup(PQerrorMessage(conn->streamConn)); + *err = pchomp(PQerrorMessage(conn->streamConn)); return false; } diff --git a/src/backend/utils/mmgr/mcxt.c b/src/backend/utils/mmgr/mcxt.c index 6ad0bb47b6..c21dfcb96b 100644 --- a/src/backend/utils/mmgr/mcxt.c +++ b/src/backend/utils/mmgr/mcxt.c @@ -1181,3 +1181,17 @@ pnstrdup(const char *in, Size len) out[len] = '\0'; return out; } + +/* + * Make copy of string with all trailing newline characters removed. + */ +char * +pchomp(const char *in) +{ + size_t n; + + n = strlen(in); + while (n > 0 && in[n - 1] == '\n') + n--; + return pnstrdup(in, n); +} diff --git a/src/include/utils/palloc.h b/src/include/utils/palloc.h index b72fe4aee8..2e07bd57ad 100644 --- a/src/include/utils/palloc.h +++ b/src/include/utils/palloc.h @@ -127,6 +127,8 @@ extern char *MemoryContextStrdup(MemoryContext context, const char *string); extern char *pstrdup(const char *in); extern char *pnstrdup(const char *in, Size len); +extern char *pchomp(const char *in); + /* sprintf into a palloc'd buffer --- these are in psprintf.c */ extern char *psprintf(const char *fmt,...) pg_attribute_printf(1, 2); extern size_t pvsnprintf(char *buf, size_t len, const char *fmt, va_list args) pg_attribute_printf(3, 0); -- 2.11.1 --------------8DBA76FBC0D2E1B20F0C5D8D Content-Type: text/plain Content-Disposition: inline Content-Transfer-Encoding: 8bit MIME-Version: 1.0 -- Sent via pgsql-hackers mailing list ([email protected]) To make changes to your subscription: http://www.postgresql.org/mailpref/pgsql-hackers --------------8DBA76FBC0D2E1B20F0C5D8D-- ^ permalink raw reply [nested|flat] 19+ messages in thread
* [PATCH] chomp PQerrorMessage() in backend uses @ 2017-02-08 14:31 Peter Eisentraut <[email protected]> 0 siblings, 0 replies; 19+ messages in thread From: Peter Eisentraut @ 2017-02-08 14:31 UTC (permalink / raw) PQerrorMessage() returns an error message with a trailing newline, but in backend use (dblink, postgres_fdw, libpqwalreceiver), we want to have the error message without that for emitting via ereport(). To simplify that, add a function pchomp() that returns a pstrdup'ed string with the trailing newline characters removed. --- contrib/dblink/dblink.c | 16 ++++++------ contrib/dblink/expected/dblink.out | 2 -- contrib/postgres_fdw/connection.c | 14 ++-------- .../libpqwalreceiver/libpqwalreceiver.c | 30 +++++++++++----------- src/backend/utils/mmgr/mcxt.c | 14 ++++++++++ src/include/utils/palloc.h | 2 ++ 6 files changed, 41 insertions(+), 37 deletions(-) diff --git a/contrib/dblink/dblink.c b/contrib/dblink/dblink.c index ac43c458cb..db0a8ba72d 100644 --- a/contrib/dblink/dblink.c +++ b/contrib/dblink/dblink.c @@ -166,7 +166,7 @@ typedef struct remoteConnHashEnt #define DBLINK_RES_INTERNALERROR(p2) \ do { \ - msg = pstrdup(PQerrorMessage(conn)); \ + msg = pchomp(PQerrorMessage(conn)); \ if (res) \ PQclear(res); \ elog(ERROR, "%s: %s", p2, msg); \ @@ -204,7 +204,7 @@ typedef struct remoteConnHashEnt conn = PQconnectdb(connstr); \ if (PQstatus(conn) == CONNECTION_BAD) \ { \ - msg = pstrdup(PQerrorMessage(conn)); \ + msg = pchomp(PQerrorMessage(conn)); \ PQfinish(conn); \ ereport(ERROR, \ (errcode(ERRCODE_SQLCLIENT_UNABLE_TO_ESTABLISH_SQLCONNECTION), \ @@ -278,7 +278,7 @@ dblink_connect(PG_FUNCTION_ARGS) if (PQstatus(conn) == CONNECTION_BAD) { - msg = pstrdup(PQerrorMessage(conn)); + msg = pchomp(PQerrorMessage(conn)); PQfinish(conn); if (rconn) pfree(rconn); @@ -651,7 +651,7 @@ dblink_send_query(PG_FUNCTION_ARGS) /* async query send */ retval = PQsendQuery(conn, sql); if (retval != 1) - elog(NOTICE, "could not send query: %s", PQerrorMessage(conn)); + elog(NOTICE, "could not send query: %s", pchomp(PQerrorMessage(conn))); PG_RETURN_INT32(retval); } @@ -1087,7 +1087,7 @@ storeQueryResult(volatile storeInfo *sinfo, PGconn *conn, const char *sql) PGresult *res; if (!PQsendQuery(conn, sql)) - elog(ERROR, "could not send query: %s", PQerrorMessage(conn)); + elog(ERROR, "could not send query: %s", pchomp(PQerrorMessage(conn))); if (!PQsetSingleRowMode(conn)) /* shouldn't fail */ elog(ERROR, "failed to set single-row mode for dblink query"); @@ -1366,8 +1366,8 @@ dblink_error_message(PG_FUNCTION_ARGS) DBLINK_INIT; DBLINK_GET_NAMED_CONN; - msg = PQerrorMessage(conn); - if (msg == NULL || msg[0] == '\0') + msg = pchomp(PQerrorMessage(conn)); + if (msg[0] == '\0') PG_RETURN_TEXT_P(cstring_to_text("OK")); else PG_RETURN_TEXT_P(cstring_to_text(msg)); @@ -2709,7 +2709,7 @@ dblink_res_error(PGconn *conn, const char *conname, PGresult *res, * return NULL, not a PGresult at all. */ if (message_primary == NULL) - message_primary = PQerrorMessage(conn); + message_primary = pchomp(PQerrorMessage(conn)); if (res) PQclear(res); diff --git a/contrib/dblink/expected/dblink.out b/contrib/dblink/expected/dblink.out index 5acaaf225a..4b6d26e574 100644 --- a/contrib/dblink/expected/dblink.out +++ b/contrib/dblink/expected/dblink.out @@ -377,7 +377,6 @@ FROM dblink('myconn','SELECT * FROM foo') AS t(a int, b text, c text[]) WHERE t.a > 7; ERROR: could not establish connection DETAIL: missing "=" after "myconn" in connection info string - -- create a named persistent connection SELECT dblink_connect('myconn',connection_parameters()); dblink_connect @@ -604,7 +603,6 @@ FROM dblink('myconn','SELECT * FROM foo') AS t(a int, b text, c text[]) WHERE t.a > 7; ERROR: could not establish connection DETAIL: missing "=" after "myconn" in connection info string - -- create a named persistent connection SELECT dblink_connect('myconn',connection_parameters()); dblink_connect diff --git a/contrib/postgres_fdw/connection.c b/contrib/postgres_fdw/connection.c index 7f7a744ac0..c6e3d44515 100644 --- a/contrib/postgres_fdw/connection.c +++ b/contrib/postgres_fdw/connection.c @@ -226,21 +226,11 @@ connect_pg_server(ForeignServer *server, UserMapping *user) conn = PQconnectdbParams(keywords, values, false); if (!conn || PQstatus(conn) != CONNECTION_OK) - { - char *connmessage; - int msglen; - - /* libpq typically appends a newline, strip that */ - connmessage = pstrdup(PQerrorMessage(conn)); - msglen = strlen(connmessage); - if (msglen > 0 && connmessage[msglen - 1] == '\n') - connmessage[msglen - 1] = '\0'; ereport(ERROR, (errcode(ERRCODE_SQLCLIENT_UNABLE_TO_ESTABLISH_SQLCONNECTION), errmsg("could not connect to server \"%s\"", server->servername), - errdetail_internal("%s", connmessage))); - } + errdetail_internal("%s", pchomp(PQerrorMessage(conn))))); /* * Check that non-superuser has used password to establish connection; @@ -563,7 +553,7 @@ pgfdw_report_error(int elevel, PGresult *res, PGconn *conn, * return NULL, not a PGresult at all. */ if (message_primary == NULL) - message_primary = PQerrorMessage(conn); + message_primary = pchomp(PQerrorMessage(conn)); ereport(elevel, (errcode(sqlstate), diff --git a/src/backend/replication/libpqwalreceiver/libpqwalreceiver.c b/src/backend/replication/libpqwalreceiver/libpqwalreceiver.c index 44a89c73fd..b88760fb68 100644 --- a/src/backend/replication/libpqwalreceiver/libpqwalreceiver.c +++ b/src/backend/replication/libpqwalreceiver/libpqwalreceiver.c @@ -141,7 +141,7 @@ libpqrcv_connect(const char *conninfo, bool logical, const char *appname, conn->streamConn = PQconnectdbParams(keys, vals, /* expand_dbname = */ true); if (PQstatus(conn->streamConn) != CONNECTION_OK) { - *err = pstrdup(PQerrorMessage(conn->streamConn)); + *err = pchomp(PQerrorMessage(conn->streamConn)); return NULL; } @@ -239,7 +239,7 @@ libpqrcv_identify_system(WalReceiverConn *conn, TimeLineID *primary_tli, ereport(ERROR, (errmsg("could not receive database system identifier and timeline ID from " "the primary server: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); } if (PQnfields(res) < 3 || PQntuples(res) != 1) { @@ -316,13 +316,13 @@ libpqrcv_startstreaming(WalReceiverConn *conn, if (!pubnames_str) ereport(ERROR, (errmsg("could not start WAL streaming: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); pubnames_literal = PQescapeLiteral(conn->streamConn, pubnames_str, strlen(pubnames_str)); if (!pubnames_literal) ereport(ERROR, (errmsg("could not start WAL streaming: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); appendStringInfo(&cmd, ", publication_names %s", pubnames_literal); PQfreemem(pubnames_literal); pfree(pubnames_str); @@ -347,7 +347,7 @@ libpqrcv_startstreaming(WalReceiverConn *conn, PQclear(res); ereport(ERROR, (errmsg("could not start WAL streaming: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); } PQclear(res); return true; @@ -366,7 +366,7 @@ libpqrcv_endstreaming(WalReceiverConn *conn, TimeLineID *next_tli) PQflush(conn->streamConn)) ereport(ERROR, (errmsg("could not send end-of-streaming message to primary: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); *next_tli = 0; @@ -410,7 +410,7 @@ libpqrcv_endstreaming(WalReceiverConn *conn, TimeLineID *next_tli) if (PQresultStatus(res) != PGRES_COMMAND_OK) ereport(ERROR, (errmsg("error reading result of streaming command: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); PQclear(res); /* Verify that there are no more results */ @@ -418,7 +418,7 @@ libpqrcv_endstreaming(WalReceiverConn *conn, TimeLineID *next_tli) if (res != NULL) ereport(ERROR, (errmsg("unexpected result after CommandComplete: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); } /* @@ -445,7 +445,7 @@ libpqrcv_readtimelinehistoryfile(WalReceiverConn *conn, ereport(ERROR, (errmsg("could not receive timeline history file from " "the primary server: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); } if (PQnfields(res) != 2 || PQntuples(res) != 1) { @@ -603,7 +603,7 @@ libpqrcv_receive(WalReceiverConn *conn, char **buffer, if (PQconsumeInput(conn->streamConn) == 0) ereport(ERROR, (errmsg("could not receive data from WAL stream: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); /* Now that we've consumed some input, try again */ rawlen = PQgetCopyData(conn->streamConn, &conn->recvBuf, 1); @@ -630,13 +630,13 @@ libpqrcv_receive(WalReceiverConn *conn, char **buffer, PQclear(res); ereport(ERROR, (errmsg("could not receive data from WAL stream: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); } } if (rawlen < -1) ereport(ERROR, (errmsg("could not receive data from WAL stream: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); /* Return received messages to caller */ *buffer = conn->recvBuf; @@ -655,7 +655,7 @@ libpqrcv_send(WalReceiverConn *conn, const char *buffer, int nbytes) PQflush(conn->streamConn)) ereport(ERROR, (errmsg("could not send data to WAL stream: %s", - PQerrorMessage(conn->streamConn)))); + pchomp(PQerrorMessage(conn->streamConn))))); } /* @@ -689,7 +689,7 @@ libpqrcv_create_slot(WalReceiverConn *conn, const char *slotname, PQclear(res); ereport(ERROR, (errmsg("could not create replication slot \"%s\": %s", - slotname, PQerrorMessage(conn->streamConn)))); + slotname, pchomp(PQerrorMessage(conn->streamConn))))); } *lsn = DatumGetLSN(DirectFunctionCall1Coll(pg_lsn_in, InvalidOid, @@ -720,7 +720,7 @@ libpqrcv_command(WalReceiverConn *conn, const char *cmd, char **err) if (PQresultStatus(res) != PGRES_COMMAND_OK) { PQclear(res); - *err = pstrdup(PQerrorMessage(conn->streamConn)); + *err = pchomp(PQerrorMessage(conn->streamConn)); return false; } diff --git a/src/backend/utils/mmgr/mcxt.c b/src/backend/utils/mmgr/mcxt.c index 6ad0bb47b6..c21dfcb96b 100644 --- a/src/backend/utils/mmgr/mcxt.c +++ b/src/backend/utils/mmgr/mcxt.c @@ -1181,3 +1181,17 @@ pnstrdup(const char *in, Size len) out[len] = '\0'; return out; } + +/* + * Make copy of string with all trailing newline characters removed. + */ +char * +pchomp(const char *in) +{ + size_t n; + + n = strlen(in); + while (n > 0 && in[n - 1] == '\n') + n--; + return pnstrdup(in, n); +} diff --git a/src/include/utils/palloc.h b/src/include/utils/palloc.h index b72fe4aee8..2e07bd57ad 100644 --- a/src/include/utils/palloc.h +++ b/src/include/utils/palloc.h @@ -127,6 +127,8 @@ extern char *MemoryContextStrdup(MemoryContext context, const char *string); extern char *pstrdup(const char *in); extern char *pnstrdup(const char *in, Size len); +extern char *pchomp(const char *in); + /* sprintf into a palloc'd buffer --- these are in psprintf.c */ extern char *psprintf(const char *fmt,...) pg_attribute_printf(1, 2); extern size_t pvsnprintf(char *buf, size_t len, const char *fmt, va_list args) pg_attribute_printf(3, 0); -- 2.11.1 --------------8DBA76FBC0D2E1B20F0C5D8D Content-Type: text/plain Content-Disposition: inline Content-Transfer-Encoding: 8bit MIME-Version: 1.0 -- Sent via pgsql-hackers mailing list ([email protected]) To make changes to your subscription: http://www.postgresql.org/mailpref/pgsql-hackers --------------8DBA76FBC0D2E1B20F0C5D8D-- ^ permalink raw reply [nested|flat] 19+ messages in thread
* [PATCH v13 6/8] Row pattern recognition patch (docs). @ 2024-01-22 09:45 Tatsuo Ishii <[email protected]> 0 siblings, 0 replies; 19+ messages in thread From: Tatsuo Ishii @ 2024-01-22 09:45 UTC (permalink / raw) --- doc/src/sgml/advanced.sgml | 80 ++++++++++++++++++++++++++++++++++++ doc/src/sgml/func.sgml | 54 ++++++++++++++++++++++++ doc/src/sgml/ref/select.sgml | 38 ++++++++++++++++- 3 files changed, 170 insertions(+), 2 deletions(-) diff --git a/doc/src/sgml/advanced.sgml b/doc/src/sgml/advanced.sgml index 755c9f1485..cf18dd887e 100644 --- a/doc/src/sgml/advanced.sgml +++ b/doc/src/sgml/advanced.sgml @@ -537,6 +537,86 @@ WHERE pos < 3; <literal>rank</literal> less than 3. </para> + <para> + Row pattern common syntax can be used to perform row pattern recognition + in a query. Row pattern common syntax includes two sub + clauses: <literal>DEFINE</literal> + and <literal>PATTERN</literal>. <literal>DEFINE</literal> defines + definition variables along with an expression. The expression must be a + logical expression, which means it must + return <literal>TRUE</literal>, <literal>FALSE</literal> + or <literal>NULL</literal>. The expression may comprise column references + and functions. Window functions, aggregate functions and subqueries are + not allowed. An example of <literal>DEFINE</literal> is as follows. + +<programlisting> +DEFINE + LOWPRICE AS price <= 100, + UP AS price > PREV(price), + DOWN AS price < PREV(price) +</programlisting> + + Note that <function>PREV</function> returns the price column in the + previous row if it's called in a context of row pattern recognition. So in + the second line the definition variable "UP" is <literal>TRUE</literal> + when the price column in the current row is greater than the price column + in the previous row. Likewise, "DOWN" is <literal>TRUE</literal> when when + the price column in the current row is lower than the price column in the + previous row. + </para> + <para> + Once <literal>DEFINE</literal> exists, <literal>PATTERN</literal> can be + used. <literal>PATTERN</literal> defines a sequence of rows that satisfies + certain conditions. For example following <literal>PATTERN</literal> + defines that a row starts with the condition "LOWPRICE", then one or more + rows satisfy "UP" and finally one or more rows satisfy "DOWN". Note that + "+" means one or more matches. Also you can use "*", which means zero or + more matches. If a sequence of rows which satisfies the PATTERN is found, + in the starting row of the sequence of rows all window functions and + aggregates are shown in the target list. Note that aggregations only look + into the matched rows, rather than whole frame. In the second or + subsequent rows all window functions and aggregates are NULL. For rows + that do not match the PATTERN, all window functions and aggregates are + shown AS NULL too, except count which shows 0. This is because the + unmatched rows are in an empty frame. Example of + a <literal>SELECT</literal> using the <literal>DEFINE</literal> + and <literal>PATTERN</literal> clause is as follows. + +<programlisting> +SELECT company, tdate, price, + first_value(price) OVER w, + max(price) OVER w, + count(price) OVER w +FROM stock, + WINDOW w AS ( + PARTITION BY company + ORDER BY tdate + ROWS BETWEEN CURRENT ROW AND UNBOUNDED FOLLOWING + AFTER MATCH SKIP PAST LAST ROW + INITIAL + PATTERN (LOWPRICE UP+ DOWN+) + DEFINE + LOWPRICE AS price <= 100, + UP AS price > PREV(price), + DOWN AS price < PREV(price) +); +</programlisting> +<screen> + company | tdate | price | first_value | max | count +----------+------------+-------+-------------+-----+------- + company1 | 2023-07-01 | 100 | 100 | 200 | 4 + company1 | 2023-07-02 | 200 | | | + company1 | 2023-07-03 | 150 | | | + company1 | 2023-07-04 | 140 | | | + company1 | 2023-07-05 | 150 | | | 0 + company1 | 2023-07-06 | 90 | 90 | 130 | 4 + company1 | 2023-07-07 | 110 | | | + company1 | 2023-07-08 | 130 | | | + company1 | 2023-07-09 | 120 | | | + company1 | 2023-07-10 | 130 | | | 0 +</screen> + </para> + <para> When a query involves multiple window functions, it is possible to write out each one with a separate <literal>OVER</literal> clause, but this is diff --git a/doc/src/sgml/func.sgml b/doc/src/sgml/func.sgml index 210c7c0b02..8422aa6b93 100644 --- a/doc/src/sgml/func.sgml +++ b/doc/src/sgml/func.sgml @@ -21941,6 +21941,7 @@ SELECT count(*) FROM sometable; returns <literal>NULL</literal> if there is no such row. </para></entry> </row> + </tbody> </tgroup> </table> @@ -21980,6 +21981,59 @@ SELECT count(*) FROM sometable; Other frame specifications can be used to obtain other effects. </para> + <para> + Row pattern recognition navigation functions are listed in + <xref linkend="functions-rpr-navigation-table"/>. These functions + can be used to describe DEFINE clause of Row pattern recognition. + </para> + + <table id="functions-rpr-navigation-table"> + <title>Row Pattern Navigation Functions</title> + <tgroup cols="1"> + <thead> + <row> + <entry role="func_table_entry"><para role="func_signature"> + Function + </para> + <para> + Description + </para></entry> + </row> + </thead> + + <tbody> + <row> + <entry role="func_table_entry"><para role="func_signature"> + <indexterm> + <primary>prev</primary> + </indexterm> + <function>prev</function> ( <parameter>value</parameter> <type>anyelement</type> ) + <returnvalue>anyelement</returnvalue> + </para> + <para> + Returns the column value at the previous row; + returns NULL if there is no previous row in the window frame. + </para></entry> + </row> + + <row> + <entry role="func_table_entry"><para role="func_signature"> + <indexterm> + <primary>next</primary> + </indexterm> + <function>next</function> ( <parameter>value</parameter> <type>anyelement</type> ) + <returnvalue>anyelement</returnvalue> + </para> + <para> + Returns the column value at the next row; + returns NULL if there is no next row in the window frame. + </para></entry> + </row> + + </tbody> + </tgroup> + </table> + <note> <para> The SQL standard defines a <literal>RESPECT NULLS</literal> or diff --git a/doc/src/sgml/ref/select.sgml b/doc/src/sgml/ref/select.sgml index 9917df7839..1575fc2167 100644 --- a/doc/src/sgml/ref/select.sgml +++ b/doc/src/sgml/ref/select.sgml @@ -969,8 +969,8 @@ WINDOW <replaceable class="parameter">window_name</replaceable> AS ( <replaceabl The <replaceable class="parameter">frame_clause</replaceable> can be one of <synopsis> -{ RANGE | ROWS | GROUPS } <replaceable>frame_start</replaceable> [ <replaceable>frame_exclusion</replaceable> ] -{ RANGE | ROWS | GROUPS } BETWEEN <replaceable>frame_start</replaceable> AND <replaceable>frame_end</replaceable> [ <replaceable>frame_exclusion</replaceable> ] +{ RANGE | ROWS | GROUPS } <replaceable>frame_start</replaceable> [ <replaceable>frame_exclusion</replaceable> ] [row_pattern_common_syntax] +{ RANGE | ROWS | GROUPS } BETWEEN <replaceable>frame_start</replaceable> AND <replaceable>frame_end</replaceable> [ <replaceable>frame_exclusion</replaceable> ] [row_pattern_common_syntax] </synopsis> where <replaceable>frame_start</replaceable> @@ -1077,6 +1077,40 @@ EXCLUDE NO OTHERS a given peer group will be in the frame or excluded from it. </para> + <para> + The + optional <replaceable class="parameter">row_pattern_common_syntax</replaceable> + defines the <firstterm>row pattern recognition condition</firstterm> for + this + window. <replaceable class="parameter">row_pattern_common_syntax</replaceable> + includes following subclauses. <literal>AFTER MATCH SKIP PAST LAST + ROW</literal> or <literal>AFTER MATCH SKIP TO NEXT ROW</literal> controls + how to proceed to next row position after a match + found. With <literal>AFTER MATCH SKIP PAST LAST ROW</literal> (the + default) next row position is next to the last row of previous match. On + the other hand, with <literal>AFTER MATCH SKIP TO NEXT ROW</literal> next + row position is always next to the last row of previous + match. <literal>DEFINE</literal> defines definition variables along with a + boolean expression. <literal>PATTERN</literal> defines a sequence of rows + that satisfies certain conditions using variables defined + in <literal>DEFINE</literal> clause. If the variable is not defined in + the <literal>DEFINE</literal> clause, it is implicitly assumed + following is defined in the <literal>DEFINE</literal> clause. + +<synopsis> +<literal>variable_name</literal> AS TRUE +</synopsis> + + Note that the maximu number of variables defined + in <literal>DEFINE</literal> clause is 26. + +<synopsis> +[ AFTER MATCH SKIP PAST LAST ROW | AFTER MATCH SKIP TO NEXT ROW ] +PATTERN <replaceable class="parameter">pattern_variable_name</replaceable>[+] [, ...] +DEFINE <replaceable class="parameter">definition_varible_name</replaceable> AS <replaceable class="parameter">expression</replaceable> [, ...] +</synopsis> + </para> + <para> The purpose of a <literal>WINDOW</literal> clause is to specify the behavior of <firstterm>window functions</firstterm> appearing in the query's -- 2.25.1 ----Next_Part(Mon_Jan_22_19_26_18_2024_011)-- Content-Type: Text/X-Patch; charset=us-ascii Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="v13-0007-Row-pattern-recognition-patch-tests.patch" ^ permalink raw reply [nested|flat] 19+ messages in thread
end of thread, other threads:[~2024-01-22 09:45 UTC | newest] Thread overview: 19+ messages (download: mbox mbox.gz follow: Atom feed) -- links below jump to the message on this page -- 2017-02-08 14:31 [PATCH] chomp PQerrorMessage() in backend uses Peter Eisentraut <[email protected]> 2017-02-08 14:31 [PATCH] chomp PQerrorMessage() in backend uses Peter Eisentraut <[email protected]> 2017-02-08 14:31 [PATCH] chomp PQerrorMessage() in backend uses Peter Eisentraut <[email protected]> 2017-02-08 14:31 [PATCH] chomp PQerrorMessage() in backend uses Peter Eisentraut <[email protected]> 2017-02-08 14:31 [PATCH] chomp PQerrorMessage() in backend uses Peter Eisentraut <[email protected]> 2017-02-08 14:31 [PATCH] chomp PQerrorMessage() in backend uses Peter Eisentraut <[email protected]> 2017-02-08 14:31 [PATCH] chomp PQerrorMessage() in backend uses Peter Eisentraut <[email protected]> 2017-02-08 14:31 [PATCH] chomp PQerrorMessage() in backend uses Peter Eisentraut <[email protected]> 2017-02-08 14:31 [PATCH] chomp PQerrorMessage() in backend uses Peter Eisentraut <[email protected]> 2017-02-08 14:31 [PATCH] chomp PQerrorMessage() in backend uses Peter Eisentraut <[email protected]> 2017-02-08 14:31 [PATCH] chomp PQerrorMessage() in backend uses Peter Eisentraut <[email protected]> 2017-02-08 14:31 [PATCH] chomp PQerrorMessage() in backend uses Peter Eisentraut <[email protected]> 2017-02-08 14:31 [PATCH] chomp PQerrorMessage() in backend uses Peter Eisentraut <[email protected]> 2017-02-08 14:31 [PATCH] chomp PQerrorMessage() in backend uses Peter Eisentraut <[email protected]> 2017-02-08 14:31 [PATCH] chomp PQerrorMessage() in backend uses Peter Eisentraut <[email protected]> 2017-02-08 14:31 [PATCH] chomp PQerrorMessage() in backend uses Peter Eisentraut <[email protected]> 2017-02-08 14:31 [PATCH] chomp PQerrorMessage() in backend uses Peter Eisentraut <[email protected]> 2017-02-08 14:31 [PATCH] chomp PQerrorMessage() in backend uses Peter Eisentraut <[email protected]> 2024-01-22 09:45 [PATCH v13 6/8] Row pattern recognition patch (docs). Tatsuo Ishii <[email protected]>
This inbox is served by agora; see mirroring instructions for how to clone and mirror all data and code used for this inbox