Remove unused 'countincludesself' argument to pq_sendcountedtext()

hlinnaka · hlinnaka · commit 24eebc65c26c · 2024-03-04T12:56:05.000+02:00
It has been unused since we removed support for protocol version 2.
diff --git a/src/backend/access/common/printsimple.c b/src/backend/access/common/printsimple.c
@@ -95,8 +95,7 @@ printsimple(TupleTableSlot *slot, DestReceiver *self)
 
 					pq_sendcountedtext(&buf,
 									   VARDATA_ANY(t),
-									   VARSIZE_ANY_EXHDR(t),
-									   false);
+									   VARSIZE_ANY_EXHDR(t));
 				}
 				break;
 
@@ -107,7 +106,7 @@ printsimple(TupleTableSlot *slot, DestReceiver *self)
 					int			len;
 
 					len = pg_ltoa(num, str);
-					pq_sendcountedtext(&buf, str, len, false);
+					pq_sendcountedtext(&buf, str, len);
 				}
 				break;
 
@@ -118,7 +117,7 @@ printsimple(TupleTableSlot *slot, DestReceiver *self)
 					int			len;
 
 					len = pg_lltoa(num, str);
-					pq_sendcountedtext(&buf, str, len, false);
+					pq_sendcountedtext(&buf, str, len);
 				}
 				break;
 
@@ -129,7 +128,7 @@ printsimple(TupleTableSlot *slot, DestReceiver *self)
 					int			len;
 
 					len = pg_ultoa_n(num, str);
-					pq_sendcountedtext(&buf, str, len, false);
+					pq_sendcountedtext(&buf, str, len);
 				}
 				break;
 
diff --git a/src/backend/access/common/printtup.c b/src/backend/access/common/printtup.c
@@ -355,7 +355,7 @@ printtup(TupleTableSlot *slot, DestReceiver *self)
 			char	   *outputstr;
 
 			outputstr = OutputFunctionCall(&thisState->finfo, attr);
-			pq_sendcountedtext(buf, outputstr, strlen(outputstr), false);
+			pq_sendcountedtext(buf, outputstr, strlen(outputstr));
 		}
 		else
 		{
diff --git a/src/backend/libpq/pqformat.c b/src/backend/libpq/pqformat.c
@@ -133,30 +133,27 @@ pq_sendbytes(StringInfo buf, const void *data, int datalen)
  *		pq_sendcountedtext - append a counted text string (with character set conversion)
  *
  * The data sent to the frontend by this routine is a 4-byte count field
- * followed by the string.  The count includes itself or not, as per the
- * countincludesself flag (pre-3.0 protocol requires it to include itself).
- * The passed text string need not be null-terminated, and the data sent
- * to the frontend isn't either.
+ * followed by the string.  The count does not include itself, as required by
+ * protocol version 3.0.  The passed text string need not be null-terminated,
+ * and the data sent to the frontend isn't either.
  * --------------------------------
  */
 void
-pq_sendcountedtext(StringInfo buf, const char *str, int slen,
-				   bool countincludesself)
+pq_sendcountedtext(StringInfo buf, const char *str, int slen)
 {
-	int			extra = countincludesself ? 4 : 0;
 	char	   *p;
 
 	p = pg_server_to_client(str, slen);
 	if (p != str)				/* actual conversion has been done? */
 	{
 		slen = strlen(p);
-		pq_sendint32(buf, slen + extra);
+		pq_sendint32(buf, slen);
 		appendBinaryStringInfoNT(buf, p, slen);
 		pfree(p);
 	}
 	else
 	{
-		pq_sendint32(buf, slen + extra);
+		pq_sendint32(buf, slen);
 		appendBinaryStringInfoNT(buf, str, slen);
 	}
 }
diff --git a/src/backend/replication/logical/proto.c b/src/backend/replication/logical/proto.c
@@ -851,7 +851,7 @@ logicalrep_write_tuple(StringInfo out, Relation rel, TupleTableSlot *slot,
 
 			pq_sendbyte(out, LOGICALREP_COLUMN_TEXT);
 			outputstr = OidOutputFunctionCall(typclass->typoutput, values[i]);
-			pq_sendcountedtext(out, outputstr, strlen(outputstr), false);
+			pq_sendcountedtext(out, outputstr, strlen(outputstr));
 			pfree(outputstr);
 		}
 
diff --git a/src/backend/tcop/fastpath.c b/src/backend/tcop/fastpath.c
@@ -85,7 +85,7 @@ SendFunctionResult(Datum retval, bool isnull, Oid rettype, int16 format)
 
 			getTypeOutputInfo(rettype, &typoutput, &typisvarlena);
 			outputstr = OidOutputFunctionCall(typoutput, retval);
-			pq_sendcountedtext(&buf, outputstr, strlen(outputstr), false);
+			pq_sendcountedtext(&buf, outputstr, strlen(outputstr));
 			pfree(outputstr);
 		}
 		else if (format == 1)
