Remove error report from pq_endmessage when pq_putmessage fails. The

tglsfdc · tglsfdc · commit 6ccb2af7251a · 2001-04-16T01:46:57.000Z
only possible failure is in pq_flush, which will log a (better!) report
anyway --- so pq_endmessage is just cluttering the log with a redundant
entry.  This matters when a client crashes partway through a large query,
since we will emit many broken-pipe reports before finishing the query
and exiting.
diff --git a/src/backend/libpq/pqformat.c b/src/backend/libpq/pqformat.c
@@ -16,7 +16,7 @@
  * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- *	$Id: pqformat.c,v 1.16 2001/01/24 19:42:56 momjian Exp $
+ *	$Id: pqformat.c,v 1.17 2001/04/16 01:46:57 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -213,13 +213,8 @@ pq_sendint(StringInfo buf, int i, int b)
 void
 pq_endmessage(StringInfo buf)
 {
-	if (pq_putmessage('\0', buf->data, buf->len))
-	{
-		snprintf(PQerrormsg, PQERRORMSG_LENGTH,
-				 "FATAL: pq_endmessage failed: errno=%d\n", errno);
-		fputs(PQerrormsg, stderr);
-		pqdebug("%s", PQerrormsg);
-	}
+	(void) pq_putmessage('\0', buf->data, buf->len);
+	/* no need to complain about any failure, since pqcomm.c already did */
 	pfree(buf->data);
 	buf->data = NULL;
 }

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@`
`16`	`16`	`* Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group`
`17`	`17`	`* Portions Copyright (c) 1994, Regents of the University of California`
`18`	`18`	`*`
`19`		`- * $Id: pqformat.c,v 1.16 2001/01/24 19:42:56 momjian Exp $`
	`19`	`+ * $Id: pqformat.c,v 1.17 2001/04/16 01:46:57 tgl Exp $`
`20`	`20`	`*`
`21`	`21`	`*-------------------------------------------------------------------------`
`22`	`22`	`*/`
`@@ -213,13 +213,8 @@ pq_sendint(StringInfo buf, int i, int b)`
`213`	`213`	`void`
`214`	`214`	`pq_endmessage(StringInfo buf)`
`215`	`215`	`{`
`216`		`- if (pq_putmessage('\0', buf->data, buf->len))`
`217`		`- {`
`218`		`- snprintf(PQerrormsg, PQERRORMSG_LENGTH,`
`219`		`- "FATAL: pq_endmessage failed: errno=%d\n", errno);`
`220`		`- fputs(PQerrormsg, stderr);`
`221`		`- pqdebug("%s", PQerrormsg);`
`222`		`- }`
	`216`	`+ (void) pq_putmessage('\0', buf->data, buf->len);`
	`217`	`+ /* no need to complain about any failure, since pqcomm.c already did */`
`223`	`218`	`pfree(buf->data);`
`224`	`219`	`buf->data = NULL;`
`225`	`220`	`}`