Date: Mon, 15 Mar 2021 16:47:25 -0300
From: Alvaro Herrera <alvherre@2ndquadrant.com>
To: Justin Pryzby <pryzby@telsasoft.com>
Cc: Tom Lane <tgl@sss.pgh.pa.us>, pgsql-hackers@lists.postgresql.org,
	Craig Ringer <craig.ringer@enterprisedb.com>,
	Matthieu Garrigues <matthieu.garrigues@gmail.com>,
	Zhihong Yu <zyu@yugabyte.com>, Andres Freund <andres@anarazel.de>,
	Aya Iwata <iwata.aya@jp.fujitsu.com>,
	Daniel =?iso-8859-1?B?VulyaXTp?= <daniel@manitou-mail.org>,
	"David G. Johnston" <david.g.johnston@gmail.com>,
	Kirk Jamison <k.jamison@fujitsu.com>,
	Michael Paquier <michael.paquier@gmail.com>,
	Nikhil Sontakke <nikhils@2ndquadrant.com>,
	Vaishnavi Prabakaran <VaishnaviP@fast.au.fujitsu.com>
Subject: Re: [HACKERS] PATCH: Batch/pipelining support for libpq
Message-ID: <20210315194725.GA10869@alvherre.pgsql>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="tKW2IUtsqtDRztdT"
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
In-Reply-To: <20210315190024.GZ29463@telsasoft.com>
User-Agent: Mutt/1.10.1 (2018-07-13)
Archived-At: 
 <https://www.postgresql.org/message-id/20210315194725.GA10869%40alvherre.pgsql>
Precedence: bulk


--tKW2IUtsqtDRztdT
Content-Type: text/plain; charset=iso-8859-1
Content-Disposition: inline
Content-Transfer-Encoding: 8bit

On 2021-Mar-15, Justin Pryzby wrote:

> Are you going to update the assertion ?
> 
> +#if 0                                                                                                                                                                                                                             
>         Assert((meta == META_NONE && varprefix == NULL) ||                                                                                                                                                                         
>                    ((meta == META_GSET || meta == META_ASET) && varprefix != NULL));                                                                                                                                               
> +#endif                                                                                                                                                                                                                            

Yeah, caught that just after sending.  Here's a notpatch.

-- 
Álvaro Herrera                            39°49'30"S 73°17'W
"La virtud es el justo medio entre dos defectos" (Aristóteles)

--tKW2IUtsqtDRztdT
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="fixassert.notpatch"

diff --git a/src/bin/pgbench/pgbench.c b/src/bin/pgbench/pgbench.c
index ba7b35d83c..e69d43b26b 100644
--- a/src/bin/pgbench/pgbench.c
+++ b/src/bin/pgbench/pgbench.c
@@ -2823,13 +2823,12 @@ readCommandResponse(CState *st, MetaCommand meta, char *varprefix)
 	int			qrynum = 0;
 
 	/*
-	 * varprefix should be set only with \gset or \aset, and SQL commands do
-	 * not need it.
+	 * varprefix should be set only with \gset or \aset, and \endpipeline and
+	 * SQL commands do not need it.
 	 */
-#if 0
 	Assert((meta == META_NONE && varprefix == NULL) ||
+		   ((meta == META_ENDPIPELINE) && varprefix == NULL) ||
 		   ((meta == META_GSET || meta == META_ASET) && varprefix != NULL));
-#endif
 
 	res = PQgetResult(st->con);
 

--tKW2IUtsqtDRztdT--