diff --git a/src/include/libpq/pqformat.h b/src/include/libpq/pqformat.h
@@ -23,8 +23,7 @@ extern void pq_endmessage(StringInfo buf);
 extern void pq_endmessage_reuse(StringInfo buf);
 
 extern void pq_sendbytes(StringInfo buf, const void *data, int datalen);
-extern void pq_sendcountedtext(StringInfo buf, const char *str, int slen,
-							   bool countincludesself);
+extern void pq_sendcountedtext(StringInfo buf, const char *str, int slen);
 extern void pq_sendtext(StringInfo buf, const char *str, int slen);
 extern void pq_sendstring(StringInfo buf, const char *str);
 extern void pq_send_ascii_string(StringInfo buf, const char *str);

Original file line number	Diff line number	Diff line change
`@@ -355,7 +355,7 @@ printtup(TupleTableSlot slot, DestReceiver self)`
`355`	`355`	`char *outputstr;`
`356`	`356`
`357`	`357`	`outputstr = OutputFunctionCall(&thisState->finfo, attr);`
`358`		`- pq_sendcountedtext(buf, outputstr, strlen(outputstr), false);`
	`358`	`+ pq_sendcountedtext(buf, outputstr, strlen(outputstr));`
`359`	`359`	`}`
`360`	`360`	`else`
`361`	`361`	`{`
Original file line number	Diff line number	Diff line change
`@@ -133,30 +133,27 @@ pq_sendbytes(StringInfo buf, const void *data, int datalen)`
`133`	`133`	`* pq_sendcountedtext - append a counted text string (with character set conversion)`
`134`	`134`	`*`
`135`	`135`	`* The data sent to the frontend by this routine is a 4-byte count field`
`136`		`- * followed by the string. The count includes itself or not, as per the`
`137`		`- * countincludesself flag (pre-3.0 protocol requires it to include itself).`
`138`		`- * The passed text string need not be null-terminated, and the data sent`
`139`		`- * to the frontend isn't either.`
	`136`	`+ * followed by the string. The count does not include itself, as required by`
	`137`	`+ * protocol version 3.0. The passed text string need not be null-terminated,`
	`138`	`+ * and the data sent to the frontend isn't either.`
`140`	`139`	`* --------------------------------`
`141`	`140`	`*/`
`142`	`141`	`void`
`143`		`-pq_sendcountedtext(StringInfo buf, const char *str, int slen,`
`144`		`- bool countincludesself)`
	`142`	`+pq_sendcountedtext(StringInfo buf, const char *str, int slen)`
`145`	`143`	`{`
`146`		`- int extra = countincludesself ? 4 : 0;`
`147`	`144`	`char *p;`
`148`	`145`
`149`	`146`	`p = pg_server_to_client(str, slen);`
`150`	`147`	`if (p != str) /* actual conversion has been done? */`
`151`	`148`	`{`
`152`	`149`	`slen = strlen(p);`
`153`		`- pq_sendint32(buf, slen + extra);`
	`150`	`+ pq_sendint32(buf, slen);`
`154`	`151`	`appendBinaryStringInfoNT(buf, p, slen);`
`155`	`152`	`pfree(p);`
`156`	`153`	`}`
`157`	`154`	`else`
`158`	`155`	`{`
`159`		`- pq_sendint32(buf, slen + extra);`
	`156`	`+ pq_sendint32(buf, slen);`
`160`	`157`	`appendBinaryStringInfoNT(buf, str, slen);`
`161`	`158`	`}`
`162`	`159`	`}`
Original file line number	Diff line number	Diff line change
`@@ -851,7 +851,7 @@ logicalrep_write_tuple(StringInfo out, Relation rel, TupleTableSlot *slot,`
`851`	`851`
`852`	`852`	`pq_sendbyte(out, LOGICALREP_COLUMN_TEXT);`
`853`	`853`	`outputstr = OidOutputFunctionCall(typclass->typoutput, values[i]);`
`854`		`- pq_sendcountedtext(out, outputstr, strlen(outputstr), false);`
	`854`	`+ pq_sendcountedtext(out, outputstr, strlen(outputstr));`
`855`	`855`	`pfree(outputstr);`
`856`	`856`	`}`
`857`	`857`
Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,7 @@ SendFunctionResult(Datum retval, bool isnull, Oid rettype, int16 format)`
`85`	`85`
`86`	`86`	`getTypeOutputInfo(rettype, &typoutput, &typisvarlena);`
`87`	`87`	`outputstr = OidOutputFunctionCall(typoutput, retval);`
`88`		`- pq_sendcountedtext(&buf, outputstr, strlen(outputstr), false);`
	`88`	`+ pq_sendcountedtext(&buf, outputstr, strlen(outputstr));`
`89`	`89`	`pfree(outputstr);`
`90`	`90`	`}`
`91`	`91`	`else if (format == 1)`