Date: Fri, 9 Apr 2021 19:51:25 +0900
From: Michael Paquier <michael@paquier.xyz>
To: Fabien COELHO <coelho@cri.ensmp.fr>
Cc: Julien Rouhaud <rjuju123@gmail.com>,
	"shiy.fnst@fujitsu.com" <shiy.fnst@fujitsu.com>,
	"pgsql-hackers@lists.postgresql.org" <pgsql-hackers@lists.postgresql.org>
Subject: Re: psql - add SHOW_ALL_RESULTS option
Message-ID: <YHAxrQPk2E62wQSS@paquier.xyz>
References: <1ec5ef49-b5c8-4129-e680-fe42f8d0670b@2ndquadrant.com>
 <alpine.DEB.2.22.394.2104062323150.2555247@pseudo>
 <OSZPR01MB631017521EE6887ADC9492E8FD759@OSZPR01MB6310.jpnprd01.prod.outlook.com>
 <alpine.DEB.2.22.394.2104071516470.2724014@pseudo>
 <OSZPR01MB6310325023E8B4109BB2AB90FD749@OSZPR01MB6310.jpnprd01.prod.outlook.com>
 <20210408163050.fca7dwb37zszbsmm@nol>
 <alpine.DEB.2.22.394.2104081858500.3192110@pseudo>
 <20210408171135.ekhdf5nvqss554q3@nol>
 <YG+okFpc3JaKN/zB@paquier.xyz>
 <alpine.DEB.2.22.394.2104090828330.3253600@pseudo>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha512;
	protocol="application/pgp-signature"; boundary="VqYF48jqyOStSTBu"
Content-Disposition: inline
In-Reply-To: <alpine.DEB.2.22.394.2104090828330.3253600@pseudo>
Archived-At: 
 <https://www.postgresql.org/message-id/YHAxrQPk2E62wQSS%40paquier.xyz>
Precedence: bulk


--VqYF48jqyOStSTBu
Content-Type: multipart/mixed; boundary="KZm9RHWf0Jzy4ak4"
Content-Disposition: inline


--KZm9RHWf0Jzy4ak4
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

On Fri, Apr 09, 2021 at 08:47:07AM +0200, Fabien COELHO wrote:
> Yep, it looks much better. I found it strange that the later did a reset =
but
> was not doing the set.
>=20
> Attached v2 does as you suggest.

Close enough.  I was thinking about this position of the attached,
which is more consistent with the rest.
--
Michael

--KZm9RHWf0Jzy4ak4
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment; filename="fix-cancel-3.patch"
Content-Transfer-Encoding: quoted-printable

diff --git a/src/bin/psql/common.c b/src/bin/psql/common.c
index 028a357991..f289f05843 100644
--- a/src/bin/psql/common.c
+++ b/src/bin/psql/common.c
@@ -1117,7 +1117,6 @@ SendQueryAndProcessResults(const char *query, double =
*pelapsed_msec, bool is_wat
 		INSTR_TIME_SET_CURRENT(before);
=20
 	success =3D PQsendQuery(pset.db, query);
-	ResetCancelConn();
=20
 	if (!success)
 	{
@@ -1382,6 +1381,7 @@ SendQuery(const char *query)
 	{
 		/* Default fetch-it-all-and-print mode */
 		int res =3D SendQueryAndProcessResults(query, &elapsed_msec, false);
+		ResetCancelConn();
 		OK =3D (res >=3D 0);
 		results =3D NULL;
 	}

--KZm9RHWf0Jzy4ak4--

--VqYF48jqyOStSTBu
Content-Type: application/pgp-signature; name="signature.asc"

-----BEGIN PGP SIGNATURE-----

iQIzBAABCgAdFiEEG72nH6vTowiyblFKnvQgOdbyQH0FAmBwMa0ACgkQnvQgOdby
QH1clA//SNiqBIDNX9g2P7uYL1NEPfj074pv3n3diGswZ9BdIyYZVU/2SRMbyO5R
sy51/Mou4mpd94fLJzf/733ymrGgkQsNaViP9t7IduSoNol2RPbn2AGHZ0Nlvt42
baLB3YYRBjJMMrfSJmtMgB9hEvTv+sY0rv0RmKTRqyfxmKlAJXui5nCAvC3cxsOL
cLzfE0Pnh4hqVhab8mzb4jQjiTSjJhdRSyOni+U9N6oyCzxe6Hu0GjJsE6Eofm/A
UQ6fM+PeHs09L+4GQgVoNgsE04vrAILXvA0Zkk2uvLGenyao0I+PztAjdxy8w/En
iYjqdX4KoJLyV0wjEv4S0u5PFfJPrfbcKwuETTJZk0yfkgq9OnAzqhN+oEUP/ii8
OATFGW/pmIPIlbbqvKdAhuiL4ql1MUkOVLAMQTdTz77nF8KWS028uQRL5fKQXnDz
UosvSvt+6aXdSN8bbAyo0+hCxQIgGvd8jBc33V7hMkxOiPcTzohxoZErcJbM5d1R
DkknqileW3lY/bCL3W6vgwhesccaL9j6Vyg6kAtTry64dwHw0p/eTm0h2DYoxvxi
mYoFR9bIvpgxKSo2/wmpw70d3iH1Ibf76TWDU53Vjs/FH/XhjDJV8wQKFUoGJ+yw
T1/h9CmesozfYcIJ9jC9N+VQYsRs7qqyzp9eeFbVTNiNjE9/trg=
=YKAZ
-----END PGP SIGNATURE-----

--VqYF48jqyOStSTBu--